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 01/90] 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 02/90] 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 03/90] 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 04/90] 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 05/90] 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 06/90] 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 07/90] 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 08/90] 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 09/90] 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 10/90] 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 11/90] 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 f5a4e350590c694ae612c9c8e9cd4fc5d4fb27e5 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Wed, 5 Jan 2011 13:13:45 -0500
Subject: [PATCH 12/90] Add Dialog Axiata to SMS carriers

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

diff --git a/db/sms_carrier.sql b/db/sms_carrier.sql
index 0e94df296e..14074e7189 100644
--- a/db/sms_carrier.sql
+++ b/db/sms_carrier.sql
@@ -62,4 +62,5 @@ VALUES
     (100114, 'Vodafone Germany', '%s@vodafone-sms.de', now()),
     (100115, 'E-Plus', '%s@smsmail.eplus.de', now()),
     (100116, 'Cellular South', '%s@csouth1.com', now()),
-    (100117, 'ChinaMobile (139)', '%s@139.com', now());
+    (100117, 'ChinaMobile (139)', '%s@139.com', now()),
+    (100118, 'Dialog Axiata', '%s@dialog.lk', now());

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 13/90] 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 f3d48d2dfef7537b31a1d942f6c04b9e85dec090 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 5 Jan 2011 15:34:10 -0800
Subject: [PATCH 14/90] Add README with intallation/upgrade instructions to the
 Facebook Bridge plugin

---
 plugins/Facebook/README       |   6 ++
 plugins/FacebookBridge/README | 108 ++++++++++++++++++++++++++++++++++
 2 files changed, 114 insertions(+)
 create mode 100644 plugins/FacebookBridge/README

diff --git a/plugins/Facebook/README b/plugins/Facebook/README
index 532f1d82e4..454dd44e79 100644
--- a/plugins/Facebook/README
+++ b/plugins/Facebook/README
@@ -1,3 +1,9 @@
+*** 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
 ===============
 
diff --git a/plugins/FacebookBridge/README b/plugins/FacebookBridge/README
new file mode 100644
index 0000000000..54de8633a2
--- /dev/null
+++ b/plugins/FacebookBridge/README
@@ -0,0 +1,108 @@
+Facebook Bridge Plugin
+
+The Facebook Bridge plugin allows you to integrate your StatusNet site
+with Facebook. It uses Facebook's new SDKs, the Graph API and OAuth
+2.0, and supercedes the previous "Facebook" plugin, which relied on the
+Facebook's now deprecated "Old REST API". The other major difference is
+the troublesome and confusing Facebook Canvas Application has been
+removed.
+
+Note: Do NOT try to run the old Facebook plugin and this plugin at the same
+time. It won't work.
+
+Features for the new Facebook Bridge Plugin:
+
+- "Login with Facebook" (AKA single-sign-on using Facebook Connect for
+  authentication).
+
+- Registration with Facebook Connect, including automatic profile creation
+  based on users' Facebook accounts.
+
+- Post mirroring -- posting a notice on StatusNet automatically creates a post
+  on Facebook, deleting it on StatusNet deletes it on Facebook, and faving it
+  "likes" it on Facebook.
+
+
+Upgrading from the old Facebook plugin
+======================================
+
+Remove the addPlugin('Facebook') statement for the old Facebook plugin
+from your config.php and adjust your existing Facebook application using
+the setup instructions below as a guide, then enable the new plugin (also
+described below). Existing users who have setup post mirroring shouldn't
+have to do anything. The new Facebook Bridge plugin will keep their notices
+flowing to Facebook.
+
+Setup
+=====
+
+There are two parts configuring the Facebook Bridge plugin -- setup on the
+Facebook side, and setup on the StatusNet side.
+
+Setup (Facebook side)
+=====================
+
+The first step is to login to Facebook and register a Facebook application
+to get an application ID and secret.
+
+Use the handy Facebook application setup wizard:
+
+http://developers.facebook.com/setup/
+
+Once you've set up your application, you'll need to enter the Facebook Developer
+dashboard (http://www.facebook.com/developers/editapp.php?app_id=YOUR_APPLICATION_ID)
+and customize a few things:
+
+About tab
+---------
+
+Set your logos, application description, etc. as you see fit.
+
+Web Site tab
+------------
+
+Make a note of the "Application ID" and "Application Secret" Facebook generated
+for your application. You'll need both of those later.
+
+Make sure "Site URL" points to your StatusNet installation
+(e.g.: http://example.net/).
+
+- Special Note for multi-site Status Networks: enter your domain (SLD and TLD)
+  in the "Site Domain" field. (e.g.: status.net). This will allow a single
+  Facebook Application to work with all your network subdomains (*.status.net).
+
+Facebook Integration tab
+------------------------
+
+Use the default settings.
+
+Mobile and Devices tab
+----------------------
+
+Use the default settings.
+
+Advanced tab
+------------
+
+In the Authentication section, set the "Deauthorize Callback" to
+http://YOURSITE/facebook/deauthorize (e.g.: http://example.net/facebook/deauthorize).
+
+In the Migrations section, ensure that "OAuth 2.0 for Canvas" is set to
+"Enabled". It probably already will be, but double check.
+
+The default settings should suffice for everything else.
+
+Setup (StatusNet side)
+======================
+
+To enable the Facebook Bridge plugin, add
+
+    addPlugin('FacebookBridge');
+
+to you config.php.
+
+Next login to your StatusNet site as a user with the administrator role, and
+navigate to the admin menu. You should see a new tab for the Facebook admin
+panel, titled "Facebook".  Enter your Facebook application ID and secret in
+that admin panel and hit save. After that, the Facebook Bridge Plugin should
+be ready to use.

From 77eda410305fca74968e9e99d25b2a9699432d32 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 6 Jan 2011 12:15:59 -0800
Subject: [PATCH 15/90] Added Start/EndRegistrationTry events to Facebook
 Bridge's user registration

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

diff --git a/plugins/FacebookBridge/actions/facebookfinishlogin.php b/plugins/FacebookBridge/actions/facebookfinishlogin.php
index 349acd7e22..022c1e98b1 100644
--- a/plugins/FacebookBridge/actions/facebookfinishlogin.php
+++ b/plugins/FacebookBridge/actions/facebookfinishlogin.php
@@ -299,6 +299,10 @@ class FacebookfinishloginAction 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.'));
@@ -389,6 +393,8 @@ class FacebookfinishloginAction extends Action
             __FILE__
         );
 
+        Event::handle('EndRegistrationTry', array($this));
+
         $this->goHome($user->nickname);
     }
 

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 16/90] 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 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 17/90] 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 18/90] 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 19/90] 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 20/90] 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 21/90] 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 22/90] 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 23/90] 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 24/90] 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 25/90] 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 26/90] 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 27/90] 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 28/90] 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 29/90] 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 30/90] 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 31/90] 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 32/90] 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 33/90] * 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 34/90] * 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 35/90] * 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 36/90] 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 37/90] * 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 38/90] * 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 39/90] 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 40/90] 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 41/90] 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 42/90] 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 43/90] 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 44/90] 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 45/90] 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 46/90] 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 47/90] 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 48/90] 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 49/90] 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 50/90] 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 51/90] 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 52/90] 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 53/90] 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 54/90] 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 55/90] 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 56/90] 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 57/90] 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 58/90] 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 59/90] 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 60/90] 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 61/90] 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 62/90] 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 63/90] 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 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 64/90] 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 65/90] 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 66/90] 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 67/90] 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 68/90] 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 69/90] 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 70/90] 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 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 71/90] 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 72/90] 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 73/90] 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 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 74/90] 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 75/90] 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 76/90] 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 77/90] 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 78/90] 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 79/90] 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 80/90] 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 81/90] 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 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 82/90] 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 83/90] 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 84/90] 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 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 85/90] 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 86/90] 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 87/90] 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 88/90] 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 89/90] 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 90/90] 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)) {