Merge branch '0.9.x' into private-rss

author: Jeffery To <jeffery.to@gmail.com> 2009-07-17 16:54:46 +0800
committer: Jeffery To <jeffery.to@gmail.com> 2009-07-17 16:54:46 +0800
commit: 1aea5989776e75f3b7af236049d511a28c3f1ff7 (patch)
tree: fbf355767238df2dbdebf086fa2c9e5f51f7dbed
parent: 5015505f16c9ce412e6f5535f80188f33d24c4ea (diff)
parent: c32e494c0c480e30317b0f0a8dcae7103c4ff89e (diff)
75 files changed, 8030 insertions, 6700 deletions
diff --git a/README b/README
index 40e526355..0214e4931 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ README
 ------
 
 Laconica 0.8.0 ("Shiny Happy People")
-8 July 2009
+15 July 2009
 
 This is the README file for Laconica, the Open Source microblogging
 platform. It includes installation instructions, descriptions of
@@ -116,6 +116,16 @@ This is a major feature release since version 0.7.4, released May 31
   as default TOS for Laconica sites.
 - Better command-line handling for scripts, including standard options
   and ability to set hostname and path from the command line.
+- An experimental plugin to use Meteor (http://www.meteorserver.org/)
+  for "real-time" updates.
+- A new framework for "real-time" updates, making it easier to develop
+  plugins for different browser-based update modes.
+- RSS 2.0 and Atom feeds for groups.
+- RSS 2.0 and Atom feeds for tags.
+- Attachments can be sent by email.
+- Attachments are encoded as enclosures in RSS 2.0 and Atom.
+- Notices with attachments display in Facebook as media inline.
+
 - Many, many bug fixes.
 
 Prerequisites
@@ -936,8 +946,6 @@ notice: A plain string that will appear on every page. A good place
 	to put introductory information about your service, or info about
 	upgrades and outages, or other community info. Any HTML will
         be escaped.
-dupelimit: Time in which it's not OK for the same person to post the
-           same notice; default = 60 seconds.
 logo: URL of an image file to use as the logo for the site. Overrides
       the logo in the theme, if any.
 ssl: Whether to use SSL and https:// URLs for some or all pages.
@@ -953,15 +961,12 @@ sslserver: use an alternate server name for SSL URLs, like
 shorturllength: Length of URL at which URLs in a message exceeding 140
                 characters will be sent to the user's chosen
                 shortening service.
-<<<<<<< HEAD:README
 design: a default design (colors and background) for the site.
         Sub-items are: backgroundcolor, contentcolor, sidebarcolor,
         textcolor, linkcolor, backgroundimage, disposition.
 dupelimit: minimum time allowed for one person to say the same thing
            twice. Default 60s. Anything lower is considered a user
            or UI error.
-=======
->>>>>>> 0.7.x:README
 
 db
 --
@@ -1424,6 +1429,51 @@ notify third-party servers of updates.
 notify: an array of URLs for ping endpoints. Default is the empty
         array (no notification).
 
+Plugins
+=======
+
+Beginning with the 0.7.x branch, Laconica has supported a simple but
+powerful plugin architecture. Important events in the code are named,
+like 'StartNoticeSave', and other software can register interest
+in those events. When the events happen, the other software is called
+and has a choice of accepting or rejecting the events.
+
+In the simplest case, you can add a function to config.php and use the
+Event::addHandler() function to hook an event:
+
+    function AddGoogleLink($action)
+    {
+        $action->menuItem('http://www.google.com/', _('Google'), _('Search engine'));
+        return true;
+    }
+
+    Event::addHandler('EndPrimaryNav', 'AddGoogleLink');
+
+This adds a menu item to the end of the main navigation menu. You can
+see the list of existing events, and parameters that handlers must
+implement, in EVENTS.txt.
+
+The Plugin class in lib/plugin.php makes it easier to write more
+complex plugins. Sub-classes can just create methods named
+'onEventName', where 'EventName' is the name of the event (case
+matters!). These methods will be automatically registered as event
+handlers by the Plugin constructor (which you must call from your own
+class's constructor).
+
+Several example plugins are included in the plugins/ directory. You
+can enable a plugin with the following line in config.php:
+
+    addPlugin('Example', array('param1' => 'value1',
+                               'param2' => 'value2'));
+
+This will look for and load files named 'ExamplePlugin.php' or
+'Example/ExamplePlugin.php' either in the plugins/ directory (for
+plugins that ship with Laconica) or in the local/ directory (for
+plugins you write yourself or that you get from somewhere else) or
+local/plugins/.
+
+Plugins are documented in their own directories.
+
 Troubleshooting
 ===============
 
@@ -1533,6 +1583,7 @@ if anyone's been overlooked in error.
 * Brenda Wallace
 * Jeffery To
 * Federico Marani
+* Craig Andrews
 
 Thanks also to the developers of our upstream library code and to the
 thousands of people who have tried out Identi.ca, installed Laconi.ca,
diff --git a/actions/api.php b/actions/api.php
index 18c3b68d4..452ed8e82 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -127,7 +127,9 @@ class ApiAction extends Action
                                 'help/downtime_schedule',
                                 'laconica/version',
                                 'laconica/config',
-                                'laconica/wadl');
+                                'laconica/wadl',
+                                'tags/timeline',
+                                'groups/timeline');
 
         static $bareauth = array('statuses/user_timeline',
                                  'statuses/friends_timeline',
diff --git a/actions/conversation.php b/actions/conversation.php
index 0eb0d86d6..c8755ba6e 100644
--- a/actions/conversation.php
+++ b/actions/conversation.php
@@ -116,6 +116,11 @@ class ConversationAction extends Action
 
         $cnt = $ct->show();
     }
+
+    function isReadOnly()
+    {
+        return true;
+    }
 }
 
 /**
diff --git a/actions/facebookhome.php b/actions/facebookhome.php
index 34989c978..6d8d0745d 100644
--- a/actions/facebookhome.php
+++ b/actions/facebookhome.php
@@ -57,7 +57,7 @@ class FacebookhomeAction extends FacebookAction
 
             // If this is the first time the user has started the app
             // prompt for Facebook status update permission
-            if (!$this->facebook->api_client->users_hasAppPermission('status_update')) {
+            if (!$this->facebook->api_client->users_hasAppPermission('publish_stream')) {
 
                  if ($this->facebook->api_client->data_getUserPreference(
                     FACEBOOK_PROMPTED_UPDATE_PREF) != 'true') {
@@ -203,7 +203,7 @@ class FacebookhomeAction extends FacebookAction
         $api_key = common_config('facebook', 'apikey');
 
         $auth_url = 'http://www.facebook.com/authorize.php?api_key=' .
-            $api_key . '&v=1.0&ext_perm=status_update&next=' . $next .
+            $api_key . '&v=1.0&ext_perm=publish_stream&next=' . $next .
             '&next_cancel=' . $next . '&submit=skip';
 
         $this->elementStart('span', array('class' => 'facebook-button'));
diff --git a/actions/facebooklogin.php b/actions/facebooklogin.php
index 22007da4f..aa86cfbc0 100644
--- a/actions/facebooklogin.php
+++ b/actions/facebooklogin.php
@@ -31,7 +31,7 @@ class FacebookinviteAction extends FacebookAction
         $this->error = $error;
         
         if ($this->flink) {
-            if (!$this->facebook->api_client->users_hasAppPermission('status_update') &&
+            if (!$this->facebook->api_client->users_hasAppPermission('publish_stream') &&
                 $this->facebook->api_client->data_getUserPreference(
                      FACEBOOK_PROMPTED_UPDATE_PREF) == 'true') {
     
@@ -60,7 +60,7 @@ class FacebookinviteAction extends FacebookAction
 
             // If this is the first time the user has started the app
              // prompt for Facebook status update permission
-             if (!$this->facebook->api_client->users_hasAppPermission('status_update')) {
+             if (!$this->facebook->api_client->users_hasAppPermission('publish_stream')) {
 
                  if ($this->facebook->api_client->data_getUserPreference(
                          FACEBOOK_PROMPTED_UPDATE_PREF) != 'true') {
diff --git a/actions/facebooksettings.php b/actions/facebooksettings.php
index ee2c279ab..c3b364743 100644
--- a/actions/facebooksettings.php
+++ b/actions/facebooksettings.php
@@ -78,7 +78,7 @@ class FacebooksettingsAction extends FacebookAction
             }
         }
 
-        if ($this->facebook->api_client->users_hasAppPermission('status_update')) {
+        if ($this->facebook->api_client->users_hasAppPermission('publish_stream')) {
 
             $this->elementStart('form', array('method' => 'post',
                                                'id' => 'facebook_settings'));
@@ -131,7 +131,7 @@ class FacebooksettingsAction extends FacebookAction
 
             $this->elementStart('ul', array('id' => 'fb-permissions-list'));
             $this->elementStart('li', array('id' => 'fb-permissions-item'));
-            $this->elementStart('fb:prompt-permission', array('perms' => 'status_update',
+            $this->elementStart('fb:prompt-permission', array('perms' => 'publish_stream',
                 'next_fbjs' => 'document.setLocation(\'' . "$this->app_uri/settings.php" . '\')'));
             $this->element('span', array('class' => 'facebook-button'),
                 sprintf(_('Allow %s to update my Facebook status'), common_config('site', 'name')));
diff --git a/actions/showgroup.php b/actions/showgroup.php
index ce11d574e..32ec674a9 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -317,8 +317,25 @@ class ShowgroupAction extends GroupDesignAction
           common_local_url('grouprss',
                            array('nickname' => $this->group->nickname));
 
-        return array(new Feed(Feed::RSS1, $url, sprintf(_('Notice feed for %s group'),
-                                                        $this->group->nickname)));
+        return array(new Feed(Feed::RSS1,
+                              common_local_url('grouprss',
+                                               array('nickname' => $this->group->nickname)),
+                              sprintf(_('Notice feed for %s group (RSS 1.0)'),
+                                      $this->group->nickname)),
+                     new Feed(Feed::RSS2,
+                              common_local_url('api',
+                                               array('apiaction' => 'groups',
+                                                     'method' => 'timeline',
+                                                     'argument' => $this->group->nickname.'.rss')),
+                              sprintf(_('Notice feed for %s group (RSS 2.0)'),
+                                      $this->group->nickname)),
+                     new Feed(Feed::ATOM,
+                              common_local_url('api',
+                                               array('apiaction' => 'groups',
+                                                     'method' => 'timeline',
+                                                     'argument' => $this->group->nickname.'.atom')),
+                              sprintf(_('Notice feed for %s group (Atom)'),
+                                      $this->group->nickname)));
     }
 
     /**
@@ -466,4 +483,4 @@ class GroupAdminSection extends ProfileSection
     {
         return null;
     }
-}
-\ No newline at end of file
+}
diff --git a/actions/tag.php b/actions/tag.php
index 888aba062..020399d9e 100644
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -72,8 +72,24 @@ class TagAction extends Action
     function getFeeds()
     {
         return array(new Feed(Feed::RSS1,
-                              common_local_url('tagrss', array('tag' => $this->tag)),
-                              sprintf(_('Feed for tag %s'), $this->tag)));
+                              common_local_url('tagrss',
+                                               array('tag' => $this->tag)),
+                              sprintf(_('Notice feed for tag %s (RSS 1.0)'),
+                                      $this->tag)),
+                     new Feed(Feed::RSS2,   
+                              common_local_url('api',
+                                               array('apiaction' => 'tags',
+                                                     'method' => 'timeline',
+                                                     'argument' => $this->tag.'.rss')),
+                              sprintf(_('Notice feed for %s group (RSS 2.0)'),
+                                      $this->tag)),
+                     new Feed(Feed::ATOM,
+                              common_local_url('api',
+                                               array('apiaction' => 'tags',
+                                                     'method' => 'timeline',
+                                                     'argument' => $this->tag.'.atom')),
+                              sprintf(_('Notice feed for tag %s (Atom)'),
+                                      $this->tag)));
     }
 
     function showContent()
diff --git a/actions/twitapigroups.php b/actions/twitapigroups.php
new file mode 100644
index 000000000..71a0776f4
--- /dev/null
+++ b/actions/twitapigroups.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Laconica extensions to the Twitter-like API for groups
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Twitter
+ * @package   Laconica
+ * @author    Craig Andrews
+ * @author    Zach Copley <zach@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/twitterapi.php';
+
+/**
+ * Group-specific API methods
+ *
+ * This class handles Laconica group API methods.
+ *
+ * @category  Twitter
+ * @package   Laconica
+ * @author    Craig Andrews
+ * @author    Zach Copley <zach@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+ class TwitapigroupsAction extends TwitterapiAction
+ {
+
+     function timeline($args, $apidata)
+     {
+         parent::handle($args);
+
+         common_debug("in groups api action");
+
+         $this->auth_user = $apidata['user'];
+         $group = $this->get_group($apidata['api_arg'], $apidata);
+
+         if (empty($group)) {
+             $this->clientError('Not Found', 404, $apidata['content-type']);
+             return;
+         }
+
+         $sitename   = common_config('site', 'name');
+         $title      = sprintf(_("%s timeline"), $group->nickname);
+         $taguribase = common_config('integration', 'taguri');
+         $id         = "tag:$taguribase:GroupTimeline:".$group->id;
+         $link       = common_local_url('showgroup',
+             array('nickname' => $group->nickname));
+         $subtitle   = sprintf(_('Updates from %1$s on %2$s!'),
+             $group->nickname, $sitename);
+
+         $page     = (int)$this->arg('page', 1);
+         $count    = (int)$this->arg('count', 20);
+         $max_id   = (int)$this->arg('max_id', 0);
+         $since_id = (int)$this->arg('since_id', 0);
+         $since    = $this->arg('since');
+
+         $notice = $group->getNotices(($page-1)*$count,
+             $count, $since_id, $max_id, $since);
+
+         switch($apidata['content-type']) {
+          case 'xml':
+             $this->show_xml_timeline($notice);
+             break;
+          case 'rss':
+             $this->show_rss_timeline($notice, $title, $link,
+                 $subtitle, $suplink);
+             break;
+          case 'atom':
+             if (isset($apidata['api_arg'])) {
+                 $selfuri = common_root_url() .
+                     'api/laconica/groups/timeline/' .
+                         $apidata['api_arg'] . '.atom';
+             } else {
+                 $selfuri = common_root_url() .
+                  'api/laconica/groups/timeline.atom';
+             }
+             $this->show_atom_timeline($notice, $title, $id, $link,
+                 $subtitle, $suplink, $selfuri);
+             break;
+          case 'json':
+             $this->show_json_timeline($notice);
+             break;
+          default:
+             $this->clientError(_('API method not found!'), $code = 404);
+         }
+     }
+
+}
diff --git a/actions/twitapitags.php b/actions/twitapitags.php
new file mode 100644
index 000000000..5c8527530
--- /dev/null
+++ b/actions/twitapitags.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Laconica extensions to the Twitter-like API for groups
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Twitter
+ * @package   Laconica
+ * @author    Craig Andrews
+ * @author    Zach Copley <zach@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/twitterapi.php';
+
+/**
+ * Group-specific API methods
+ *
+ * This class handles Laconica group API methods.
+ *
+ * @category  Twitter
+ * @package   Laconica
+ * @author    Craig Andrews
+ * @author    Zach Copley <zach@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+ class TwitapitagsAction extends TwitterapiAction
+ {
+
+     function timeline($args, $apidata)
+     {
+         parent::handle($args);
+
+         common_debug("in tags api action");
+
+         $this->auth_user = $apidata['user'];
+         $tag = $apidata['api_arg'];
+
+         if (empty($tag)) {
+             $this->clientError('Not Found', 404, $apidata['content-type']);
+             return;
+         }
+
+         $sitename   = common_config('site', 'name');
+         $title      = sprintf(_("Notices tagged with %s"), $tag);
+         $taguribase = common_config('integration', 'taguri');
+         $id         = "tag:$taguribase:TagTimeline:".$tag;
+         $link       = common_local_url('tag',
+             array('tag' => $tag));
+         $subtitle   = sprintf(_('Updates tagged with %1$s on %2$s!'),
+             $tag, $sitename);
+
+         $page     = (int)$this->arg('page', 1);
+         $count    = (int)$this->arg('count', 20);
+         $max_id   = (int)$this->arg('max_id', 0);
+         $since_id = (int)$this->arg('since_id', 0);
+         $since    = $this->arg('since');
+
+         # XXX: support max_id, since_id, and since arguments
+         $notice = Notice_tag::getStream($tag, ($page-1)*$count, $count + 1);
+
+         switch($apidata['content-type']) {
+          case 'xml':
+             $this->show_xml_timeline($notice);
+             break;
+          case 'rss':
+             $this->show_rss_timeline($notice, $title, $link,
+                 $subtitle, $suplink);
+             break;
+          case 'atom':
+             if (isset($apidata['api_arg'])) {
+                 $selfuri = common_root_url() .
+                     'api/laconica/tags/timeline/' .
+                         $apidata['api_arg'] . '.atom';
+             } else {
+                 $selfuri = common_root_url() .
+                  'api/laconica/tags/timeline.atom';
+             }
+             $this->show_atom_timeline($notice, $title, $id, $link,
+                 $subtitle, $suplink, $selfuri);
+             break;
+          case 'json':
+             $this->show_json_timeline($notice);
+             break;
+          default:
+             $this->clientError(_('API method not found!'), $code = 404);
+         }
+     }
+
+}
diff --git a/classes/File.php b/classes/File.php
index 533cc6e71..56d9f9827 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -193,5 +193,18 @@ class File extends Memcached_DataObject
 
         return 'http://'.$server.$path.$filename;
     }
+
+    function isEnclosure(){
+        if(isset($this->filename)){
+            return true;
+        }
+        $notEnclosureMimeTypes = array('text/html','application/xhtml+xml');
+        $mimetype = strtolower($this->mimetype);
+        $semicolon = strpos($mimetype,';');
+        if($semicolon){
+            $mimetype = substr($mimetype,0,$semicolon);
+        }
+        return(! in_array($mimetype,$notEnclosureMimeTypes));
+    }
 }
 
diff --git a/classes/Notice.php b/classes/Notice.php
index 75044cf63..08125cf7b 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1170,11 +1170,13 @@ class Notice extends Memcached_DataObject
         $attachments = $this->attachments();
         if($attachments){
             foreach($attachments as $attachment){
-                $attributes = array('rel'=>'enclosure','href'=>$attachment->url,'type'=>$attachment->mimetype,'length'=>$attachment->size);
-                if($attachment->title){
-                    $attributes['title']=$attachment->title;
+                if ($attachment->isEnclosure()) {
+                    $attributes = array('rel'=>'enclosure','href'=>$attachment->url,'type'=>$attachment->mimetype,'length'=>$attachment->size);
+                    if($attachment->title){
+                        $attributes['title']=$attachment->title;
+                    }
+                    $xs->element('link', $attributes, null);
                 }
-                $xs->element('link', $attributes, null);
             }
         }
 
diff --git a/extlib/DB/DataObject.php b/extlib/DB/DataObject.php
index 0c6a13dc2..8e226b8fa 100644
--- a/extlib/DB/DataObject.php
+++ b/extlib/DB/DataObject.php
@@ -2,11 +2,11 @@
 /**
  * Object Based Database Query Builder and data store
  *
- * PHP versions 4 and 5
+ * For PHP versions 4,5 and 6
  *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * LICENSE: This source file is subject to version 3.01 of the PHP license
  * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * http://www.php.net/license/3_01.txt.  If you did not receive a copy of
  * the PHP License and are unable to obtain it through the web, please
  * send a note to license@php.net so we can mail you a copy immediately.
  *
@@ -14,8 +14,8 @@
  * @package    DB_DataObject
  * @author     Alan Knowles <alan@akbkhome.com>
  * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: DataObject.php,v 1.439 2008/01/30 02:14:06 alan_k Exp $
+ * @license    http://www.php.net/license/3_01.txt  PHP License 3.01
+ * @version    CVS: $Id: DataObject.php 284150 2009-07-15 23:27:59Z alan_k $
  * @link       http://pear.php.net/package/DB_DataObject
  */
   
@@ -235,7 +235,7 @@ class DB_DataObject extends DB_DataObject_Overload
     * @access   private
     * @var      string
     */
-    var $_DB_DataObject_version = "1.8.8";
+    var $_DB_DataObject_version = "1.8.11";
 
     /**
      * The Database table (used by table extends)
@@ -1027,7 +1027,13 @@ class DB_DataObject extends DB_DataObject_Overload
         if ($leftq || $useNative) {
             $table = ($quoteIdentifiers ? $DB->quoteIdentifier($this->__table)    : $this->__table);
             
-            $r = $this->_query("INSERT INTO {$table} ($leftq) VALUES ($rightq) ");
+            
+            if (($dbtype == 'pgsql') && empty($leftq)) {
+                $r = $this->_query("INSERT INTO {$table} DEFAULT VALUES");
+            } else {
+               $r = $this->_query("INSERT INTO {$table} ($leftq) VALUES ($rightq) ");
+            }
+            
  
             
             
@@ -1339,7 +1345,7 @@ class DB_DataObject extends DB_DataObject_Overload
      *             build the condition only using the object parameters.
      *
      * @access public
-     * @return mixed True on success, false on failure, 0 on no data affected
+     * @return mixed Int (No. of rows affected) on success, false on failure, 0 on no data affected
      */
     function delete($useWhere = false)
     {
@@ -1369,7 +1375,13 @@ class DB_DataObject extends DB_DataObject_Overload
         if (($this->_query !== false) && $this->_query['condition']) {
         
             $table = ($quoteIdentifiers ? $DB->quoteIdentifier($this->__table) : $this->__table);
-            $sql = "DELETE FROM {$table} {$this->_query['condition']}{$extra_cond}";
+            $sql = "DELETE ";
+            // using a joined delete. - with useWhere..
+            $sql .= (!empty($this->_join) && $useWhere) ? 
+                "{$table} FROM {$table} {$this->_join} " : 
+                "FROM {$table} ";
+                
+            $sql .= $this->_query['condition']. $extra_cond;
             
             // add limit..
             
@@ -1521,15 +1533,15 @@ class DB_DataObject extends DB_DataObject_Overload
         }
         $keys = $this->keys();
 
-        if (!$keys[0] && !is_string($countWhat)) {
+        if (empty($keys[0]) && (!is_string($countWhat) || (strtoupper($countWhat) == 'DISTINCT'))) {
             $this->raiseError(
-                "You cannot do run count without keys - use \$do->keys('id');", 
+                "You cannot do run count without keys - use \$do->count('id'), or use \$do->count('distinct id')';", 
                 DB_DATAOBJECT_ERROR_INVALIDARGS,PEAR_ERROR_DIE);
             return false;
             
         }
         $table   = ($quoteIdentifiers ? $DB->quoteIdentifier($this->__table) : $this->__table);
-        $key_col = ($quoteIdentifiers ? $DB->quoteIdentifier($keys[0]) : $keys[0]);
+        $key_col = empty($keys[0]) ? '' : (($quoteIdentifiers ? $DB->quoteIdentifier($keys[0]) : $keys[0]));
         $as      = ($quoteIdentifiers ? $DB->quoteIdentifier('DATAOBJECT_NUM') : 'DATAOBJECT_NUM');
         
         // support distinct on default keys.
@@ -2044,7 +2056,7 @@ class DB_DataObject extends DB_DataObject_Overload
         // technically postgres native here...
         // we need to get the new improved tabledata sorted out first.
         
-        if (    in_array($dbtype , array('psql', 'mysql', 'mysqli', 'mssql', 'ifx')) && 
+        if (    in_array($dbtype , array('pgsql', 'mysql', 'mysqli', 'mssql', 'ifx')) && 
                 ($table[$usekey] & DB_DATAOBJECT_INT) && 
                 isset($realkeys[$usekey]) && ($realkeys[$usekey] == 'N')
                 ) {
@@ -2125,10 +2137,13 @@ class DB_DataObject extends DB_DataObject_Overload
             $this->_loadConfig();
         }
         // Set database driver for reference 
-        $db_driver = empty($_DB_DATAOBJECT['CONFIG']['db_driver']) ? 'DB' : $_DB_DATAOBJECT['CONFIG']['db_driver'];
-        // is it already connected ?
-
+        $db_driver = empty($_DB_DATAOBJECT['CONFIG']['db_driver']) ? 
+                'DB' : $_DB_DATAOBJECT['CONFIG']['db_driver'];
+        
+        // is it already connected ?    
         if ($this->_database_dsn_md5 && !empty($_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5])) {
+            
+            // connection is an error...
             if (PEAR::isError($_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5])) {
                 return $this->raiseError(
                         $_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5]->message,
@@ -2137,7 +2152,7 @@ class DB_DataObject extends DB_DataObject_Overload
                  
             }
 
-            if (!$this->_database) {
+            if (empty($this->_database)) {
                 $this->_database = $_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5]->dsn['database'];
                 $hasGetDatabase = method_exists($_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5], 'getDatabase');
                 
@@ -2166,6 +2181,7 @@ class DB_DataObject extends DB_DataObject_Overload
         // try and work out what to use for the dsn !
 
         $options= &$_DB_DATAOBJECT['CONFIG'];
+        // if the databse dsn dis defined in the object..
         $dsn = isset($this->_database_dsn) ? $this->_database_dsn : null;
         
         if (!$dsn) {
@@ -2173,14 +2189,14 @@ class DB_DataObject extends DB_DataObject_Overload
                 $this->_database = isset($options["table_{$this->__table}"]) ? $options["table_{$this->__table}"] : null;
             }
             if (!empty($_DB_DATAOBJECT['CONFIG']['debug'])) {
-                $this->debug("Checking for database database_{$this->_database} in options","CONNECT");
+                $this->debug("Checking for database specific ini ('{$this->_database}') : database_{$this->_database} in options","CONNECT");
             }
             
             if ($this->_database && !empty($options["database_{$this->_database}"]))  {
-                
                 $dsn = $options["database_{$this->_database}"];
             } else if (!empty($options['database'])) {
                 $dsn = $options['database'];
+                  
             }
         }
         
@@ -2205,6 +2221,9 @@ class DB_DataObject extends DB_DataObject_Overload
             if (!empty($_DB_DATAOBJECT['CONFIG']['debug'])) {
                 $this->debug("USING CACHED CONNECTION", "CONNECT",3);
             }
+            
+            
+            
             if (!$this->_database) {
 
                 $hasGetDatabase = method_exists($_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5], 'getDatabase');
@@ -2221,7 +2240,7 @@ class DB_DataObject extends DB_DataObject_Overload
             return true;
         }
         if (!empty($_DB_DATAOBJECT['CONFIG']['debug'])) {
-            $this->debug("NEW CONNECTION", "CONNECT",3);
+            $this->debug("NEW CONNECTION TP DATABASE :" .$this->_database , "CONNECT",3);
             /* actualy make a connection */
             $this->debug(print_r($dsn,true) ." {$this->_database_dsn_md5}", "CONNECT",3);
         }
@@ -2265,8 +2284,8 @@ class DB_DataObject extends DB_DataObject_Overload
             );
 
         }
-
-        if (!$this->_database) {
+         
+        if (empty($this->_database)) {
             $hasGetDatabase = method_exists($_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5], 'getDatabase');
             
             $this->_database = ($db_driver != 'DB' && $hasGetDatabase)  
@@ -2357,38 +2376,38 @@ class DB_DataObject extends DB_DataObject_Overload
         $t= explode(' ',microtime());
         $_DB_DATAOBJECT['QUERYENDTIME'] = $time = $t[0]+$t[1];
          
-
-        do {
         
-        if ($_DB_driver == 'DB') {
-            $result = $DB->query($string);
-        } else {
-            switch (strtolower(substr(trim($string),0,6))) {
+        for ($tries = 0;$tries < 3;$tries++) {
             
-                case 'insert':
-                case 'update':
-                case 'delete':
-                    $result = $DB->exec($string);
-                    break;
-                    
-                default:
-                    $result = $DB->query($string);
-                    break;
+            if ($_DB_driver == 'DB') {
+                
+                $result = $DB->query($string);
+            } else {
+                switch (strtolower(substr(trim($string),0,6))) {
+                
+                    case 'insert':
+                    case 'update':
+                    case 'delete':
+                        $result = $DB->exec($string);
+                        break;
+                        
+                    default:
+                        $result = $DB->query($string);
+                        break;
+                }
             }
+            
+            // see if we got a failure.. - try again a few times..
+            if (!is_a($result,'PEAR_Error')) {
+                break;
+            }
+            if ($result->getCode() != -14) {  // *DB_ERROR_NODBSELECTED
+                break; // not a connection error..
+            }
+            sleep(1); // wait before retyring..
+            $DB->connect($DB->dsn);
         }
-
-          // try to reconnect, at most 3 times
-          $again = false;
-          if (is_a($result, 'PEAR_Error')
-          AND $result->getCode() == DB_ERROR_NODBSELECTED
-          AND $cpt++<3) {
-              $DB->disconnect();
-              sleep(1);
-              $DB->connect($DB->dsn);
-              $again = true;
-          }
-          
-        } while ($again);
+       
 
         if (is_a($result,'PEAR_Error')) {
             if (!empty($_DB_DATAOBJECT['CONFIG']['debug'])) { 
@@ -2556,11 +2575,13 @@ class DB_DataObject extends DB_DataObject_Overload
      * use @ to silence it (if you are sure it is acceptable)
      * eg. $do = @DB_DataObject::factory('person')
      *
-     * table name will eventually be databasename/table
+     * table name can bedatabasename/table
      * - and allow modular dataobjects to be written..
      * (this also helps proxy creation)
      *
-     *
+     * Experimental Support for Multi-Database factory eg. mydatabase.mytable
+     * 
+     * 
      * @param  string  $table  tablename (use blank to create a new instance of the same class.)
      * @access private
      * @return DataObject|PEAR_Error 
@@ -2570,9 +2591,27 @@ class DB_DataObject extends DB_DataObject_Overload
 
     function factory($table = '') {
         global $_DB_DATAOBJECT;
+        
+        
+        // multi-database support.. - experimental.
+        $database = '';
+       
+        if (strpos( $table,'/') !== false ) {
+            list($database,$table) = explode('.',$table, 2);
+          
+        }
+         
         if (empty($_DB_DATAOBJECT['CONFIG'])) {
             DB_DataObject::_loadConfig();
         }
+        // no configuration available for database
+        if (!empty($database) && empty($_DB_DATAOBJECT['CONFIG']['database_'.$database])) {
+                return DB_DataObject::raiseError(
+                    "unable to find database_{$database} in Configuration, It is required for factory with database"
+                    , 0, PEAR_ERROR_DIE );   
+       }
+        
+       
         
         if ($table === '') {
             if (is_a($this,'DB_DataObject') && strlen($this->__table)) {
@@ -2584,17 +2623,22 @@ class DB_DataObject extends DB_DataObject_Overload
             }
         }
         
-        
+        // does this need multi db support??
         $p = isset($_DB_DATAOBJECT['CONFIG']['class_prefix']) ?
             $_DB_DATAOBJECT['CONFIG']['class_prefix'] : '';
         $class = $p . preg_replace('/[^A-Z0-9]/i','_',ucfirst($table));
-        
         $ce = substr(phpversion(),0,1) > 4 ? class_exists($class,false) : class_exists($class);
+        
         $class = $ce ? $class  : DB_DataObject::_autoloadClass($class);
         
         // proxy = full|light
         if (!$class && isset($_DB_DATAOBJECT['CONFIG']['proxy'])) { 
+        
+            DB_DataObject::debug("FAILED TO Autoload  $database.$table - using proxy.","FACTORY",1);
+        
+        
             $proxyMethod = 'getProxy'.$_DB_DATAOBJECT['CONFIG']['proxy'];
+            // if you have loaded (some other way) - dont try and load it again..
             class_exists('DB_DataObject_Generator') ? '' : 
                     require_once 'DB/DataObject/Generator.php';
             
@@ -2614,8 +2658,12 @@ class DB_DataObject extends DB_DataObject_Overload
                 "factory could not find class $class from $table",
                 DB_DATAOBJECT_ERROR_INVALIDCONFIG);
         }
-
-        return new $class;
+        $ret = new $class;
+        if (!empty($database)) {
+            DB_DataObject::debug("Setting database to $database","FACTORY",1);
+            $ret->database($database);
+        }
+        return $ret;
     }
     /**
      * autoload Class
@@ -3079,7 +3127,7 @@ class DB_DataObject extends DB_DataObject_Overload
             return;
         }
          
-
+        //echo '<PRE>'; print_r(func_get_args());
         $useWhereAsOn = false;
         // support for 2nd argument as an array of options
         if (is_array($joinType)) {
@@ -3119,8 +3167,39 @@ class DB_DataObject extends DB_DataObject_Overload
         $DB = &$_DB_DATAOBJECT['CONNECTIONS'][$this->_database_dsn_md5];
        
 
+        /// CHANGED 26 JUN 2009 - we prefer links from our local table over the remote one.
         
-        
+        /* otherwise see if there are any links from this table to the obj. */
+        //print_r($this->links());
+        if (($ofield === false) && ($links = $this->links())) {
+            foreach ($links as $k => $v) {
+                /* link contains {this column} = {linked table}:{linked column} */
+                $ar = explode(':', $v);
+                // Feature Request #4266 - Allow joins with multiple keys
+                if (strpos($k, ',') !== false) {
+                    $k = explode(',', $k);
+                }
+                if (strpos($ar[1], ',') !== false) {
+                    $ar[1] = explode(',', $ar[1]);
+                }
+
+                if ($ar[0] == $obj->__table) {
+                    if ($joinCol !== false) {
+                        if ($k == $joinCol) {
+                            $tfield = $k;
+                            $ofield = $ar[1];
+                            break;
+                        } else {
+                            continue;
+                        }
+                    } else {
+                        $tfield = $k;
+                        $ofield = $ar[1];
+                        break;
+                    }
+                }
+            }
+        }
          /* look up the links for obj table */
         //print_r($obj->links());
         if (!$ofield && ($olinks = $obj->links())) {
@@ -3164,37 +3243,6 @@ class DB_DataObject extends DB_DataObject_Overload
             }
         }
 
-        /* otherwise see if there are any links from this table to the obj. */
-        //print_r($this->links());
-        if (($ofield === false) && ($links = $this->links())) {
-            foreach ($links as $k => $v) {
-                /* link contains {this column} = {linked table}:{linked column} */
-                $ar = explode(':', $v);
-                // Feature Request #4266 - Allow joins with multiple keys
-                if (strpos($k, ',') !== false) {
-                    $k = explode(',', $k);
-                }
-                if (strpos($ar[1], ',') !== false) {
-                    $ar[1] = explode(',', $ar[1]);
-                }
-
-                if ($ar[0] == $obj->__table) {
-                    if ($joinCol !== false) {
-                        if ($k == $joinCol) {
-                            $tfield = $k;
-                            $ofield = $ar[1];
-                            break;
-                        } else {
-                            continue;
-                        }
-                    } else {
-                        $tfield = $k;
-                        $ofield = $ar[1];
-                        break;
-                    }
-                }
-            }
-        }
         // finally if these two table have column names that match do a join by default on them
 
         if (($ofield === false) && $joinCol) {
@@ -3383,22 +3431,25 @@ class DB_DataObject extends DB_DataObject_Overload
             case 'RIGHT': // others??? .. cross, left outer, right outer, natural..?
                 
                 // Feature Request #4266 - Allow joins with multiple keys
-                $this->_join .= "\n {$joinType} JOIN {$objTable} {$fullJoinAs}";
+                $jadd = "\n {$joinType} JOIN {$objTable} {$fullJoinAs}";
+                //$this->_join .= "\n {$joinType} JOIN {$objTable} {$fullJoinAs}";
                 if (is_array($ofield)) {
                 	$key_count = count($ofield);
                     for($i = 0; $i < $key_count; $i++) {
                     	if ($i == 0) {
-                    		$this->_join .= " ON ({$joinAs}.{$ofield[$i]}={$table}.{$tfield[$i]}) ";
+                    		$jadd .= " ON ({$joinAs}.{$ofield[$i]}={$table}.{$tfield[$i]}) ";
                     	}
                     	else {
-                    		$this->_join .= " AND {$joinAs}.{$ofield[$i]}={$table}.{$tfield[$i]} ";
+                    		$jadd .= " AND {$joinAs}.{$ofield[$i]}={$table}.{$tfield[$i]} ";
                     	}
                     }
-                    $this->_join .= ' ' . $appendJoin . ' ';
+                    $jadd .= ' ' . $appendJoin . ' ';
                 } else {
-	                $this->_join .= " ON ({$joinAs}.{$ofield}={$table}.{$tfield}) {$appendJoin} ";
+	                $jadd .= " ON ({$joinAs}.{$ofield}={$table}.{$tfield}) {$appendJoin} ";
                 }
-
+                // jadd avaliable for debugging join build.
+                //echo $jadd ."\n";
+                $this->_join .= $jadd;
                 break;
                 
             case '': // this is just a standard multitable select..
@@ -3459,7 +3510,7 @@ class DB_DataObject extends DB_DataObject_Overload
                 continue;
             }
             
-            if (empty($from[$k]) && $skipEmpty) {
+            if (empty($from[sprintf($format,$k)]) && $skipEmpty) {
                 continue;
             }
             
diff --git a/extlib/DB/DataObject/Cast.php b/extlib/DB/DataObject/Cast.php
index 616abb55e..095d2a4d2 100644
--- a/extlib/DB/DataObject/Cast.php
+++ b/extlib/DB/DataObject/Cast.php
@@ -15,9 +15,9 @@
  * @category   Database
  * @package    DB_DataObject
  * @author     Alan Knowles <alan@akbkhome.com>
- * @copyright  1997-2006 The PHP Group
+ * @copyright  1997-2008 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Cast.php,v 1.15 2005/07/07 05:30:53 alan_k Exp $
+ * @version    CVS: $Id: Cast.php 264148 2008-08-04 03:44:59Z alan_k $
  * @link       http://pear.php.net/package/DB_DataObject
  */
   
@@ -391,7 +391,10 @@ class DB_DataObject_Cast {
                 // this is funny - the parameter order is reversed ;)
                 return "'".mysqli_real_escape_string($db->connection, $this->value)."'";
              
-            
+            case 'sqlite':
+                // this is funny - the parameter order is reversed ;)
+                return "'".sqlite_escape_string($this->value)."'";
+           
                  
             default:
                 return PEAR::raiseError("DB_DataObject_Cast cant handle blobs for Database:{$db->dsn['phptype']} Yet");
diff --git a/extlib/DB/DataObject/Error.php b/extlib/DB/DataObject/Error.php
index 05a741408..382115453 100644
--- a/extlib/DB/DataObject/Error.php
+++ b/extlib/DB/DataObject/Error.php
@@ -18,7 +18,7 @@
  * @author     Alan Knowles <alan@akbkhome.com>
  * @copyright  1997-2006 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Error.php,v 1.3 2005/03/23 02:35:35 alan_k Exp $
+ * @version    CVS: $Id: Error.php 277015 2009-03-12 05:51:03Z alan_k $
  * @link       http://pear.php.net/package/DB_DataObject
  */
   
diff --git a/extlib/DB/DataObject/Generator.php b/extlib/DB/DataObject/Generator.php
index de16af692..ff6e42c7d 100644
--- a/extlib/DB/DataObject/Generator.php
+++ b/extlib/DB/DataObject/Generator.php
@@ -4,9 +4,9 @@
  *
  * PHP versions 4 and 5
  *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * LICENSE: This source file is subject to version 3.01 of the PHP license
  * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * http://www.php.net/license/3_01.txt.  If you did not receive a copy of
  * the PHP License and are unable to obtain it through the web, please
  * send a note to license@php.net so we can mail you a copy immediately.
  *
@@ -14,8 +14,8 @@
  * @package    DB_DataObject
  * @author     Alan Knowles <alan@akbkhome.com>
  * @copyright  1997-2006 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Generator.php,v 1.141 2008/01/30 02:29:39 alan_k Exp $
+ * @license    http://www.php.net/license/3_01.txt  PHP License 3.01
+ * @version    CVS: $Id: Generator.php 284150 2009-07-15 23:27:59Z alan_k $
  * @link       http://pear.php.net/package/DB_DataObject
  */
  
@@ -193,7 +193,11 @@ class DB_DataObject_Generator extends DB_DataObject
             /**
              * set portability and some modules to fetch the informations
              */
-            $__DB->setOption('portability', MDB2_PORTABILITY_ALL ^ MDB2_PORTABILITY_FIX_CASE);
+            $db_options = PEAR::getStaticProperty('MDB2','options');
+            if (empty($db_options)) {
+                $__DB->setOption('portability', MDB2_PORTABILITY_ALL ^ MDB2_PORTABILITY_FIX_CASE);
+            }
+            
             $__DB->loadModule('Manager');
             $__DB->loadModule('Reverse');
         }
@@ -265,12 +269,7 @@ class DB_DataObject_Generator extends DB_DataObject
             } else {
                 $defs =  $__DB->reverse->tableInfo($quotedTable);
                 // rename the length value, so it matches db's return.
-                foreach ($defs as $k => $v) {
-                    if (!isset($defs[$k]['length'])) {
-                        continue;
-                    }
-                    $defs[$k]['len'] = $defs[$k]['length'];
-                }
+                
             }
 
             if (is_a($defs,'PEAR_Error')) {
@@ -286,7 +285,10 @@ class DB_DataObject_Generator extends DB_DataObject
                 if (!is_array($def)) {
                     continue;
                 }
-
+                // rename the length value, so it matches db's return.
+                if (isset($def['length']) && !isset($def['len'])) {
+                    $def['len'] = $def['length'];
+                }
                 $this->_definitions[$table][] = (object) $def;
 
             }
@@ -391,7 +393,10 @@ class DB_DataObject_Generator extends DB_DataObject
         $fk = array();
 
         foreach($this->tables as $this->table) {
-            $res =& $DB->query('SHOW CREATE TABLE ' . $this->table);
+            $quotedTable = !empty($options['quote_identifiers_tableinfo']) ?  $DB->quoteIdentifier($table)  : $this->table;
+            
+            $res =& $DB->query('SHOW CREATE TABLE ' . $quotedTable );
+
             if (PEAR::isError($res)) {
                 die($res->getMessage());
             }
@@ -467,7 +472,7 @@ class DB_DataObject_Generator extends DB_DataObject
     function _generateDefinitionsTable()
     {
         global $_DB_DATAOBJECT;
-        
+        $options = PEAR::getStaticProperty('DB_DataObject','options');
         $defs = $this->_definitions[$this->table];
         $this->_newConfig .= "\n[{$this->table}]\n";
         $keys_out =  "\n[{$this->table}__keys]\n";
@@ -551,6 +556,9 @@ class DB_DataObject_Generator extends DB_DataObject
                 
                 case 'ENUM':
                 case 'SET':         // not really but oh well
+                
+                case 'POINT':       // mysql geometry stuff - not really string - but will do..
+                
                 case 'TIMESTAMPTZ': // postgres
                 case 'BPCHAR':      // postgres
                 case 'INTERVAL':    // postgres (eg. '12 days')
@@ -594,14 +602,18 @@ class DB_DataObject_Generator extends DB_DataObject
                         DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME;
                     break;    
                     
-                    
-                case 'TINYBLOB':
+                
                 case 'BLOB':       /// these should really be ignored!!!???
+                case 'TINYBLOB':
                 case 'MEDIUMBLOB':
                 case 'LONGBLOB':
+                
+                case 'CLOB': // oracle character lob support
+                
                 case 'BYTEA':   // postgres blob support..
                     $type = DB_DATAOBJECT_STR + DB_DATAOBJECT_BLOB;
                     break;
+                    
                 default:     
                     echo "*****************************************************************\n".
                          "**               WARNING UNKNOWN TYPE                          **\n".
@@ -653,7 +665,9 @@ class DB_DataObject_Generator extends DB_DataObject
             // only use primary key or nextval(), cause the setFrom blocks you setting all key items...
             // if no keys exist fall back to using unique
             //echo "\n{$t->name} => {$t->flags}\n";
-            if (preg_match("/(auto_increment|nextval\()/i",rawurldecode($t->flags)) 
+            $secondary_key_match = isset($options['generator_secondary_key_match']) ? $options['generator_secondary_key_match'] : 'primary|unique';
+            
+            if (preg_match('/(auto_increment|nextval\()/i',rawurldecode($t->flags)) 
                 || (isset($t->autoincrement) && ($t->autoincrement === true))) {
                     
                 // native sequences = 2
@@ -662,7 +676,7 @@ class DB_DataObject_Generator extends DB_DataObject
                 }
                 $ret_keys_primary[$t->name] = 'N';
             
-            } else if (preg_match("/(primary|unique)/i",$t->flags)) {
+            } else if ($secondary_key_match && preg_match('/('.$secondary_key_match.')/i',$t->flags)) {
                 // keys.. = 1
                 $key_type = 'K';
                 if (!preg_match("/(primary)/i",$t->flags)) {
@@ -868,10 +882,13 @@ class DB_DataObject_Generator extends DB_DataObject
         // then we should add var $_database = here
         // as database names may not always match.. 
         
+        if (empty($GLOBALS['_DB_DATAOBJECT']['CONFIG'])) {
+            DB_DataObject::_loadConfig();
+        }
+
+         // Only include the $_database property if the omit_database_var is unset or false
         
-            
-        
-        if (isset($options["database_{$this->_database}"])) {
+        if (isset($options["database_{$this->_database}"]) && empty($GLOBALS['_DB_DATAOBJECT']['CONFIG']['generator_omit_database_var'])) {
             $body .= "    {$var} \$_database = '{$this->_database}';  {$p}// database name (used with database_{*} config)\n";
         }
         
@@ -904,9 +921,10 @@ class DB_DataObject_Generator extends DB_DataObject
             $padding = (30 - strlen($t->name));
             if ($padding < 2) $padding =2;
             $p =  str_repeat(' ',$padding) ;
-           
-            $body .="    {$var} \${$t->name};  {$p}// {$t->type}({$t->len})  {$t->flags}\n";
-             
+            
+            $length = empty($t->len) ? '' : '('.$t->len.')';
+            $body .="    {$var} \${$t->name};  {$p}// {$t->type}$length  {$t->flags}\n";
+            
             // can not do set as PEAR::DB table info doesnt support it.
             //if (substr($t->Type,0,3) == "set")
             //    $sets[$t->Field] = "array".substr($t->Type,3);
@@ -1185,7 +1203,7 @@ class DB_DataObject_Generator extends DB_DataObject
             $__DB->loadModule('Manager');
             $__DB->loadModule('Reverse');
         }
-        $quotedTable = !empty($options['quote_identifiers']) ? 
+        $quotedTable = !empty($options['quote_identifiers_tableinfo']) ? 
                 $__DB->quoteIdentifier($table) : $table;
           
         if (!$is_MDB2) {
diff --git a/extlib/DB/DataObject/createTables.php b/extlib/DB/DataObject/createTables.php
index c0659574e..d54d28c24 100755..100644
--- a/extlib/DB/DataObject/createTables.php
+++ b/extlib/DB/DataObject/createTables.php
@@ -16,7 +16,7 @@
 // | Author:  Alan Knowles <alan@akbkhome.com>
 // +----------------------------------------------------------------------+
 //
-// $Id: createTables.php,v 1.24 2006/01/13 01:27:55 alan_k Exp $
+// $Id: createTables.php 277015 2009-03-12 05:51:03Z alan_k $
 //
 
 // since this version doesnt use overload, 
diff --git a/js/util.js b/js/util.js
index bbcbc0bbb..f3ed918cf 100644
--- a/js/util.js
+++ b/js/util.js
@@ -283,7 +283,7 @@ function NoticeAttachments() {
         },
         timeout : 0,
         autoHide : true,
-        css : {'max-width':'542px', 'top':'22.5%', 'left':'32.5%'}
+        css : {'max-width':'542px', 'top':'5%', 'left':'32.5%'}
     };
 
     $('#content .notice a.attachment').click(function() {
diff --git a/lib/facebookaction.php b/lib/facebookaction.php
index 1ae90d53b..5be2f2fe6 100644
--- a/lib/facebookaction.php
+++ b/lib/facebookaction.php
@@ -460,16 +460,6 @@ class FacebookAction extends Action
         }
     }
 
-    function updateFacebookStatus($notice)
-    {
-        $prefix = $this->facebook->api_client->data_getUserPreference(FACEBOOK_NOTICE_PREFIX, $this->fbuid);
-        $content = "$prefix $notice->content";
-
-        if ($this->facebook->api_client->users_hasAppPermission('status_update', $this->fbuid)) {
-            $this->facebook->api_client->users_setStatus($content, $this->fbuid, false, true);
-        }
-    }
-
     function saveNewNotice()
     {
 
@@ -504,7 +494,7 @@ class FacebookAction extends Action
         $replyto = $this->trimmed('inreplyto');
 
         $notice = Notice::saveNew($user->id, $content,
-            'Facebook', 1, ($replyto == 'false') ? null : $replyto);
+            'web', 1, ($replyto == 'false') ? null : $replyto);
 
         if (is_string($notice)) {
             $this->showPage($notice);
@@ -514,8 +504,7 @@ class FacebookAction extends Action
         common_broadcast_notice($notice);
 
         // Also update the user's Facebook status
-        $this->updateFacebookStatus($notice);
-        $this->updateProfileBox($notice);
+        facebookBroadcastNotice($notice);
 
     }
 
diff --git a/lib/facebookutil.php b/lib/facebookutil.php
index 632ec4bad..85077c254 100644
--- a/lib/facebookutil.php
+++ b/lib/facebookutil.php
@@ -86,13 +86,17 @@ function isFacebookBound($notice, $flink) {
 
             // Check to see if the user has given the FB app status update perms
             $result = $facebook->api_client->
-                users_hasAppPermission('status_update', $fbuid);
+                users_hasAppPermission('publish_stream', $fbuid);
 
             if ($result != 1) {
+                $result = $facebook->api_client->
+                    users_hasAppPermission('status_update', $fbuid);
+            }
+            if ($result != 1) {
                 $user = $flink->getUser();
                 $msg = "Not sending notice $notice->id to Facebook " .
                     "because user $user->nickname hasn't given the " .
-                    'Facebook app \'status_update\' permission.';
+                    'Facebook app \'status_update\' or \'publish_stream\' permission.';
                 common_debug($msg);
                 $success = false;
             }
@@ -138,7 +142,56 @@ function facebookBroadcastNotice($notice)
         // Okay, we're good to go, update the FB status
 
         try {
-            $facebook->api_client->users_setStatus($status, $fbuid, false, true);
+            $result = $facebook->api_client->
+                users_hasAppPermission('publish_stream', $fbuid);
+            if($result == 1){
+                // authorized to use the stream api, so use it
+                $fbattachment = null;
+                $attachments = $notice->attachments();
+                if($attachments){
+                    $fbattachment=array();
+                    $fbattachment['media']=array();
+                    //facebook only supports one attachment per item
+                    $attachment = $attachments[0];
+                    $fbmedia=array();
+                    if(strncmp($attachment->mimetype,'image/',strlen('image/'))==0){
+                        $fbmedia['type']='image';
+                        $fbmedia['src']=$attachment->url;
+                        $fbmedia['href']=$attachment->url;
+                        $fbattachment['media'][]=$fbmedia;
+/* Video doesn't seem to work. The notice never makes it to facebook, and no error is reported.
+                    }else if(strncmp($attachment->mimetype,'video/',strlen('image/'))==0 || $attachment->mimetype="application/ogg"){
+                        $fbmedia['type']='video';
+                        $fbmedia['video_src']=$attachment->url;
+                        // http://wiki.developers.facebook.com/index.php/Attachment_%28Streams%29
+                        // says that preview_img is required... but we have no value to put in it
+                        // $fbmedia['preview_img']=$attachment->url;
+                        if($attachment->title){
+                            $fbmedia['video_title']=$attachment->title;
+                        }
+                        $fbmedia['video_type']=$attachment->mimetype;
+                        $fbattachment['media'][]=$fbmedia;
+*/
+                    }else if($attachment->mimetype=='audio/mpeg'){
+                        $fbmedia['type']='mp3';
+                        $fbmedia['src']=$attachment->url;
+                        $fbattachment['media'][]=$fbmedia;
+                    }else if($attachment->mimetype=='application/x-shockwave-flash'){
+                        $fbmedia['type']='flash';
+                        // http://wiki.developers.facebook.com/index.php/Attachment_%28Streams%29
+                        // says that imgsrc is required... but we have no value to put in it
+                        // $fbmedia['imgsrc']='';
+                        $fbmedia['swfsrc']=$attachment->url;
+                        $fbattachment['media'][]=$fbmedia;
+                    }else{
+                        $fbattachment['name']=($attachment->title?$attachment->title:$attachment->url);
+                        $fbattachment['href']=$attachment->url;
+                    }
+                }
+                $facebook->api_client->stream_publish($status, $fbattachment, null, null, $fbuid);
+            }else{
+                $facebook->api_client->users_setStatus($status, $fbuid, false, true);
+            }
         } catch(FacebookRestClientException $e) {
             common_log(LOG_ERR, $e->getMessage());
             common_log(LOG_ERR,
@@ -150,7 +203,7 @@ function facebookBroadcastNotice($notice)
             if ($code >= 200) {
 
                 // 200 The application does not have permission to operate on the passed in uid parameter.
-                // 250 Updating status requires the extended permission status_update.
+                // 250 Updating status requires the extended permission status_update or publish_stream.
                 // see: http://wiki.developers.facebook.com/index.php/Users.setStatus#Example_Return_XML
 
                 remove_facebook_app($flink);
diff --git a/lib/router.php b/lib/router.php
index 75e72f932..e12138637 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -266,7 +266,7 @@ class Router
         $m->connect('api/statuses/:method/:argument',
                     array('action' => 'api',
                           'apiaction' => 'statuses'),
-                    array('method' => '(user_timeline|friends_timeline|replies|mentions|show|destroy|friends|followers)'));
+                    array('method' => '(|user_timeline|friends_timeline|replies|mentions|show|destroy|friends|followers)'));
 
         // users
 
@@ -394,6 +394,24 @@ class Router
                     array('action' => 'api',
                           'apiaction' => 'laconica'));
 
+        // Groups
+        $m->connect('api/laconica/groups/:method/:argument',
+                    array('action' => 'api',
+                          'apiaction' => 'groups'));
+
+        $m->connect('api/laconica/groups/:method',
+                    array('action' => 'api',
+                          'apiaction' => 'groups'));
+
+        // Tags
+        $m->connect('api/laconica/tags/:method/:argument',
+                    array('action' => 'api',
+                          'apiaction' => 'tags'));
+
+        $m->connect('api/laconica/tags/:method',
+                    array('action' => 'api',
+                          'apiaction' => 'tags'));
+
         // search
         $m->connect('api/search.atom', array('action' => 'twitapisearchatom'));
         $m->connect('api/search.json', array('action' => 'twitapisearchjson'));
diff --git a/lib/rssaction.php b/lib/rssaction.php
index 15c238bf9..40fe11c66 100644
--- a/lib/rssaction.php
+++ b/lib/rssaction.php
@@ -229,6 +229,24 @@ class Rss10Action extends Action
         }
     }
 
+    // XXX: Surely there should be a common function to do this?
+    function extract_tags ($string)
+    {
+        $count = preg_match_all('/(?:^|\s)#([A-Za-z0-9_\-\.]{1,64})/', strtolower($string), $match);
+        if (!count)
+        {
+            return array();
+        }
+
+        $rv = array();
+        foreach ($match[1] as $tag)
+        {
+            $rv[] = common_canonical_tag($tag);
+        } 
+
+        return array_unique($rv);
+    }
+	 
     function showItem($notice)
     {
         $profile = Profile::staticGet($notice->profile_id);
@@ -256,10 +274,46 @@ class Rss10Action extends Action
         $attachments = $notice->attachments();
         if($attachments){
             foreach($attachments as $attachment){
-                $this->element('enc:enclosure', array('rdf:resource'=>$attachment->url,'enc:type'=>$attachment->mimetype,'enc:length'=>$attachment->size), null);
+                if ($attachment->isEnclosure()) {
+                    // DO NOT move xmlns declaration to root element. Making it
+                    // the default namespace here improves compatibility with
+                    // real-world feed readers.
+                    $attribs = array(
+                        'rdf:resource' => $attachment->url,
+                        'url' => $attachment->url,
+                        'xmlns' => 'http://purl.oclc.org/net/rss_2.0/enc#'
+                        );
+                    if ($attachment->title) {
+                        $attribs['dc:title'] = $attachment->title;
+                    }
+                    if ($attachment->modified) {
+                        $attribs['dc:date'] = common_date_w3dtf($attachment->modified);
+                    }
+                    if ($attachment->size) {
+                        $attribs['length'] = $attachment->size;
+                    }
+                    if ($attachment->mimetype) {
+                        $attribs['type'] = $attachment->mimetype;
+                    }
+                    $this->element('enclosure', $attribs);
+                }
+                $this->element('sioc:links_to', array('rdf:resource'=>$attachment->url));
+            }
+        }
+        $tags = $this->extract_tags($notice->content);
+        if (!empty($tags)) {
+            foreach ($tags as $tag)
+            {
+                $tagpage = common_local_url('tag', array('tag' => $tag));
+                $tagrss  = common_local_url('tagrss', array('tag' => $tag));
+                $this->elementStart('ctag:tagged');
+                $this->elementStart('ctag:Tag', array('rdf:about'=>$tagpage.'#concept', 'ctag:label'=>$tag));
+                $this->element('foaf:page', array('rdf:resource'=>$tagpage));
+                $this->element('rdfs:seeAlso', array('rdf:resource'=>$tagrss));
+                $this->elementEnd('ctag:Tag');
+                $this->elementEnd('ctag:tagged');
             }
         }
-
         $this->elementEnd('item');
         $this->creators[$creator_uri] = $profile;
     }
@@ -295,8 +349,8 @@ class Rss10Action extends Action
                                               'http://creativecommons.org/ns#',
                                               'xmlns:content' =>
                                               'http://purl.org/rss/1.0/modules/content/',
-                                              'xmlns:enc' =>
-                                              'http://purl.oclc.org/net/rss_2.0/enc#',
+                                              'xmlns:ctag' =>
+                                              'http://commontag.org/ns#',
                                               'xmlns:foaf' =>
                                               'http://xmlns.com/foaf/0.1/',
                                               'xmlns:sioc' =>
diff --git a/lib/twitterapi.php b/lib/twitterapi.php
index f48513e67..749083c7c 100644
--- a/lib/twitterapi.php
+++ b/lib/twitterapi.php
@@ -186,6 +186,21 @@ class TwitterapiAction extends Action
             $twitter_status['favorited'] = false;
         }
 
+        # Enclosures
+        $attachments = $notice->attachments();
+        $twitter_status['attachments']=array();
+        if($attachments){
+            foreach($attachments as $attachment){
+                if ($attachment->isEnclosure()) {
+                    $enclosure=array();
+                    $enclosure['url']=$attachment->url;
+                    $enclosure['mimetype']=$attachment->mimetype;
+                    $enclosure['size']=$attachment->size;
+                    $twitter_status['attachments'][]=$enclosure;
+                }
+            }
+        }
+
         if ($include_user) {
             # Don't get notice (recursive!)
             $twitter_user = $this->twitter_user_array($profile, false);
@@ -218,11 +233,13 @@ class TwitterapiAction extends Action
         if($attachments){
             $entry['enclosures']=array();
             foreach($attachments as $attachment){
-                $enclosure=array();
-                $enclosure['url']=$attachment->url;
-                $enclosure['mimetype']=$attachment->mimetype;
-                $enclosure['size']=$attachment->size;
-                $entry['enclosures'][]=$enclosure;
+                if ($attachment->isEnclosure()) {
+                    $enclosure=array();
+                    $enclosure['url']=$attachment->url;
+                    $enclosure['mimetype']=$attachment->mimetype;
+                    $enclosure['size']=$attachment->size;
+                    $entry['enclosures'][]=$enclosure;
+                }
             }
         }
 
@@ -774,6 +791,34 @@ class TwitterapiAction extends Action
         }
     }
 
+    function get_group($id, $apidata=null)
+    {
+        if (empty($id)) {
+
+            if (is_numeric($this->arg('id'))) {
+                return User_group::staticGet($this->arg('id'));
+            } else if ($this->arg('id')) {
+                $nickname = common_canonical_nickname($this->arg('id'));
+                return User_group::staticGet('nickname', $nickname);
+            } else if ($this->arg('group_id')) {
+                // This is to ensure that a non-numeric user_id still
+                // overrides screen_name even if it doesn't get used
+                if (is_numeric($this->arg('group_id'))) {
+                    return User_group::staticGet('id', $this->arg('group_id'));
+                }
+            } else if ($this->arg('group_name')) {
+                $nickname = common_canonical_nickname($this->arg('group_name'));
+                return User_group::staticGet('nickname', $nickname);
+            }
+
+        } else if (is_numeric($id)) {
+            return User_group::staticGet($id);
+        } else {
+            $nickname = common_canonical_nickname($id);
+            return User_group::staticGet('nickname', $nickname);
+        }
+    }
+
     function get_profile($id)
     {
         if (is_numeric($id)) {
diff --git a/locale/bg_BG/LC_MESSAGES/laconica.mo b/locale/bg_BG/LC_MESSAGES/laconica.mo
index 439731dfc..4aa8804c5 100644
--- a/locale/bg_BG/LC_MESSAGES/laconica.mo
+++ b/locale/bg_BG/LC_MESSAGES/laconica.mo
diff --git a/locale/bg_BG/LC_MESSAGES/laconica.po b/locale/bg_BG/LC_MESSAGES/laconica.po
index 15279970f..3ad602175 100644
--- a/locale/bg_BG/LC_MESSAGES/laconica.po
+++ b/locale/bg_BG/LC_MESSAGES/laconica.po
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: Laconica 0.6.4\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-01-20 13:54+0000\n"
-"Last-Translator: Stoyan Zhekov <zhesto@gmail.com>\n"
+"PO-Revision-Date: 2009-06-27 18:04+0000\n"
+"Last-Translator: Yasen Pramatarov <yasen@lindeas.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,25 +22,25 @@ msgstr ""
 #: actions/noticesearchrss.php:88
 #, php-format
 msgid " Search Stream for \"%s\""
-msgstr "Търсене на \"%s\" в потока"
+msgstr " Търсене на \"%s\" в потока"
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
 #: actions/finishopenidlogin.php:110
 msgid ""
 " except this private data: password, email address, IM address, phone number."
-msgstr "освен тези лични данни: парола, е-поща, месинджър, телефон."
+msgstr " освен тези лични данни: парола, е-поща, месинджър, телефон."
 
 #: ../actions/showstream.php:400 ../lib/stream.php:109
 #: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
 msgid " from "
-msgstr "от"
+msgstr " от "
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
 #: actions/twitapistatuses.php:347
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
-msgstr ""
+msgstr "%1$s / Реплики на %2$s"
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
 #, php-format
@@ -130,7 +130,7 @@ msgstr ""
 #: actions/twitapistatuses.php:350
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
+msgstr "%1$s реплики на съобщения от %2$s / %3$s."
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
 #: actions/shownotice.php:161
@@ -435,7 +435,6 @@ msgid "Awaiting confirmation on this phone number."
 msgstr "Очаква се потвърждение за този телефонен номер."
 
 #: ../lib/util.php:1318 lib/util.php:1452
-#, fuzzy
 msgid "Before »"
 msgstr "Преди »"
 
@@ -1237,7 +1236,7 @@ msgstr "Загубена или забравена парола"
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
 msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
+msgstr "Задаване на нова е-поща, от която да се публикува. Отменя предишната."
 
 #: ../actions/emailsettings.php:27 actions/emailsettings.php:27
 #: actions/emailsettings.php:71
@@ -1268,12 +1267,11 @@ msgstr ""
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
 msgid "My text and files are available under "
-msgstr "Текстовете и файловите ми са достъпни под"
+msgstr "Текстовете и файловите ми са достъпни под "
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
-#, fuzzy
 msgid "New"
 msgstr "Ново"
 
@@ -2228,7 +2226,7 @@ msgstr "Това и сега е адресът на е-пощата ви."
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
 #: actions/smssettings.php:306
 msgid "That is already your phone number."
-msgstr "Това  сега е номерът на телефона ви."
+msgstr "Това и сега е номерът на телефона ви."
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
 #: actions/imsettings.php:381
@@ -2395,7 +2393,7 @@ msgstr ""
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132
 msgid "Two user ids or screen_names must be supplied."
-msgstr ""
+msgstr "Трябва да се дадат два идентификатора или имена на потребители."
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
@@ -2477,13 +2475,13 @@ msgstr "Бележки през месинджър (IM)"
 #: actions/twitapistatuses.php:129
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
+msgstr "Бележки от %1$s и приятели в %2$s."
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
 #: actions/twitapistatuses.php:202
 #, php-format
 msgid "Updates from %1$s on %2$s!"
-msgstr ""
+msgstr "Бележки от %1$s в %2$s."
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
@@ -2622,7 +2620,7 @@ msgstr "Първо се регистрирайте, за да започнете
 #: actions/smssettings.php:69
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
+msgstr "Може да получавате на е-пощата си SMS-съобщения от %%site.name%%."
 
 #: ../actions/openidsettings.php:86
 msgid ""
@@ -2789,7 +2787,6 @@ msgid "unsupported file type"
 msgstr "неподдържан вид файл"
 
 #: ../lib/util.php:1309 lib/util.php:1443
-#, fuzzy
 msgid "« After"
 msgstr "« След"
 
@@ -2881,15 +2878,15 @@ msgstr ""
 #: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
 #: actions/register.php:416
 msgid "Automatically login in the future; "
-msgstr "Автоматично влизане за в бъдеще:"
+msgstr "Автоматично влизане за в бъдеще; "
 
 #: actions/login.php:122 actions/login.php:264
 msgid "For security reasons, please re-enter your "
-msgstr ""
+msgstr "С оглед на сигурността, въведете отново "
 
 #: actions/login.php:126 actions/login.php:268
 msgid "Login with your username and password. "
-msgstr "Влезте с името и паролата си."
+msgstr "Влезте с името и паролата си. "
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
 #: actions/twitapidirect_messages.php:141
@@ -2935,7 +2932,7 @@ msgstr "[OpenID](%%doc.openid%%) ви позволява да влизате в
 
 #: actions/openidsettings.php:46 actions/openidsettings.php:96
 msgid "If you want to add an OpenID to your account, "
-msgstr ""
+msgstr "Ако искате да добавите OpenID към профила си, "
 
 #: actions/openidsettings.php:74
 msgid "Removing your only OpenID would make it impossible to log in! "
@@ -2943,7 +2940,7 @@ msgstr "Ако премахнете единствения си OpenID, няма
 
 #: actions/openidsettings.php:87 actions/openidsettings.php:143
 msgid "You can remove an OpenID from your account "
-msgstr "Можете да премахнете OpenID от профила си"
+msgstr "Можете да премахнете OpenID от профила си "
 
 #: actions/outbox.php:28 actions/outbox.php:58
 #, php-format
@@ -2957,17 +2954,17 @@ msgstr "Изходяща кутия за %s"
 
 #: actions/outbox.php:53 actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
-msgstr "Това е изходящата ви кутия с лични съобщения до други потребители. "
+msgstr "Това е изходящата ви кутия с лични съобщения до други потребители."
 
 #: actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
-msgstr "Търсене на хора в %%site.name%% по име, местоположение или интереси."
+msgstr "Търсене на хора в %%site.name%% по име, местоположение или интереси. "
 
 #: actions/profilesettings.php:27 actions/profilesettings.php:69
 msgid "You can update your personal profile info here "
-msgstr "Можете а обновите личните си данни тук"
+msgstr "Можете а обновите личните си данни тук "
 
 #: actions/profilesettings.php:115 actions/remotesubscribe.php:320
 #: actions/userauthorization.php:159 actions/userrss.php:76
@@ -2979,7 +2976,7 @@ msgstr "Потребител без съответстващ профил"
 
 #: actions/recoverpassword.php:91 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. "
-msgstr "Кодът ви за потвърждение е твърде стар."
+msgstr "Кодът ви за потвърждение е твърде стар. "
 
 #: actions/recoverpassword.php:141 actions/recoverpassword.php:152
 msgid "If you've forgotten or lost your"
@@ -2991,15 +2988,15 @@ msgstr ""
 
 #: actions/recoverpassword.php:169 actions/recoverpassword.php:188
 msgid "Your nickname on this server, "
-msgstr "Псевдонимът ви на този сървър."
+msgstr "Псевдонимът ви на този сървър, "
 
 #: actions/recoverpassword.php:271 actions/recoverpassword.php:304
 msgid "Instructions for recovering your password "
-msgstr "Упътване за възстановяване на паролата"
+msgstr "Упътване за възстановяване на паролата "
 
 #: actions/recoverpassword.php:327 actions/recoverpassword.php:361
 msgid "New password successfully saved. "
-msgstr "Новата парола е записана."
+msgstr "Новата парола е записана. "
 
 #: actions/register.php:95 actions/register.php:180
 msgid "Password must be 6 or more characters."
@@ -3255,7 +3252,7 @@ msgid "Notice marked as fave."
 msgstr "Бележката е отбелязана като любима."
 
 #: classes/Command.php:166 classes/Command.php:189
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -3424,34 +3421,32 @@ msgid "Could not parse message."
 msgstr "Грешка при обработка на съобщението"
 
 #: actions/all.php:63 actions/facebookhome.php:162
-#, fuzzy, php-format
+#, php-format
 msgid "%s and friends, page %d"
-msgstr "%s и приятели"
+msgstr "%s и приятели, страница %d"
 
 #: actions/avatarsettings.php:76
-#, fuzzy
 msgid "You can upload your personal avatar."
-msgstr "Можете а обновите личните си данни тук"
+msgstr "Можете да качите личен аватар тук."
 
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
 #: actions/grouplogo.php:250
-#, fuzzy
 msgid "Avatar settings"
-msgstr "Настройки за Twitter"
+msgstr "Настройки за аватар"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
 msgid "Original"
-msgstr ""
+msgstr "Оригинал"
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
 msgid "Preview"
-msgstr ""
+msgstr "Преглед"
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
 msgid "Crop"
-msgstr ""
+msgstr "Изрязване"
 
 #: actions/avatarsettings.php:248 actions/deletenotice.php:133
 #: actions/emailsettings.php:224 actions/grouplogo.php:307
@@ -3468,7 +3463,7 @@ msgstr "Имаше проблем със сесията ви в сайта. Мо
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
 msgid "Pick a square area of the image to be your avatar"
-msgstr ""
+msgstr "Изберете квадратна област от изображението за аватар"
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
 msgid "Lost our file data."
@@ -3483,39 +3478,33 @@ msgstr "Няма такава бележка."
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
 #: classes/User_group.php:129 classes/User_group.php:161
-#, fuzzy
 msgid "Unknown file type"
-msgstr "неподдържан вид файл"
+msgstr "Неподдържан вид файл"
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
-#, fuzzy
 msgid "No profile specified."
-msgstr "Не е указан получател."
+msgstr "Не е указан профил."
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
 #: actions/unblock.php:75
-#, fuzzy
 msgid "No profile with that ID."
-msgstr "Не е открита бележка с такъв идентификатор."
+msgstr "Не е открит профил с такъв идентификатор."
 
 #: actions/block.php:111
-#, fuzzy
 msgid "Block user"
-msgstr "Няма такъв потребител"
+msgstr "Блокиране на потребителя"
 
 #: actions/block.php:129
-#, fuzzy
 msgid "Are you sure you want to block this user? "
-msgstr "Наистина ли искате да изтриете тази бележка?"
+msgstr "Наистина ли искате да блокирате този потребител? "
 
 #: actions/block.php:162
-#, fuzzy
 msgid "You have already blocked this user."
-msgstr "Вече сте абонирани за следните потребители:"
+msgstr "Вече сте блокирали този потребител."
 
 #: actions/block.php:167
 msgid "Failed to save block information."
-msgstr ""
+msgstr "Грешка при записване данните за блокирането."
 
 #: actions/confirmaddress.php:159
 #, fuzzy, php-format
@@ -3523,14 +3512,12 @@ msgid "The address \"%s\" has been "
 msgstr "Адресът е премахнат."
 
 #: actions/deletenotice.php:73
-#, fuzzy
 msgid "You are about to permanently delete a notice. "
-msgstr "Ще изтриете напълно бележката. Изтриването е невъзвратимо."
+msgstr "Ще изтриете напълно бележката. "
 
 #: actions/disfavor.php:94
-#, fuzzy
 msgid "Add to favorites"
-msgstr "Емисия с любимите бележки на %s"
+msgstr "Добавяне към любимите"
 
 #: actions/editgroup.php:54
 #, php-format
@@ -3543,29 +3530,25 @@ msgid "Inboxes must be enabled for groups to work"
 msgstr ""
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-#, fuzzy
 msgid "You must be logged in to create a group."
-msgstr "За да каните хора в %s, трябва да сте влезли."
+msgstr "За да създавате група, трябва да сте влезли."
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
 #: actions/showgroup.php:121
-#, fuzzy
 msgid "No nickname"
 msgstr "Няма псевдоним."
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
 #: actions/showgroup.php:128
-#, fuzzy
 msgid "No such group"
-msgstr "Няма такъв потребител"
+msgstr "Няма такава група."
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
 #: actions/grouplogo.php:107
-#, fuzzy
 msgid "You must be an admin to edit the group"
-msgstr "За да каните хора в %s, трябва да сте влезли."
+msgstr "За да редактирате групата, трябва да сте й администратор."
 
 #: actions/editgroup.php:157
 msgid "Use this form to edit the group."
@@ -3584,19 +3567,17 @@ msgid "description is too long (max 140 chars)."
 msgstr "Автобиографията е твърде дълга (до 140 символа)."
 
 #: actions/editgroup.php:218
-#, fuzzy
 msgid "Could not update group."
-msgstr "Грешка при обновяване на потребителя."
+msgstr "Грешка при обновяване на групата."
 
 #: actions/editgroup.php:226
-#, fuzzy
 msgid "Options saved."
 msgstr "Настройките са запазени."
 
 #: actions/emailsettings.php:107 actions/imsettings.php:108
-#, fuzzy, php-format
+#, php-format
 msgid "Awaiting confirmation on this address. "
-msgstr "Очаква се потвърждение за този телефонен номер."
+msgstr "Очаква се потвърждение за този адрес. "
 
 #: actions/emailsettings.php:139 actions/smssettings.php:150
 #, fuzzy
@@ -3640,7 +3621,7 @@ msgstr ""
 
 #: actions/facebookhome.php:218
 msgid "Skip"
-msgstr ""
+msgstr "Пропускане"
 
 #: actions/facebookhome.php:235
 #, fuzzy
@@ -3649,25 +3630,22 @@ msgstr "Няма съдържание!"
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
 msgid "Pagination"
-msgstr ""
+msgstr "Страниране"
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-#, fuzzy
 msgid "After"
-msgstr "« След"
+msgstr "След"
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
-#, fuzzy
 msgid "Before"
-msgstr "Преди »"
+msgstr "Преди"
 
 #: actions/facebookinvite.php:70
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
-msgstr ""
+msgstr "Благодарим ви, че поканихте приятели да ползват %s!"
 
 #: actions/facebookinvite.php:72
-#, fuzzy
 msgid "Invitations have been sent to the following users:"
 msgstr "Изпратени са покани до следните хора:"
 
@@ -3689,12 +3667,11 @@ msgstr ""
 #: actions/facebookinvite.php:130
 #, php-format
 msgid "Send invitations"
-msgstr ""
+msgstr "Изпращане на покани"
 
 #: actions/facebookremove.php:56
-#, fuzzy
 msgid "Couldn't remove Facebook user."
-msgstr "Грешка при премахване на профила от Twitter"
+msgstr "Грешка при премахване на профила от Facebook."
 
 #: actions/facebooksettings.php:65
 #, fuzzy
@@ -3707,23 +3684,20 @@ msgid "Sync preferences saved."
 msgstr "Настройките са запазени."
 
 #: actions/facebooksettings.php:90
-#, fuzzy
 msgid "Automatically update my Facebook status with my notices."
-msgstr "Автоматично препращане на бележките ми към Twitter"
+msgstr "Автоматично препращане на бележките ми към Facebook."
 
 #: actions/facebooksettings.php:97
-#, fuzzy
 msgid "Send \"@\" replies to Facebook."
-msgstr "Препращане на локалните отговори с \"@\" и към Twitter"
+msgstr "Препращане на локалните отговори с \"@\" и към Facebook."
 
 #: actions/facebooksettings.php:106
-#, fuzzy
 msgid "Prefix"
-msgstr "Профил"
+msgstr "Прeдставка"
 
 #: actions/facebooksettings.php:108
 msgid "A string to prefix notices with."
-msgstr ""
+msgstr "Представка за добавяне към бележките."
 
 #: actions/facebooksettings.php:124
 #, php-format
@@ -3731,9 +3705,8 @@ msgid "If you would like %s to automatically update "
 msgstr ""
 
 #: actions/facebooksettings.php:147
-#, fuzzy
 msgid "Sync preferences"
-msgstr "Настройки"
+msgstr "Синхронизиране на настройките"
 
 #: actions/favor.php:94 lib/disfavorform.php:140
 #, fuzzy
@@ -3742,29 +3715,27 @@ msgstr "Нелюбимо"
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
 #: lib/publicgroupnav.php:91
-#, fuzzy
 msgid "Popular notices"
-msgstr "Няма такава бележка."
+msgstr "Популярни бележки"
 
 #: actions/favorited.php:67
-#, fuzzy, php-format
+#, php-format
 msgid "Popular notices, page %d"
-msgstr "Няма такава бележка."
+msgstr "Популярни бележки, страница %d"
 
 #: actions/favorited.php:79
-#, fuzzy
 msgid "The most popular notices on the site right now."
-msgstr "Най-популярните етикети за изминалата седмица"
+msgstr "Най-популярните бележки в момента в сайта."
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
 #: lib/publicgroupnav.php:87
 msgid "Featured users"
-msgstr ""
+msgstr "Избрани потребители"
 
 #: actions/featured.php:71
 #, php-format
 msgid "Featured users, page %d"
-msgstr ""
+msgstr "Избрани потребители, страница %d"
 
 #: actions/featured.php:99
 #, php-format
@@ -3773,29 +3744,27 @@ msgstr ""
 
 #: actions/finishremotesubscribe.php:188
 msgid "That user has blocked you from subscribing."
-msgstr ""
+msgstr "Потребителят е забранил да се абонирате за него."
 
 #: actions/groupbyid.php:79
 msgid "No ID"
-msgstr ""
+msgstr "Липсва ID"
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
 msgid "Group logo"
-msgstr ""
+msgstr "Лого на групата"
 
 #: actions/grouplogo.php:149
 msgid "You can upload a logo image for your group."
-msgstr ""
+msgstr "Може да качите лого за групата ви."
 
 #: actions/grouplogo.php:448
-#, fuzzy
 msgid "Logo updated."
-msgstr "Аватарът е обновен."
+msgstr "Лотого е обновено."
 
 #: actions/grouplogo.php:450
-#, fuzzy
 msgid "Failed updating logo."
-msgstr "Неуспешно обновяване на аватара."
+msgstr "Неуспешно обновяване на логото."
 
 #: actions/groupmembers.php:93 lib/groupnav.php:91
 #, php-format
@@ -3809,17 +3778,17 @@ msgstr ""
 
 #: actions/groupmembers.php:111
 msgid "A list of the users in this group."
-msgstr ""
+msgstr "Списък с потребителите в тази група."
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
 #: lib/subgroupnav.php:96
 msgid "Groups"
-msgstr ""
+msgstr "Групи"
 
 #: actions/groups.php:64
 #, php-format
 msgid "Groups, page %d"
-msgstr ""
+msgstr "Групи, страница %d"
 
 #: actions/groups.php:90
 #, php-format
@@ -3827,20 +3796,18 @@ msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr ""
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-#, fuzzy
 msgid "Create a new group"
-msgstr "Създаване на нова сметка"
+msgstr "Създаване на нова група"
 
 #: actions/groupsearch.php:57
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
-msgstr "Търсене на хора в %%site.name%% по име, местоположение или интереси."
+msgstr "Търсене на групи в %%site.name%% по име, местоположение или описание."
 
 #: actions/groupsearch.php:63
-#, fuzzy
 msgid "Group search"
-msgstr "Търсене на хора"
+msgstr "Търсене на групи"
 
 #: actions/imsettings.php:70
 #, fuzzy
@@ -3850,12 +3817,11 @@ msgstr "Не може да изпращате съобщения до този �
 #: actions/imsettings.php:120
 #, php-format
 msgid "Jabber or GTalk address, "
-msgstr ""
+msgstr "Адрес в Jabber или GTalk, "
 
 #: actions/imsettings.php:147
-#, fuzzy
 msgid "Send me replies through Jabber/GTalk "
-msgstr "Изпращане на бележките по Jabber/GTalk."
+msgstr "Изпращане на бележките по Jabber/GTalk "
 
 #: actions/imsettings.php:321
 #, fuzzy, php-format
@@ -3863,14 +3829,12 @@ msgid "A confirmation code was sent "
 msgstr "Няма код за потвърждение."
 
 #: actions/joingroup.php:65
-#, fuzzy
 msgid "You must be logged in to join a group."
-msgstr "За да каните хора в %s, трябва да сте влезли."
+msgstr "За да се присъедините към група, трябва да сте влезли."
 
 #: actions/joingroup.php:95
-#, fuzzy
 msgid "You are already a member of that group"
-msgstr "Вече сте абонирани за следните потребители:"
+msgstr "Вече членувате в тази група."
 
 #: actions/joingroup.php:128
 #, fuzzy, php-format
@@ -3878,28 +3842,25 @@ msgid "Could not join user %s to group %s"
 msgstr "Грешка при проследяване — потребителят не е намерен."
 
 #: actions/joingroup.php:135
-#, fuzzy, php-format
+#, php-format
 msgid "%s joined group %s"
-msgstr "%s / Отбелязани като любими от %s"
+msgstr "%s се присъедини към групата %s"
 
 #: actions/leavegroup.php:60
 msgid "Inboxes must be enabled for groups to work."
 msgstr ""
 
 #: actions/leavegroup.php:65
-#, fuzzy
 msgid "You must be logged in to leave a group."
-msgstr "За да каните хора в %s, трябва да сте влезли."
+msgstr "За напуснете група, трябва да сте влезли."
 
 #: actions/leavegroup.php:88
-#, fuzzy
 msgid "No such group."
-msgstr "Няма такова съобщение"
+msgstr "Няма такава група"
 
 #: actions/leavegroup.php:95
-#, fuzzy
 msgid "You are not a member of that group."
-msgstr "Не сте ни изпратили този профил"
+msgstr "Не членувате в тази група."
 
 #: actions/leavegroup.php:100
 #, fuzzy
@@ -3931,16 +3892,15 @@ msgstr ""
 
 #: actions/newgroup.php:53
 msgid "New group"
-msgstr ""
+msgstr "Нова група"
 
 #: actions/newgroup.php:115
 msgid "Use this form to create a new group."
-msgstr ""
+msgstr "Използвайте тази бланка за създаване на нова група."
 
 #: actions/newgroup.php:177
-#, fuzzy
 msgid "Could not create group."
-msgstr "Грешка при отбелязване като любима."
+msgstr "Грешка при създаване на групата."
 
 #: actions/newgroup.php:191
 #, fuzzy
@@ -3948,9 +3908,8 @@ msgid "Could not set group membership."
 msgstr "Грешка при създаване на нов абонамент."
 
 #: actions/newmessage.php:119 actions/newnotice.php:132
-#, fuzzy
 msgid "That's too long. "
-msgstr "Файлът е твърде голям."
+msgstr "Това е твърде дълго. "
 
 #: actions/newmessage.php:134
 #, fuzzy
@@ -3964,7 +3923,7 @@ msgstr "Бележки"
 
 #: actions/newnotice.php:200 classes/Channel.php:163
 msgid "Ajax Error"
-msgstr ""
+msgstr "Грешка в Ajax"
 
 #: actions/nudge.php:85
 msgid ""
@@ -3973,11 +3932,11 @@ msgstr ""
 
 #: actions/nudge.php:94
 msgid "Nudge sent"
-msgstr ""
+msgstr "Побутването е изпратено"
 
 #: actions/nudge.php:97
 msgid "Nudge sent!"
-msgstr "\"Побутването\" е изпратено!"
+msgstr "Побутването е изпратено!"
 
 #: actions/openidlogin.php:97
 #, fuzzy
@@ -3990,36 +3949,32 @@ msgid "Removing your only OpenID "
 msgstr "Премахване на OpenID"
 
 #: actions/othersettings.php:60
-#, fuzzy
 msgid "Other Settings"
-msgstr "Настройки за Twitter"
+msgstr "Други настройки"
 
 #: actions/othersettings.php:71
 msgid "Manage various other options."
-msgstr ""
+msgstr "Управление на различни други настройки."
 
 #: actions/othersettings.php:93
 msgid "URL Auto-shortening"
-msgstr ""
+msgstr "Автоматично съкращаване на адреси"
 
 #: actions/othersettings.php:112
-#, fuzzy
 msgid "Service"
-msgstr "Търсене"
+msgstr "Услуга"
 
 #: actions/othersettings.php:113
 msgid "Automatic shortening service to use."
-msgstr ""
+msgstr "Услуга за автоматично съкращаване, която да се ползва."
 
 #: actions/othersettings.php:144
-#, fuzzy
 msgid "URL shortening service is too long (max 50 chars)."
-msgstr "Името на езика е твърде дълго (може да е до 50 знака)."
+msgstr "Услугата за съкращаване е твърде дълга (може да е до 50 знака)."
 
 #: actions/passwordsettings.php:69
-#, fuzzy
 msgid "Change your password."
-msgstr "Смяна на паролата"
+msgstr "Смяна на паролата."
 
 #: actions/passwordsettings.php:89
 #, fuzzy
@@ -4042,9 +3997,8 @@ msgid "These are users who have tagged themselves \"%s\" "
 msgstr ""
 
 #: actions/profilesettings.php:91
-#, fuzzy
 msgid "Profile information"
-msgstr "Непознат профил"
+msgstr "Данни на профила"
 
 #: actions/profilesettings.php:124
 msgid ""
@@ -4059,24 +4013,22 @@ msgstr ""
 "ботове)."
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid tag: \"%s\""
-msgstr "Неправилен адрес на домашна страница '%s'"
+msgstr "Неправилен етикет: \"%s\""
 
 #: actions/profilesettings.php:311
-#, fuzzy
 msgid "Couldn't save tags."
-msgstr "Грешка при запазване на профила."
+msgstr "Грешка при запазване етикетите."
 
 #: actions/public.php:107
-#, fuzzy, php-format
+#, php-format
 msgid "Public timeline, page %d"
-msgstr "Общ поток"
+msgstr "Общ поток, страница %d"
 
 #: actions/public.php:173
-#, fuzzy
 msgid "Could not retrieve public stream."
-msgstr "Грешка при изтегляне на любимите бележки"
+msgstr "Грешка при изтегляне на общия поток"
 
 #: actions/public.php:220
 #, php-format
@@ -4143,7 +4095,7 @@ msgid " except this private data: password, "
 msgstr "освен тези лични данни: парола, е-поща, месинджър, телефон."
 
 #: actions/register.php:471
-#, fuzzy, php-format
+#, php-format
 msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
 msgstr "Поздравления, %s! И добре дошли в %%%%site.name%%%%. "
 
@@ -4156,14 +4108,14 @@ msgid "That's a local profile! Login to subscribe."
 msgstr ""
 
 #: actions/replies.php:118
-#, fuzzy, php-format
+#, php-format
 msgid "Replies to %s, page %d"
-msgstr "Отговори на %s"
+msgstr "Отговори на %s, страница %d"
 
 #: actions/showfavorites.php:79
-#, fuzzy, php-format
+#, php-format
 msgid "%s favorite notices, page %d"
-msgstr "%s любими бележки"
+msgstr "Любими бележки на %s, страница %d"
 
 #: actions/showgroup.php:77 lib/groupnav.php:85
 #, php-format
@@ -4176,9 +4128,8 @@ msgid "%s group, page %d"
 msgstr ""
 
 #: actions/showgroup.php:206
-#, fuzzy
 msgid "Group profile"
-msgstr "Няма такава бележка."
+msgstr "Профил на групата"
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
@@ -4201,9 +4152,8 @@ msgid "Notice feed for %s group"
 msgstr "Емисия с бележки на %s"
 
 #: actions/showgroup.php:357 lib/groupnav.php:90
-#, fuzzy
 msgid "Members"
-msgstr "Участник от"
+msgstr "Членове"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
@@ -4213,7 +4163,7 @@ msgstr ""
 
 #: actions/showgroup.php:370
 msgid "All members"
-msgstr ""
+msgstr "Всички членове"
 
 #: actions/showgroup.php:378
 #, php-format
@@ -4228,47 +4178,42 @@ msgid "Only the sender and recipient "
 msgstr "Само подателят и получателят могат да четат това съобщение."
 
 #: actions/showstream.php:73
-#, fuzzy, php-format
+#, php-format
 msgid "%s, page %d"
-msgstr "Входяща кутия за %s — страница %d"
+msgstr "%s, страница %d"
 
 #: actions/showstream.php:143
 #, fuzzy
 msgid "'s profile"
-msgstr "Профил"
+msgstr "Профил на "
 
 #: actions/showstream.php:236 actions/tagother.php:77
-#, fuzzy
 msgid "User profile"
-msgstr "Потребителят няма профил."
+msgstr "Потребителски профил"
 
 #: actions/showstream.php:240 actions/tagother.php:81
 msgid "Photo"
-msgstr ""
+msgstr "Снимка"
 
 #: actions/showstream.php:317
-#, fuzzy
 msgid "User actions"
-msgstr "Непознато действие"
+msgstr "Потребителски действия"
 
 #: actions/showstream.php:342
-#, fuzzy
 msgid "Send a direct message to this user"
-msgstr "Не може да изпращате съобщения до този потребител."
+msgstr "Изпращате на пряко съобщение до този потребител."
 
 #: actions/showstream.php:343
-#, fuzzy
 msgid "Message"
-msgstr "Ново съобщение"
+msgstr "Съобщение"
 
 #: actions/showstream.php:451
-#, fuzzy
 msgid "All subscribers"
-msgstr "Абонати"
+msgstr "Всички абонати"
 
 #: actions/showstream.php:533
 msgid "All groups"
-msgstr ""
+msgstr "Всички групи"
 
 #: actions/showstream.php:542
 #, php-format
@@ -4293,14 +4238,12 @@ msgid "A confirmation code was sent to the phone number you added. "
 msgstr "Очаква се потвърждение за този телефонен номер."
 
 #: actions/smssettings.php:453
-#, fuzzy
 msgid "Mobile carrier"
-msgstr "Изберете оператор"
+msgstr "Мобилен оператор"
 
 #: actions/subedit.php:70
-#, fuzzy
 msgid "You are not subscribed to that profile."
-msgstr "Не сте ни изпратили този профил"
+msgstr "Не сте абонирани за този профил"
 
 #: actions/subedit.php:83
 #, fuzzy
@@ -4338,14 +4281,14 @@ msgid "These are the people who "
 msgstr "Това са хората, които четат бележките на %s."
 
 #: actions/subscriptions.php:52
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscriptions"
-msgstr "Всички абонаменти"
+msgstr "Абонаменти на %s"
 
 #: actions/subscriptions.php:54
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscriptions, page %d"
-msgstr "Всички абонаменти"
+msgstr "Абонаменти на %s, страница %d"
 
 #: actions/subscriptions.php:65
 #, fuzzy
@@ -4358,14 +4301,13 @@ msgid "These are the people whose "
 msgstr "Това са хората, които четат бележките на %s."
 
 #: actions/subscriptions.php:122
-#, fuzzy
 msgid "Jabber"
-msgstr "Няма Jabber ID."
+msgstr "Jabber"
 
 #: actions/tag.php:43
-#, fuzzy, php-format
+#, php-format
 msgid "Notices tagged with %s, page %d"
-msgstr "Бележки с етикет %s"
+msgstr "Бележки с етикет %s, страница %d"
 
 #: actions/tag.php:66
 #, php-format
@@ -4399,9 +4341,8 @@ msgid ""
 msgstr ""
 
 #: actions/tagother.php:164
-#, fuzzy
 msgid "There was a problem with your session token."
-msgstr "Имаше проблем със сесията ви в сайта. Моля, опитайте отново!"
+msgstr "Имаше проблем със сесията ви в сайта."
 
 #: actions/tagother.php:191
 msgid ""
@@ -4409,18 +4350,16 @@ msgid ""
 msgstr ""
 
 #: actions/tagother.php:198
-#, fuzzy
 msgid "Could not save tags."
-msgstr "Грешка при запазване данните на аватара"
+msgstr "Грешка при запазване на етикетите."
 
 #: actions/tagother.php:233
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
 #: actions/tagrss.php:35
-#, fuzzy
 msgid "No such tag."
-msgstr "Няма такова съобщение"
+msgstr "Няма такъв етикет."
 
 #: actions/tagrss.php:66
 #, fuzzy, php-format
@@ -4436,7 +4375,6 @@ msgid "Unblock user failed."
 msgstr ""
 
 #: actions/twitapiusers.php:48
-#, fuzzy
 msgid "Not found."
 msgstr "Не е открито."
 
@@ -4448,19 +4386,16 @@ msgstr ""
 "там."
 
 #: actions/twittersettings.php:119
-#, fuzzy
 msgid "Twitter user name"
 msgstr "Име в Twitter"
 
 #: actions/twittersettings.php:126
-#, fuzzy
 msgid "Twitter password"
 msgstr "Парола за Twitter"
 
 #: actions/twittersettings.php:228
-#, fuzzy
 msgid "Twitter Friends"
-msgstr "Настройки за Twitter"
+msgstr "Приятели от Twitter"
 
 #: actions/twittersettings.php:327
 msgid "Username must have only numbers, "
@@ -4494,39 +4429,39 @@ msgstr "Отписване"
 #: actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
-msgstr ""
+msgstr "Групи на %s"
 
 #: actions/usergroups.php:65
 #, php-format
 msgid "%s groups, page %d"
-msgstr ""
+msgstr "Групи на %s, страница %d"
 
 #: classes/Notice.php:104
-#, fuzzy
 msgid "Problem saving notice. Unknown user."
-msgstr "Проблем при записване на бележката."
+msgstr "Грешка при записване на бележката. Непознат потребител."
 
 #: classes/Notice.php:109
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
+"Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте "
+"отново след няколко минути."
 
 #: classes/Notice.php:116
 msgid "You are banned from posting notices on this site."
-msgstr ""
+msgstr "Забранено ви е да публикувате бележки в този сайт."
 
 #: lib/accountsettingsaction.php:108
-#, fuzzy
 msgid "Upload an avatar"
-msgstr "Неуспешно обновяване на аватара."
+msgstr "Качване на аватар"
 
 #: lib/accountsettingsaction.php:119
 msgid "Other"
-msgstr ""
+msgstr "Друго"
 
 #: lib/accountsettingsaction.php:120
 msgid "Other options"
-msgstr ""
+msgstr "Други настройки"
 
 #: lib/action.php:130
 #, fuzzy, php-format
@@ -4535,7 +4470,7 @@ msgstr "%s (%s)"
 
 #: lib/action.php:145
 msgid "Untitled page"
-msgstr ""
+msgstr "Неозаглавена страница"
 
 #: lib/action.php:316
 msgid "Primary site navigation"
@@ -4547,39 +4482,35 @@ msgstr ""
 
 #: lib/action.php:325
 msgid "Search for people or text"
-msgstr ""
+msgstr "Търсене за хора или бележки"
 
 #: lib/action.php:328
-#, fuzzy
 msgid "Account"
-msgstr "Относно"
+msgstr "Сметка"
 
 #: lib/action.php:328
-#, fuzzy
 msgid "Change your email, avatar, password, profile"
-msgstr "Смяна на паролата"
+msgstr "Промяна на поща, аватар, парола, профил"
 
 #: lib/action.php:330
 msgid "Connect to IM, SMS, Twitter"
-msgstr ""
+msgstr "Свързване към моментни съобщения, SMS, Twitter"
 
 #: lib/action.php:332
 msgid "Logout from the site"
-msgstr ""
+msgstr "Излизане от сайта"
 
 #: lib/action.php:335
 msgid "Login to the site"
-msgstr ""
+msgstr "Влизане в сайта"
 
 #: lib/action.php:338
-#, fuzzy
 msgid "Create an account"
 msgstr "Създаване на нова сметка"
 
 #: lib/action.php:341
-#, fuzzy
 msgid "Login with OpenID"
-msgstr "Няма такъв OpenID-адрес."
+msgstr "Влизане с OpenID"
 
 #: lib/action.php:344
 #, fuzzy
@@ -4607,21 +4538,19 @@ msgstr "Абонаменти"
 
 #: lib/action.php:602 lib/action.php:623
 msgid "Laconica software license"
-msgstr ""
+msgstr "Лиценз на програмата Laconica"
 
 #: lib/action.php:630
-#, fuzzy
 msgid "All "
-msgstr "Всички"
+msgstr "Всички "
 
 #: lib/action.php:635
 msgid "license."
-msgstr ""
+msgstr "лиценз."
 
 #: lib/blockform.php:123 lib/blockform.php:153
-#, fuzzy
 msgid "Block this user"
-msgstr "Няма такъв потребител"
+msgstr "Блокиране на потребителя"
 
 #: lib/blockform.php:153
 msgid "Block"
@@ -4643,66 +4572,57 @@ msgid " a new account."
 msgstr "Създаване на нова сметка"
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-#, fuzzy
 msgid "Published"
-msgstr "Общ поток"
+msgstr "Публикувано"
 
 #: lib/favorform.php:114 lib/favorform.php:140
-#, fuzzy
 msgid "Favor this notice"
-msgstr "%s любими бележки"
+msgstr "Отбелязване като любимо"
 
 #: lib/feedlist.php:64
 msgid "Export data"
-msgstr ""
+msgstr "Изнасяне на данните"
 
 #: lib/galleryaction.php:121
-#, fuzzy
 msgid "Filter tags"
-msgstr "Емисия за етикета %s"
+msgstr "Филтриране на етикетите"
 
 #: lib/galleryaction.php:131
-#, fuzzy
 msgid "All"
 msgstr "Всички"
 
 #: lib/galleryaction.php:137
-#, fuzzy
 msgid "Tag"
 msgstr "Етикет"
 
 #: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
-msgstr ""
+msgstr "Изберете етикет за конкретизиране"
 
 #: lib/galleryaction.php:139
 msgid "Go"
 msgstr ""
 
 #: lib/groupeditform.php:148
-#, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
-msgstr "Адрес на личната ви страница, блог или профил в друг сайт"
+msgstr "Адрес на страница, блог или профил в друг сайт на групата"
 
 #: lib/groupeditform.php:151
-#, fuzzy
 msgid "Description"
-msgstr "Абонаменти"
+msgstr "Описание"
 
 #: lib/groupeditform.php:153
-#, fuzzy
 msgid "Describe the group or topic in 140 chars"
-msgstr "Опишете себе си и интересите си в до 140 букви"
+msgstr "Опишете групата или темата й в до 140 букви"
 
 #: lib/groupeditform.php:158
-#, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr "Къде се намирате (град, община, държава и т.н.)"
+msgstr "Къде се намира групата — град, община, държава и т.н. (ако е приложимо)"
 
 #: lib/groupnav.php:84 lib/searchgroupnav.php:84
 msgid "Group"
-msgstr ""
+msgstr "Група"
 
 #: lib/groupnav.php:100
 msgid "Admin"
@@ -4711,30 +4631,29 @@ msgstr ""
 #: lib/groupnav.php:101
 #, php-format
 msgid "Edit %s group properties"
-msgstr ""
+msgstr "Редактиране настройките на групата %s"
 
 #: lib/groupnav.php:106
-#, fuzzy
 msgid "Logo"
-msgstr "Изход"
+msgstr "Лого"
 
 #: lib/groupnav.php:107
 #, php-format
 msgid "Add or edit %s logo"
-msgstr ""
+msgstr "Добавяне или редактиране логото на %s"
 
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
-msgstr ""
+msgstr "Групи с най-много членове"
 
 #: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
-msgstr ""
+msgstr "Групи с най-много бележки"
 
 #: lib/grouptagcloudsection.php:56
 #, php-format
 msgid "Tags in %s group's notices"
-msgstr ""
+msgstr "Етикети в бележките към групата %s"
 
 #: lib/htmloutputter.php:104
 #, fuzzy
@@ -4742,28 +4661,24 @@ msgid "This page is not available in a "
 msgstr "Страницата не е достъпна във вида медия, който приемате"
 
 #: lib/joinform.php:114
-#, fuzzy
 msgid "Join"
-msgstr "Вход"
+msgstr "Присъединяване"
 
 #: lib/leaveform.php:114
-#, fuzzy
 msgid "Leave"
-msgstr "Запазване"
+msgstr "Напускане"
 
 #: lib/logingroupnav.php:76
-#, fuzzy
 msgid "Login with a username and password"
-msgstr "Влезте с името и паролата си."
+msgstr "Вход с име и парола"
 
 #: lib/logingroupnav.php:79
-#, fuzzy
 msgid "Sign up for a new account"
 msgstr "Създаване на нова сметка"
 
 #: lib/logingroupnav.php:82
 msgid "Login or register with OpenID"
-msgstr ""
+msgstr "Вход или записване с OpenID"
 
 #: lib/mail.php:175
 #, php-format
@@ -4771,6 +4686,8 @@ msgid ""
 "Hey, %s.\n"
 "\n"
 msgstr ""
+"Здрасти, %s!\n"
+"\n"
 
 #: lib/mail.php:236
 #, fuzzy, php-format
@@ -4778,14 +4695,14 @@ msgid "%1$s is now listening to "
 msgstr "%1$s вече получава бележките ви в %2$s."
 
 #: lib/mail.php:254
-#, fuzzy, php-format
+#, php-format
 msgid "Location: %s\n"
-msgstr "Местоположение: %s"
+msgstr "Местоположение: %s\n"
 
 #: lib/mail.php:256
-#, fuzzy, php-format
+#, php-format
 msgid "Homepage: %s\n"
-msgstr "Домашна страница: %s"
+msgstr "Лична страница: %s\n"
 
 #: lib/mail.php:258
 #, php-format
@@ -4793,94 +4710,80 @@ msgid ""
 "Bio: %s\n"
 "\n"
 msgstr ""
+"Биография: %s\n"
+"\n"
 
 #: lib/mail.php:461
-#, fuzzy, php-format
+#, php-format
 msgid "You've been nudged by %s"
-msgstr "\"Побутване\" от %s"
+msgstr "Побутнати сте от %s"
 
 #: lib/mail.php:465
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s (%2$s) is wondering what you are up to "
-msgstr ""
-"%1$s (%2$s) ви изпрати лично съобщение:\n"
-"\n"
+msgstr "%1$s (%2$s) се чуди с какво се занимавате напоследък "
 
 #: lib/mail.php:555
 #, fuzzy, php-format
 msgid "%1$s just added your notice from %2$s"
-msgstr ""
-"%1$s току-що отбеляза като любима бележката ви от %2$s.\n"
-"\n"
+msgstr "%1$s току-що отбеляза като любима бележката ви от %2$s."
 
 #: lib/mailbox.php:229 lib/noticelist.php:380
-#, fuzzy
 msgid "From"
-msgstr "от"
+msgstr "От"
 
 #: lib/messageform.php:110
-#, fuzzy
 msgid "Send a direct notice"
-msgstr "Изтриване на бележката"
+msgstr "Изпращане на пряко съобщеие"
 
 #: lib/noticeform.php:125
-#, fuzzy
 msgid "Send a notice"
-msgstr "Изпращане на съобщение"
+msgstr "Изпращане на бележка"
 
 #: lib/noticeform.php:152
-#, fuzzy
 msgid "Available characters"
-msgstr "6 или повече знака"
+msgstr "Налични знаци"
 
 #: lib/noticelist.php:426
-#, fuzzy
 msgid "in reply to"
-msgstr "в отговор на..."
+msgstr "в отговор на"
 
 #: lib/noticelist.php:447 lib/noticelist.php:450
-#, fuzzy
 msgid "Reply to this notice"
-msgstr "Грешка при изтриване на бележката."
+msgstr "Отговаряне на тази бележка"
 
 #: lib/noticelist.php:451
-#, fuzzy
 msgid "Reply"
-msgstr "отговор"
+msgstr "Отговор"
 
 #: lib/noticelist.php:471 lib/noticelist.php:474
-#, fuzzy
 msgid "Delete this notice"
 msgstr "Изтриване на бележката"
 
 #: lib/noticelist.php:474
-#, fuzzy
 msgid "Delete"
-msgstr "изтриване"
+msgstr "Изтриване"
 
 #: lib/nudgeform.php:116
-#, fuzzy
 msgid "Nudge this user"
-msgstr "\"Побутването\" е изпратено!"
+msgstr "Побутване на този потребител"
 
 #: lib/nudgeform.php:128
-#, fuzzy
 msgid "Nudge"
-msgstr "\"Побутването\" е изпратено!"
+msgstr "Побутване"
 
 #: lib/nudgeform.php:128
-#, fuzzy
 msgid "Send a nudge to this user"
-msgstr "Не може да изпращате съобщения до този потребител."
+msgstr "Побутване на този потребител"
 
 #: lib/personaltagcloudsection.php:56
-#, fuzzy, php-format
+#, php-format
 msgid "Tags in %s's notices"
-msgstr "Потребителят няма последна бележка"
+msgstr "Етикети в бележките на %s"
 
 #: lib/profilelist.php:182
 msgid "(none)"
-msgstr ""
+msgstr "(няма)"
 
 #: lib/publicgroupnav.php:76
 msgid "Public"
@@ -4891,7 +4794,6 @@ msgid "User groups"
 msgstr ""
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
-#, fuzzy
 msgid "Recent tags"
 msgstr "Скорошни етикети"
 
@@ -4900,79 +4802,68 @@ msgid "Featured"
 msgstr "Избрано"
 
 #: lib/publicgroupnav.php:90
-#, fuzzy
 msgid "Popular"
 msgstr "Популярно"
 
 #: lib/searchgroupnav.php:82
-#, fuzzy
 msgid "Notice"
 msgstr "Бележки"
 
 #: lib/searchgroupnav.php:85
-#, fuzzy
 msgid "Find groups on this site"
-msgstr "Търсене на хора в сайта"
+msgstr "Търсене на групи в сайта"
 
 #: lib/section.php:89
 msgid "Untitled section"
-msgstr ""
+msgstr "Неозаглавен раздел"
 
 #: lib/subgroupnav.php:81
-#, fuzzy, php-format
+#, php-format
 msgid "People %s subscribes to"
-msgstr "Отдалечен абонамент"
+msgstr "Абонаменти на %s"
 
 #: lib/subgroupnav.php:89
-#, fuzzy, php-format
+#, php-format
 msgid "People subscribed to %s"
-msgstr "Абонирани сте за %s."
+msgstr "Абонирани за %s"
 
 #: lib/subgroupnav.php:97
 #, php-format
 msgid "Groups %s is a member of"
-msgstr ""
+msgstr "Групи, в които участва %s"
 
 #: lib/subgroupnav.php:104
-#, fuzzy, php-format
+#, php-format
 msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
-"Използвайте това поле, за да поканите приятели и колеги да използват "
-"услугата на сайта."
+msgstr "Поканете приятели и колеги да се присъединят към вас в %s"
 
 #: lib/subs.php:53
-#, fuzzy
 msgid "User has blocked you."
-msgstr "Потребителят няма профил."
+msgstr "Потребителят ви е блокирал."
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
-#, fuzzy
 msgid "Subscribe to this user"
-msgstr "Абонирани сте за %s."
+msgstr "Абониране за този потребител"
 
 #: lib/tagcloudsection.php:56
-#, fuzzy
 msgid "None"
-msgstr "Не"
+msgstr "Без"
 
 #: lib/topposterssection.php:74
 msgid "Top posters"
-msgstr ""
+msgstr "Най-често пишещи"
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
-#, fuzzy
 msgid "Unblock this user"
-msgstr "Няма такъв потребител"
+msgstr "Разблокиране на този потребител"
 
 #: lib/unblockform.php:150
-#, fuzzy
 msgid "Unblock"
-msgstr "Разрешаване"
+msgstr "Разблокиране"
 
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
-#, fuzzy
 msgid "Unsubscribe from this user"
-msgstr "Отписани сте от %s."
+msgstr "Отписване от този потребител"
 
 #, fuzzy
 #~ msgid "Code not yet ready."
diff --git a/locale/ca_ES/LC_MESSAGES/laconica.mo b/locale/ca_ES/LC_MESSAGES/laconica.mo
index e1b9084eb..993d020da 100644
--- a/locale/ca_ES/LC_MESSAGES/laconica.mo
+++ b/locale/ca_ES/LC_MESSAGES/laconica.mo
diff --git a/locale/ca_ES/LC_MESSAGES/laconica.po b/locale/ca_ES/LC_MESSAGES/laconica.po
index 9052deef1..b835a7a8f 100644
--- a/locale/ca_ES/LC_MESSAGES/laconica.po
+++ b/locale/ca_ES/LC_MESSAGES/laconica.po
@@ -3,20 +3,18 @@
 # 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: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2009-06-12 09:18+0000\n"
+"Last-Translator: animarval <animarval@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"X-Generator: Pootle 1.1.0\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
 #: actions/noticesearchrss.php:88
@@ -36,18 +34,18 @@ msgstr ""
 #: ../actions/showstream.php:400 ../lib/stream.php:109
 #: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
 msgid " from "
-msgstr ""
+msgstr " de "
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
 #: actions/twitapistatuses.php:347
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
-msgstr ""
+msgstr "%1$s / Notificacions contestant a %2$s"
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
+msgstr "%1$s t'ha convidat us ha convidat a unir-te al grup %2$s"
 
 #: ../actions/invite.php:170
 #, php-format
@@ -79,6 +77,31 @@ msgid ""
 "\n"
 "Sincerely, %2$s\n"
 msgstr ""
+"%1$s us ha convidat a unir-vos a %2$s (%3$s).\n"
+"\n"
+"%2$s és un servei de micro-blogging que us permetrà estar al dia amb gent "
+"que conegueu i gent que us interessi.\n"
+"\n"
+"Podeu també compartir notícies sobre vosaltres mateixos, el que penseu, o la "
+"vostra vida a la xarxa amb gent que conegueu. És també força bo per "
+"conèixer nova gent amb qui compartir els vostres interessos.\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"
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
 #, php-format
@@ -106,7 +129,7 @@ msgstr ""
 #: actions/twitapistatuses.php:350
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
+msgstr "%1$s notificacions que responen a notificacions de %2$s / %3$s."
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
 #: actions/shownotice.php:161
@@ -118,7 +141,7 @@ msgstr "estat de %1$s a %2$s"
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
 #, php-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
 #: actions/publicrss.php:90
@@ -139,30 +162,32 @@ msgstr "%s i amics"
 #: actions/twitapistatuses.php:33
 #, php-format
 msgid "%s public timeline"
-msgstr ""
+msgstr "%s línia temporal pública"
 
 #: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
 #, php-format
 msgid "%s status"
-msgstr ""
+msgstr "%s estat"
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
 #: actions/twitapistatuses.php:199
 #, php-format
 msgid "%s timeline"
-msgstr ""
+msgstr "%s línia temporal"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
 #: actions/twitapistatuses.php:36
 #, php-format
 msgid "%s updates from everyone!"
-msgstr ""
+msgstr "%s notificacions de tots!"
 
 #: ../actions/register.php:213
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 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.)"
 
 #: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
 #, php-format
@@ -194,6 +219,7 @@ msgstr ""
 #: ../actions/register.php:152 actions/register.php:166
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
+"1-64 lletres en minúscula o números, sense puntuacions ni espais. Requerit."
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
 #: actions/passwordsettings.php:102
@@ -208,7 +234,7 @@ msgstr "6 o més caràcters, i no te n'oblidis!"
 #: ../actions/register.php:154 actions/register.php:168
 #: actions/register.php:373
 msgid "6 or more characters. Required."
-msgstr ""
+msgstr "6 o més caràcters. Requerit."
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, php-format
@@ -224,12 +250,18 @@ 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'ha enviat un codi de confirmació al correu electrònic que has afegit. "
+"Revisa la teva safata d'entrada (i la carpeta de spam!) per veure aquest "
+"codi i les instruccions per utilitzar-lo."
 
 #: ../actions/smssettings.php:216 actions/smssettings.php:224
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your inbox "
 "(and spam box!) for the code and instructions on how to use it."
 msgstr ""
+"S'ha enviat un codi de confirmació al número de telèfon has afegit. Revisa "
+"la teva safata d'entrada (i la carpeta de spam!) per veure aquest codi i les "
+"instruccions per utilitzar-lo."
 
 #: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
 #: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
@@ -251,7 +283,7 @@ msgstr ""
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
 #: actions/twitapiusers.php:32
 msgid "API method not found!"
-msgstr ""
+msgstr "No s'ha trobat el mètode API!"
 
 #: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
 #: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
@@ -274,7 +306,7 @@ msgstr ""
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
 #: actions/twitapistatuses.php:562
 msgid "API method under construction."
-msgstr ""
+msgstr "Mètode API en construcció."
 
 #: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
 msgid "About"
@@ -303,7 +335,7 @@ msgstr "Afegir OpenID"
 #: ../lib/settingsaction.php:97 lib/settingsaction.php:91
 #: lib/accountsettingsaction.php:117
 msgid "Add or remove OpenIDs"
-msgstr ""
+msgstr "Afegir o eliminar OpenIDs"
 
 #: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
@@ -315,7 +347,7 @@ msgstr "Adreça"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
 msgid "Addresses of friends to invite (one per line)"
-msgstr ""
+msgstr "Direccions d'amic per convidar (una per línia)"
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
 #: actions/showstream.php:422
@@ -350,7 +382,7 @@ msgstr "Ja estàs subscrit!"
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
 #: actions/deletenotice.php:113
 msgid "Are you sure you want to delete this notice?"
-msgstr ""
+msgstr "N'estàs segur que vols eliminar aquesta notificació?"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 #: actions/userauthorization.php:81
@@ -368,6 +400,8 @@ msgstr ""
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
+"Automàticament subscriure's a qualsevol que ho estigui a tu mateix (ideal "
+"per no-humans)"
 
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
@@ -395,14 +429,15 @@ msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
+"Esperant a confirmar aquesta direcció. Revisa la teva safata d'entrada (i la "
+"carpeta de spam!) per al missatge amb les instruccions."
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
 #: actions/smssettings.php:111
 msgid "Awaiting confirmation on this phone number."
-msgstr ""
+msgstr "Esperant confirmació per aquest número de telèfon."
 
 #: ../lib/util.php:1318 lib/util.php:1452
-#, fuzzy
 msgid "Before »"
 msgstr "Anterior »"
 
@@ -422,7 +457,7 @@ msgstr "La biografia és massa llarga (màx. 140 caràcters)."
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
 msgid "Can't delete this notice."
-msgstr ""
+msgstr "No es pot esborrar la notificació."
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #: actions/updateprofile.php:123
@@ -456,7 +491,7 @@ msgstr "Impossible normalitzar aquest Jabber ID"
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
 #: actions/emailsettings.php:311
 msgid "Cannot normalize that email address"
-msgstr ""
+msgstr "No es pot normalitzar aquesta direcció de correu electrònic"
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
 #: actions/passwordsettings.php:110
@@ -466,7 +501,7 @@ msgstr "Canviar"
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
 #: lib/accountsettingsaction.php:114
 msgid "Change email handling"
-msgstr ""
+msgstr "Canviar correu electrònic"
 
 #: ../actions/password.php:32 actions/profilesettings.php:36
 #: actions/passwordsettings.php:58
@@ -475,12 +510,12 @@ msgstr "Canviar contrasenya"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
 msgid "Change your password"
-msgstr ""
+msgstr "Canviar la teva contrasenya"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
 #: lib/accountsettingsaction.php:105
 msgid "Change your profile settings"
-msgstr ""
+msgstr "Canviar les preferències del teu perfil"
 
 #: ../actions/password.php:43 ../actions/recoverpassword.php:181
 #: ../actions/register.php:155 ../actions/smssettings.php:65
@@ -507,7 +542,7 @@ msgstr "Confirmació cancel·lada."
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
 #: actions/smssettings.php:118
 msgid "Confirmation code"
-msgstr ""
+msgstr "Codi de confirmació"
 
 #: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 #: actions/confirmaddress.php:80
@@ -532,6 +567,19 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
+"Felicitats, %s! I benvingut/da a %%%%site.name%%%%. Des d'aquí, podries...\n"
+"\n"
+"* Anar al teu [teu perfil](%s) i publicar el teu primer missatge.\n"
+"* Afegir una [direcció Jabber/GTalk](%%%%action.imsettings%%%%) i així poder "
+"publicar les notificacions a través de missatgeria instantània.\n"
+"* [Buscar gent](%%%%action.peoplesearch%%%%) que puguis conèixer o que "
+"comparteixi els teus interessos. \n"
+"* Actualitzar les [preferències del teu "
+"perfil](%%%%action.profilesettings%%%%) per explicar als demés més sobre tu. "
+"* Llegir els [documents de la xarxa](%%%%doc.help%%%%) per conèixer les "
+"característiques del nostre servei. \n"
+"\n"
+"Gràcies per registrar-te i esperem que gaudeixis d'aquest servei."
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
 #: actions/finishopenidlogin.php:119 lib/action.php:330
@@ -558,11 +606,12 @@ msgstr "No s'ha pogut crear el formulari OpenID: %s"
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr ""
+"No pots subscriure't de nou a aquest usuari: %s ja està a la teva llista."
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
 #: actions/twitapifriendships.php:41
 msgid "Could not follow user: User not found."
-msgstr ""
+msgstr "No pots subscriure't a aquest usuari: L'usuari no existeix."
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
 #, php-format
@@ -581,16 +630,16 @@ msgstr "No s'ha pogut guardar la informació del nou perfil"
 
 #: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
 msgid "Could not subscribe other to you."
-msgstr ""
+msgstr "No pots subscriure a un altre a tu mateix."
 
 #: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
 msgid "Could not subscribe."
-msgstr ""
+msgstr "No pots subscriure."
 
 #: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
 #: actions/recoverpassword.php:111
 msgid "Could not update user with confirmed email address."
-msgstr ""
+msgstr "No es pot actualitzar l'usuari amb el correu electrònic confirmat"
 
 #: ../actions/finishremotesubscribe.php:99
 #: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
@@ -613,7 +662,7 @@ msgstr "No s'ha pogut eliminar la subscripció."
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
 #: actions/twitapistatuses.php:84
 msgid "Couldn't find any statuses."
-msgstr ""
+msgstr "No es pot trobar cap estatus."
 
 #: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
 #: actions/remotesubscribe.php:178
@@ -642,13 +691,13 @@ msgstr "No s'ha pogut guardar el perfil."
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
 #: actions/profilesettings.php:279
 msgid "Couldn't update user for autosubscribe."
-msgstr ""
+msgstr "No es pot actualitzar l'usuari per autosubscriure."
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
 #: actions/emailsettings.php:440 actions/emailsettings.php:462
 msgid "Couldn't update user record."
-msgstr ""
+msgstr "No s'ha pogut actualitzar el registre de l'usuari."
 
 #: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
 #: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
@@ -694,12 +743,12 @@ msgstr "Adreça actual Jabber/Gtalk confirmada."
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
 #: actions/smssettings.php:100
 msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
+msgstr "Número de telèfon actualment confirmat i activat per SMS."
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
 #: actions/emailsettings.php:99
 msgid "Current confirmed email address."
-msgstr ""
+msgstr "Correu electrònic confirmat actualment."
 
 #: ../actions/showstream.php:356 actions/showstream.php:367
 msgid "Currently"
@@ -708,7 +757,7 @@ msgstr "Actualment"
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
 #, php-format
 msgid "DB error inserting hashtag: %s"
-msgstr ""
+msgstr "Hashtag de l'error de la base de dades:%s"
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
 #, php-format
@@ -718,7 +767,7 @@ msgstr "Error de BD en inserir resposta: %s"
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
 #: actions/deletenotice.php:79
 msgid "Delete notice"
-msgstr ""
+msgstr "Eliminar nota."
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
@@ -736,12 +785,12 @@ msgstr "Correu electrònic"
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
 #: actions/emailsettings.php:115
 msgid "Email Address"
-msgstr ""
+msgstr "Direcció de correu electrònic"
 
 #: ../actions/emailsettings.php:32 actions/emailsettings.php:32
 #: actions/emailsettings.php:60
 msgid "Email Settings"
-msgstr ""
+msgstr "Configuració del correu electrònic"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
 msgid "Email address already exists."
@@ -754,11 +803,11 @@ msgstr "Confirmació de l'adreça de correu electrònic"
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
 #: actions/emailsettings.php:117
 msgid "Email address, like \"UserName@example.org\""
-msgstr ""
+msgstr "Correu electrònic, com Email address, like \"UserName@example.org\""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
 msgid "Email addresses"
-msgstr ""
+msgstr "Direcció de correu electrònic"
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 #: actions/recoverpassword.php:231
@@ -768,7 +817,7 @@ msgstr "Escriu un sobrenom o una adreça de correu electrònic."
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
 #: actions/smssettings.php:119
 msgid "Enter the code you received on your phone."
-msgstr ""
+msgstr "Escriu el codi que has rebut en el teu telèfon mòbil."
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 #: actions/userauthorization.php:161
@@ -876,17 +925,17 @@ msgstr "Feed per a respostes a %s"
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
 #, php-format
 msgid "Feed for tag %s"
-msgstr ""
+msgstr "Feed per a l'etiqueta %s"
 
 #: ../lib/searchaction.php:105 lib/searchaction.php:105
 #: lib/searchgroupnav.php:83
 msgid "Find content of notices"
-msgstr ""
+msgstr "Trobar contingut de les notes"
 
 #: ../lib/searchaction.php:101 lib/searchaction.php:101
 #: lib/searchgroupnav.php:81
 msgid "Find people on this site"
-msgstr ""
+msgstr "Trobar gent en aquest lloc"
 
 #: ../actions/login.php:122
 msgid ""
@@ -939,12 +988,12 @@ msgstr "La pàgina personal no és un URL vàlid."
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
 #: actions/emailsettings.php:173
 msgid "I want to post notices by email."
-msgstr ""
+msgstr "Vull publicar notificacions per correu electrònic."
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
 #: lib/connectsettingsaction.php:104
 msgid "IM"
-msgstr ""
+msgstr "Missatgeria Instantània"
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
 #: actions/imsettings.php:118
@@ -978,17 +1027,19 @@ msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
 msgstr ""
+"Si has oblidat o has perdut la teva contrasenya, pots obtenir-ne una de nova "
+"que t'enviarem al correu electrònic que tinguis posat  al teu compte."
 
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
 msgid "Incoming email"
-msgstr ""
+msgstr "Correu electrònic entrant"
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
 #: actions/emailsettings.php:443
 msgid "Incoming email address removed."
-msgstr ""
+msgstr "Eliminat el correu electrònic entrant."
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
 #: actions/passwordsettings.php:153
@@ -1017,7 +1068,7 @@ msgstr "L'URL de l'avatar '%s' és invàlid"
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
 #, php-format
 msgid "Invalid email address: %s"
-msgstr ""
+msgstr "Correu electrònic invàlid: %s"
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #: actions/updateprofile.php:102
@@ -1077,20 +1128,20 @@ msgstr "Nom d'usuari o contrasenya invàlids."
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
 msgid "Invitation(s) sent"
-msgstr ""
+msgstr "Invitació(ons) enviada(des)"
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
 msgid "Invitation(s) sent to the following people:"
-msgstr ""
+msgstr "Invitació(ons) enviada(des) a la següent gent:"
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
 #: lib/subgroupnav.php:103
 msgid "Invite"
-msgstr ""
+msgstr "Invitar"
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
 msgid "Invite new users"
-msgstr ""
+msgstr "Invitar nous usuaris"
 
 #: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
 #, php-format
@@ -1121,12 +1172,12 @@ msgstr ""
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
 #: actions/profilesettings.php:128
 msgid "Language"
-msgstr ""
+msgstr "Idioma"
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
 #: actions/profilesettings.php:217
 msgid "Language is too long (max 50 chars)."
-msgstr ""
+msgstr "L'idioma és massa llarg (màx 50 caràcters)."
 
 #: ../actions/profilesettings.php:52 ../actions/register.php:173
 #: actions/profilesettings.php:85 actions/register.php:187
@@ -1180,7 +1231,7 @@ msgstr "Sortir"
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393
 msgid "Longer name, preferably your \"real\" name"
-msgstr ""
+msgstr "Nom llarg, preferiblement el teu nom \"real\""
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
 #: lib/facebookaction.php:320
@@ -1190,13 +1241,13 @@ msgstr "Contrasenya oblidada o perduda?"
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
 msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
+msgstr "Posar un nou correu electrònic per publicar; cancel·lar l'antic."
 
 #: ../actions/emailsettings.php:27 actions/emailsettings.php:27
 #: actions/emailsettings.php:71
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
-msgstr ""
+msgstr "Gestionar com reps correus de %%site.name%%."
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
 #: actions/showstream.php:480
@@ -1214,6 +1265,9 @@ 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 ""
+"Capacitat per al teu telèfon mòbil. Si vostè coneix una companyia que "
+"accepti SMS a través del correu electrònic, però no està a la llista, "
+"envia'ns un correu electrònic per fer-nos-ho saber %s."
 
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
@@ -1225,17 +1279,17 @@ msgstr "El meu text i els meus fitxers estan disponibles sota "
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
 msgid "New"
-msgstr ""
+msgstr "Nou"
 
 #: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
 #, php-format
 msgid "New email address for posting to %s"
-msgstr ""
+msgstr "Nou correu electrònic per publicar a %s"
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
 #: actions/emailsettings.php:465
 msgid "New incoming email address added."
-msgstr ""
+msgstr "Nou correu electrònic entrant afegit."
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
 #: actions/finishopenidlogin.php:99
@@ -1305,7 +1359,7 @@ msgstr "Sobrenom o correu electrònic"
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
 msgid "No"
-msgstr ""
+msgstr "No"
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
 #: actions/imsettings.php:279
@@ -1320,12 +1374,12 @@ msgstr "Cap petició d'autorització!"
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
 #: actions/smssettings.php:299
 msgid "No carrier selected."
-msgstr ""
+msgstr "No s'ha sel·leccionat cap transport."
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
 #: actions/smssettings.php:486
 msgid "No code entered"
-msgstr ""
+msgstr "No hi ha cap codi entrat"
 
 #: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 #: actions/confirmaddress.php:75
@@ -1341,7 +1395,7 @@ msgstr "Cap contingut!"
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
 #: actions/emailsettings.php:304
 msgid "No email address."
-msgstr ""
+msgstr "No hi ha cap direcció de correu electrònic."
 
 #: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
 msgid "No id."
@@ -1350,7 +1404,7 @@ msgstr "Cap identificador."
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
 #: actions/emailsettings.php:430
 msgid "No incoming email address."
-msgstr ""
+msgstr "No hi ha cap direcció de correu electrònic entrant."
 
 #: ../actions/finishremotesubscribe.php:65
 #: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
@@ -1373,7 +1427,7 @@ msgstr "Cap confirmació pendent per a cancel·lar."
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
 #: actions/smssettings.php:294
 msgid "No phone number."
-msgstr ""
+msgstr "No hi ha cap número de telèfon."
 
 #: ../actions/finishremotesubscribe.php:72
 #: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
@@ -1406,12 +1460,12 @@ msgstr "Cap mida."
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
 #: actions/twitapistatuses.php:446
 msgid "No status found with that ID."
-msgstr ""
+msgstr "No s'ha trobat cap estatus amb aquesta ID."
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
 #: actions/twitapistatuses.php:418
 msgid "No status with that ID found."
-msgstr ""
+msgstr "No s'ha trobat cap estatus amb la ID trobada."
 
 #: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 #: actions/openidsettings.php:222
@@ -1470,7 +1524,7 @@ msgstr "No existeix aquest usuari."
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
 #: actions/recoverpassword.php:251
 msgid "No user with that email address or username."
-msgstr ""
+msgstr "No hi ha cap usuari amb aquesta direcció o usuari."
 
 #: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
@@ -1484,14 +1538,14 @@ msgstr "No és un codi de recuperació."
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
 #: scripts/maildaemon.php:53
 msgid "Not a registered user."
-msgstr ""
+msgstr "Usuari no registrat."
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
 #: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
 #: lib/twitterapi.php:566
 msgid "Not a supported data format."
-msgstr ""
+msgstr "Format de data no suportat."
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
 #: actions/imsettings.php:290
@@ -1505,7 +1559,7 @@ msgstr "OpenID no vàlid."
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
 #: actions/emailsettings.php:315
 msgid "Not a valid email address"
-msgstr ""
+msgstr "No és una direcció de correu electrònic vàlida."
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
 msgid "Not a valid email address."
@@ -1551,7 +1605,7 @@ msgstr "Resposta inesperada!"
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309
 msgid "Not found"
-msgstr ""
+msgstr "No s'ha trobat"
 
 #: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
 #: ../actions/newnotice.php:29 ../actions/subscribe.php:28
@@ -1576,7 +1630,7 @@ msgstr "No estàs subscrit!"
 #: ../actions/opensearch.php:35 actions/opensearch.php:35
 #: actions/opensearch.php:67
 msgid "Notice Search"
-msgstr ""
+msgstr "Cerca de notificacions"
 
 #: ../actions/showstream.php:82 actions/showstream.php:82
 #: actions/showstream.php:180 actions/showstream.php:187
@@ -1600,7 +1654,7 @@ msgstr "Avisos"
 #: actions/tag.php:81 actions/tag.php:41
 #, php-format
 msgid "Notices tagged with %s"
-msgstr ""
+msgstr "Aviso etiquetats amb %s"
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
 #: actions/passwordsettings.php:97
@@ -1665,7 +1719,7 @@ msgstr "Configuració OpenID"
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
 msgid "Optionally add a personal message to the invitation."
-msgstr ""
+msgstr "Opcionalment pots afegir un missatge a la invitació."
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
 #: lib/imagefile.php:75
@@ -1712,12 +1766,12 @@ msgstr "Les contrasenyes no coincideixen."
 #: ../lib/searchaction.php:100 lib/searchaction.php:100
 #: lib/searchgroupnav.php:80
 msgid "People"
-msgstr ""
+msgstr "Gent"
 
 #: ../actions/opensearch.php:33 actions/opensearch.php:33
 #: actions/opensearch.php:64
 msgid "People Search"
-msgstr ""
+msgstr "Cercar gent"
 
 #: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
 #: actions/peoplesearch.php:58
@@ -1730,11 +1784,11 @@ msgstr "Personal"
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
 msgid "Personal message"
-msgstr ""
+msgstr "Missatge personal"
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
 msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
+msgstr "Número de telèfon, no puntuació ni espais, en l'àrea del codi"
 
 #: ../actions/userauthorization.php:78
 msgid ""
@@ -1771,7 +1825,7 @@ msgstr "Preferències guardades."
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
 #: actions/profilesettings.php:129
 msgid "Preferred language"
-msgstr ""
+msgstr "Preferència d'idioma"
 
 #: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
 msgid "Privacy"
@@ -1816,17 +1870,17 @@ msgstr "Línia temporal pública"
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
 #: actions/imsettings.php:153
 msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
+msgstr "Publica una MicroID per a la meva direcció de Jabber/GTalk."
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
 #: actions/emailsettings.php:178
 msgid "Publish a MicroID for my email address."
-msgstr ""
+msgstr "Publica una MicroID per al meu correu electrònic."
 
 #: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
 #: actions/tag.php:76
 msgid "Recent Tags"
-msgstr ""
+msgstr "Etiquetes recents"
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
 #: actions/recoverpassword.php:190
@@ -1853,12 +1907,12 @@ msgstr "Registrar-se"
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
 msgid "Registration not allowed."
-msgstr ""
+msgstr "Registre no permès."
 
 #: ../actions/register.php:200 actions/register.php:214
 #: actions/register.php:67
 msgid "Registration successful"
-msgstr ""
+msgstr "Registre satisfactori"
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
 #: actions/userauthorization.php:144
@@ -1932,21 +1986,21 @@ msgstr "Restablir contrasenya"
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
 msgid "SMS"
-msgstr ""
+msgstr "SMS"
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
 #: actions/smssettings.php:126
 msgid "SMS Phone number"
-msgstr ""
+msgstr "Número de telèfon pels SMS"
 
 #: ../actions/smssettings.php:33 actions/smssettings.php:33
 #: actions/smssettings.php:58
 msgid "SMS Settings"
-msgstr ""
+msgstr "Configuració SMS"
 
 #: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
 msgid "SMS confirmation"
-msgstr ""
+msgstr "Confirmació SMS"
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
 #: actions/recoverpassword.php:222
@@ -1956,7 +2010,7 @@ msgstr "Igual a la contrasenya de dalt"
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377
 msgid "Same as password above. Required."
-msgstr ""
+msgstr "Igual a la contrasenya de dalt. Requerit."
 
 #: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
 #: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
@@ -2003,7 +2057,7 @@ msgstr ""
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
 #: actions/smssettings.php:457
 msgid "Select a carrier"
-msgstr ""
+msgstr "Selecciona un transport"
 
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
@@ -2016,11 +2070,15 @@ msgstr "Enviar"
 #: actions/emailsettings.php:132 actions/smssettings.php:145
 msgid "Send email to this address to post new notices."
 msgstr ""
+"Enviar correu electrònic a aquesta direcció per publicar noves "
+"notificacions."
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
 #: actions/emailsettings.php:152
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
+"Envia'm notificacions quan algú nou se'm subscrigui, al meu correu "
+"electrònic."
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
 #: actions/imsettings.php:137
@@ -2032,10 +2090,14 @@ msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
+"Enviar-me avisos a través de SMS; puc entendre que això repercutirà en una "
+"exorbitant càrrega del meu transport."
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
 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."
 
 #: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
 msgid "Settings"
@@ -2048,7 +2110,7 @@ msgstr "Configuració guardada."
 
 #: ../actions/tag.php:60 actions/tag.php:60
 msgid "Showing most popular tags from the last week"
-msgstr ""
+msgstr "Mostrant les etiquetes més populars de l'última setmana"
 
 #: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 #: actions/finishaddopenid.php:114
@@ -2064,12 +2126,12 @@ msgstr "Alguna cosa estranya ha passat."
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
 #: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
-msgstr ""
+msgstr "Perdó, no hi ha un correu electrònic entrant permès."
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
 #: scripts/maildaemon.php:57
 msgid "Sorry, that is not your incoming email address."
-msgstr ""
+msgstr "Perdó, aquest no és el teu correu electrònic entrant permès."
 
 #: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
 msgid "Source"
@@ -2129,11 +2191,11 @@ msgstr "Error del sistema en pujar el fitxer."
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
 #: lib/profilelist.php:164
 msgid "Tags"
-msgstr ""
+msgstr "Etiquetes"
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
 msgid "Text"
-msgstr ""
+msgstr "Text"
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
 #: actions/noticesearch.php:67
@@ -2157,7 +2219,7 @@ msgstr "Aquest codi de confirmació no és per a tu!"
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
 msgid "That email address already belongs to another user."
-msgstr ""
+msgstr "Aquest correu electrònic pertany a un altre usuari."
 
 #: ../actions/avatar.php:80 actions/profilesettings.php:317
 #: lib/imagefile.php:71
@@ -2172,12 +2234,12 @@ msgstr "Aquest ja és el teu Jabber ID."
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
 #: actions/emailsettings.php:318
 msgid "That is already your email address."
-msgstr ""
+msgstr "Aquest ja és el teu correu electrònic."
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
 #: actions/smssettings.php:306
 msgid "That is already your phone number."
-msgstr ""
+msgstr "Aquest ja és el teu número de telèfon."
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
 #: actions/imsettings.php:381
@@ -2187,12 +2249,12 @@ msgstr "Aquest no és el teu Jabber ID."
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
 #: actions/emailsettings.php:397
 msgid "That is not your email address."
-msgstr ""
+msgstr "Aquest no és el teu correu electrònic"
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
 #: actions/smssettings.php:393
 msgid "That is not your phone number."
-msgstr ""
+msgstr "Aquest no és el teu número de telèfon."
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
@@ -2203,12 +2265,12 @@ msgstr "Aquesta adreça de missatgeria instantània és incorrecta."
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
 #: actions/smssettings.php:362
 msgid "That is the wrong confirmation number."
-msgstr ""
+msgstr "Aquest és un número de confirmació incorrecte."
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
 #: actions/smssettings.php:309
 msgid "That phone number already belongs to another user."
-msgstr ""
+msgstr "Aquest número de telèfon pertany a un altre usuari."
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
@@ -2219,7 +2281,7 @@ msgstr "Massa llarg. La longitud màxima és de 140 caràcters."
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
 #: actions/twitapiaccount.php:62
 msgid "That's too long. Max notice size is 255 chars."
-msgstr ""
+msgstr "Massa llarg. La longitud màxima és de 255 caràcters."
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
@@ -2275,6 +2337,7 @@ msgstr "Aquestes són les persones que escoltes."
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
+"Aquestes persona ja són usuaris i tu estàs subscrit automàticament a ells:"
 
 #: ../actions/recoverpassword.php:88
 msgid "This confirmation code is too old. Please start again."
@@ -2305,7 +2368,7 @@ msgstr ""
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
 msgid "This method requires a POST or DELETE."
-msgstr ""
+msgstr "Aquest mètode requereix POST o DELETE."
 
 #: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
 #: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
@@ -2314,7 +2377,7 @@ msgstr ""
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
 #: actions/twitapistatuses.php:244
 msgid "This method requires a POST."
-msgstr ""
+msgstr "Aquest mètode requereix POST."
 
 #: ../lib/util.php:164 lib/util.php:246
 msgid "This page is not available in a media type you accept"
@@ -2323,12 +2386,12 @@ msgstr "Aquesta pàgina no està disponible en un tipus de mèdia que acceptis."
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
 #: actions/profilesettings.php:138
 msgid "Timezone"
-msgstr ""
+msgstr "Franja horària"
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
 #: actions/profilesettings.php:211
 msgid "Timezone not selected."
-msgstr ""
+msgstr "Franja horària no seleccionada."
 
 #: ../actions/remotesubscribe.php:43
 #, php-format
@@ -2345,7 +2408,7 @@ msgstr ""
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132
 msgid "Two user ids or screen_names must be supplied."
-msgstr ""
+msgstr "Dos ids d'usuari o screen_names has de ser substituïts."
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
@@ -2376,7 +2439,7 @@ msgstr "Restabliment de contrasenya inesperat."
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
 msgid "Unknown action"
-msgstr ""
+msgstr "Acció desconeguda"
 
 #: ../actions/finishremotesubscribe.php:58
 #: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
@@ -2416,24 +2479,24 @@ msgstr "Format d'imatge no suportat."
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
 #: lib/connectsettingsaction.php:108
 msgid "Updates by SMS"
-msgstr ""
+msgstr "Actualitzacions per SMS"
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
 #: lib/connectsettingsaction.php:105
 msgid "Updates by instant messenger (IM)"
-msgstr ""
+msgstr "Actualitzacions per Missatgeria Instantània"
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
 #: actions/twitapistatuses.php:129
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
+msgstr "Actualitzacions de %1$s i amics a %2$s!"
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
 #: actions/twitapistatuses.php:202
 #, php-format
 msgid "Updates from %1$s on %2$s!"
-msgstr ""
+msgstr "Actualitzacions de %1$s a %2$s!"
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
@@ -2454,12 +2517,14 @@ msgstr ""
 
 #: ../lib/settingsaction.php:91
 msgid "Upload a new profile image"
-msgstr ""
+msgstr "Carregar una nova imatge per al perfil"
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
+"Utilitza aquest formulari per convidar els teus amics i col·legues perquè "
+"utilitzin aquest servei."
 
 #: ../actions/register.php:159 ../actions/register.php:162
 #: actions/register.php:173 actions/register.php:176
@@ -2497,12 +2562,12 @@ msgstr "Sobrenom de l'usuari"
 
 #: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
 msgid "User not found."
-msgstr ""
+msgstr "No s'ha trobat l'usuari."
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
 #: actions/profilesettings.php:139
 msgid "What timezone are you normally in?"
-msgstr ""
+msgstr "Quina franja horària seria normal ser?"
 
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
 #, php-format
@@ -2532,7 +2597,7 @@ msgstr "Mida d'imatge incorrecta per a '%s'"
 #: actions/block.php:148 actions/deletenotice.php:122
 #: actions/deletenotice.php:141
 msgid "Yes"
-msgstr ""
+msgstr "Sí"
 
 #: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
 #: actions/finishaddopenid.php:112
@@ -2544,6 +2609,8 @@ msgid ""
 "You are about to permanently delete a notice.  Once this is done, it cannot "
 "be undone."
 msgstr ""
+"Estàs a punt d'eliminar permanentment una notificació.  Una vegada ho facis, "
+"no ho podràs desfer."
 
 #: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
 #: actions/recoverpassword.php:36
@@ -2552,12 +2619,12 @@ msgstr "Ja t'has connectat!"
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
 msgid "You are already subscribed to these users:"
-msgstr ""
+msgstr "Ja estàs subscrit a aquests usuaris:"
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
 #: actions/twitapifriendships.php:105
 msgid "You are not friends with the specified user."
-msgstr ""
+msgstr "No ets amic dels usuaris que has especificat."
 
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
@@ -2572,6 +2639,8 @@ msgstr "Pots crear un nou compte i començar a enviar avisos."
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
+"Pots rebre missatges SMS a través del teu coreu electrònic des de "
+"%%site.name%%."
 
 #: ../actions/openidsettings.php:86
 msgid ""
@@ -2625,22 +2694,34 @@ msgid ""
 "Faithfully yours,\n"
 "%4$s"
 msgstr ""
+"Tens una nova direcció per publicar a %1$s.\n"
+"\n"
+"Envia un correu electrònic a %2$s per publicar un nou missatge.\n"
+"\n"
+"Més instruccions per al correu electrònic a %3$s.\n"
+"\n"
+"Sincerament teus,\n"
+"%4$s"
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
 #: actions/twitapistatuses.php:463
 msgid "You may not delete another user's status."
-msgstr ""
+msgstr "No pots eliminar l'estatus d'un altre usuari."
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr ""
+"Has d'estar dins del servei per poder convidar altres usuaris a utilitzar-lo "
+"%s"
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
 msgstr ""
+"Seràs avisat quan les teves invitacions siguin acceptades i els teus "
+"convidats es registrin al lloc. Gràcies per fer créixer la comunitat."
 
 #: ../actions/recoverpassword.php:149
 msgid "You've been identified. Enter a  new password below. "
@@ -2713,7 +2794,7 @@ msgstr "fa una hora"
 #: ../actions/showstream.php:423 ../lib/stream.php:132
 #: actions/showstream.php:441 lib/stream.php:99
 msgid "delete"
-msgstr ""
+msgstr "eliminar"
 
 #: ../actions/noticesearch.php:130 ../actions/showstream.php:408
 #: ../lib/stream.php:117 actions/noticesearch.php:136
@@ -2735,12 +2816,11 @@ msgstr "repeteix la contrasenya anterior"
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
 #: actions/twitapistatuses.php:555
 msgid "unsupported file type"
-msgstr ""
+msgstr "tipus de fitxer no suportat"
 
 #: ../lib/util.php:1309 lib/util.php:1443
-#, fuzzy
 msgid "« After"
-msgstr "« Següent"
+msgstr "« Posterior"
 
 #: actions/deletenotice.php:74 actions/disfavor.php:43
 #: actions/emailsettings.php:127 actions/favor.php:45
@@ -2757,66 +2837,71 @@ msgstr "« Següent"
 #: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
+"Sembla que hi ha hagut un problema amb la teva sessió. Prova-ho de nou, si "
+"us plau."
 
 #: actions/disfavor.php:55 actions/disfavor.php:81
 msgid "This notice is not a favorite!"
-msgstr ""
+msgstr "Aquesta notificació no és un favorit!"
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
 msgid "Could not delete favorite."
-msgstr ""
+msgstr "No pots eliminar favorits."
 
 #: actions/disfavor.php:72 lib/favorform.php:140
 msgid "Favor"
-msgstr ""
+msgstr "Favorit"
 
 #: actions/emailsettings.php:92
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
+"Envia'm un correu electrònic quan algú afegeixi una nota meva com a favorit."
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
 msgid "Send me email when someone sends me a private message."
-msgstr ""
+msgstr "Envia'm un correu electrònic quan algú m'envii un missatge privat."
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
 #: actions/twitapifavorites.php:118
 msgid "This notice is already a favorite!"
-msgstr ""
+msgstr "Aquesta nota ja és favorita."
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
 msgid "Could not create favorite."
-msgstr ""
+msgstr "No es pot crear favorit."
 
 #: actions/favor.php:70
 msgid "Disfavor"
-msgstr ""
+msgstr "Desfavorit"
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
 #, php-format
 msgid "%s favorite notices"
-msgstr ""
+msgstr "%s notificacions favorites"
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
 #, php-format
 msgid "Feed of favorite notices of %s"
-msgstr ""
+msgstr "Feed de notes favorites de %s"
 
 #: actions/inbox.php:28 actions/inbox.php:59
 #, php-format
 msgid "Inbox for %s - page %d"
-msgstr ""
+msgstr "Safata d'entrada per %s - pàgina %d"
 
 #: actions/inbox.php:30 actions/inbox.php:62
 #, php-format
 msgid "Inbox for %s"
-msgstr ""
+msgstr "Safata d'entrada per %s"
 
 #: actions/inbox.php:53 actions/inbox.php:115
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
+"Aquesta és la teva safata d'entrada, que et mostrarà els teus missatges "
+"privats."
 
 #: actions/invite.php:178 actions/invite.php:213
 #, php-format
@@ -2824,95 +2909,99 @@ msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
 "\n"
 msgstr ""
+"%1$s t'ha convidat a participar a %2$s (%3$s).\n"
+"\n"
 
 #: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
 #: actions/register.php:416
 msgid "Automatically login in the future; "
-msgstr ""
+msgstr "Accedir automàticament en el futur; "
 
 #: actions/login.php:122 actions/login.php:264
 msgid "For security reasons, please re-enter your "
-msgstr ""
+msgstr "Per raons de seguretat, si us plau torna a escriure la teva "
 
 #: actions/login.php:126 actions/login.php:268
 msgid "Login with your username and password. "
-msgstr ""
+msgstr "Entra amb el teu usuari i contrasenya. "
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
 #: actions/twitapidirect_messages.php:141
 msgid "That's too long. Max message size is 140 chars."
-msgstr ""
+msgstr "És massa llarg. Màxim del missatge és 140 caràcters."
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
 msgid "No recipient specified."
-msgstr ""
+msgstr "No has especificat el destinatari."
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
 msgid "You can't send a message to this user."
-msgstr ""
+msgstr "No pots enviar un missatge a aquest usuari."
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
 #: classes/Command.php:240
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr ""
+msgstr "No t'enviïs missatges a tu mateix, simplement dir-te això."
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
 #: actions/newmessage.php:163
 msgid "No such user"
-msgstr ""
+msgstr "Aquest usuari no existeix"
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
 msgid "New message"
-msgstr ""
+msgstr "Nou missatge"
 
 #: actions/noticesearch.php:95 actions/noticesearch.php:146
 msgid "Notice without matching profile"
-msgstr ""
+msgstr "Notificar sense especificar perfil"
 
 #: actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr ""
+msgstr "[OpenID](%%doc.openid%%) et permet accedir a molts llocs web "
 
 #: actions/openidsettings.php:46 actions/openidsettings.php:96
 msgid "If you want to add an OpenID to your account, "
-msgstr ""
+msgstr "Si vols afegit un OpenID al teu compte, "
 
 #: actions/openidsettings.php:74
 msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr ""
+msgstr "Eliminant la teva única OpenID et serà impossible accedir-hi! "
 
 #: actions/openidsettings.php:87 actions/openidsettings.php:143
 msgid "You can remove an OpenID from your account "
-msgstr ""
+msgstr "Pots eliminar un OpenID del teu compte "
 
 #: actions/outbox.php:28 actions/outbox.php:58
 #, php-format
 msgid "Outbox for %s - page %d"
-msgstr ""
+msgstr "Safata de sortida per %s - pàgina %d"
 
 #: actions/outbox.php:30 actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
-msgstr ""
+msgstr "Safata de sortida per %s"
 
 #: actions/outbox.php:53 actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
+"Aquesta és la teva safata de sortida, que et mostrarà els missatges privats "
+"que has enviat."
 
 #: actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
-msgstr ""
+msgstr "Cercar gent a %%site.name%% pel seu nom, localització, o interessos. "
 
 #: actions/profilesettings.php:27 actions/profilesettings.php:69
 msgid "You can update your personal profile info here "
-msgstr ""
+msgstr "Pots actualitzar la informació del teu perfil aquí "
 
 #: actions/profilesettings.php:115 actions/remotesubscribe.php:320
 #: actions/userauthorization.php:159 actions/userrss.php:76
@@ -2920,35 +3009,35 @@ msgstr ""
 #: actions/grouplogo.php:177 actions/remotesubscribe.php:367
 #: actions/userauthorization.php:176 actions/userrss.php:82
 msgid "User without matching profile"
-msgstr ""
+msgstr "Usuari sense perfil coincident"
 
 #: actions/recoverpassword.php:91 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. "
-msgstr ""
+msgstr "El codi de confirmació és massa antic. "
 
 #: actions/recoverpassword.php:141 actions/recoverpassword.php:152
 msgid "If you've forgotten or lost your"
-msgstr ""
+msgstr "Si has oblidat o perdut el teu"
 
 #: actions/recoverpassword.php:154 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a "
-msgstr ""
+msgstr "Has estat identificat. Entra "
 
 #: actions/recoverpassword.php:169 actions/recoverpassword.php:188
 msgid "Your nickname on this server, "
-msgstr ""
+msgstr "El teu nom d'usuari en aquest servidor, "
 
 #: actions/recoverpassword.php:271 actions/recoverpassword.php:304
 msgid "Instructions for recovering your password "
-msgstr ""
+msgstr "Instruccions per recuperar la teva contrasenya "
 
 #: actions/recoverpassword.php:327 actions/recoverpassword.php:361
 msgid "New password successfully saved. "
-msgstr ""
+msgstr "La nova contrasenya s'ha guardat satisfactòriament. "
 
 #: actions/register.php:95 actions/register.php:180
 msgid "Password must be 6 or more characters."
-msgstr ""
+msgstr "La contrasenya hauria de ser d'entre 6 a més caràcters."
 
 #: actions/register.php:216
 #, php-format
@@ -2956,102 +3045,105 @@ msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
 msgstr ""
+"Felicitats, %s! I benvingut/da a %%%%site.name%%%%. Des d'aquí, potser "
+"vols..."
 
 #: actions/register.php:227
 msgid "(You should receive a message by email momentarily, with "
 msgstr ""
+"(Hauries de rebre un missatge per correu electrònic d'aquí uns moments, amb "
 
 #: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
 #, php-format
 msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr ""
+msgstr "Per subscriure't, pots [accedir] (%%action.login%%),"
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
 #, php-format
 msgid "Feed for favorites of %s"
-msgstr ""
+msgstr "Feed per favorits de %s"
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
 msgid "Could not retrieve favorite notices."
-msgstr ""
+msgstr "No s'ha pogut recuperar els avisos de favorits."
 
 #: actions/showmessage.php:33 actions/showmessage.php:81
 msgid "No such message."
-msgstr ""
+msgstr "No existeix el missatge."
 
 #: actions/showmessage.php:42
 msgid "Only the sender and recipient may read this message."
-msgstr ""
+msgstr "Només el remitent i el receptor poden llegir aquest missatge."
 
 #: actions/showmessage.php:61 actions/showmessage.php:108
 #, php-format
 msgid "Message to %1$s on %2$s"
-msgstr ""
+msgstr "Missatge per a %1$s a %2$s"
 
 #: actions/showmessage.php:66 actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
-msgstr ""
+msgstr "Missatge de %1$s a %2$s"
 
 #: actions/showstream.php:154
 msgid "Send a message"
-msgstr ""
+msgstr "Enviar un missatge"
 
 #: actions/smssettings.php:312 actions/smssettings.php:464
 #, php-format
 msgid "Mobile carrier for your phone. "
-msgstr ""
+msgstr "Transport per al teu telèfon. "
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
 #, php-format
 msgid "Direct messages to %s"
-msgstr ""
+msgstr "Missatges directes a %s"
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
 #, php-format
 msgid "All the direct messages sent to %s"
-msgstr ""
+msgstr "Tots els missatges directes enviats a %s"
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
 msgid "Direct Messages You've Sent"
-msgstr ""
+msgstr "Missatges directes que has enviat"
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
 #, php-format
 msgid "All the direct messages sent from %s"
-msgstr ""
+msgstr "Tots els missatges directes enviats per %s"
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
 msgid "No message text!"
-msgstr ""
+msgstr "No hi ha text al missatge!"
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
 msgid "Recipient user not found."
-msgstr ""
+msgstr "No has escrit cap usuari receptor."
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
 msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
+msgstr "No pots enviar missatges directes a usuaris que no siguin amics teus."
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
 #, php-format
 msgid "%s / Favorites from %s"
-msgstr ""
+msgstr "%s / Favorits de %s"
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
 #, php-format
 msgid "%s updates favorited by %s / %s."
-msgstr ""
+msgstr "%s actualitzacions favorites per %s / %s."
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
 #: actions/twitapifavorites.php:164 lib/mail.php:553
 #, php-format
 msgid "%s added your notice as a favorite"
-msgstr ""
+msgstr "%s ha afegit la teva nota com a favorita"
 
 #: actions/twitapifavorites.php:188 lib/mail.php:276
 #: actions/twitapifavorites.php:165
@@ -3060,230 +3152,236 @@ msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
 "\n"
 msgstr ""
+"%1$s acaba d'afegir la teva nota des de %2$s com a favorita.\n"
+"\n"
 
 #: actions/twittersettings.php:27
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
+"Afegit el teu compte Twitter per tal d'enviar automàticament les teves notes "
+"a Twitter, "
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
 msgid "Twitter settings"
-msgstr ""
+msgstr "Configuració Twitter"
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
 msgid "Twitter Account"
-msgstr ""
+msgstr "Compte Twitter"
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
 msgid "Current verified Twitter account."
-msgstr ""
+msgstr "Compte Twitter verificat actualment."
 
 #: actions/twittersettings.php:63
 msgid "Twitter Username"
-msgstr ""
+msgstr "Usuari Twitter"
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
 msgid "No spaces, please."
-msgstr ""
+msgstr "No espais, si us plaus."
 
 #: actions/twittersettings.php:67
 msgid "Twitter Password"
-msgstr ""
+msgstr "Contrasenya Twitter"
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
 msgid "Automatically send my notices to Twitter."
-msgstr ""
+msgstr "Automàticament envia les meves notes a Twitter."
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
 msgid "Send local \"@\" replies to Twitter."
-msgstr ""
+msgstr "Envia respostes locals '@' a Twitter."
 
 #: actions/twittersettings.php:78 actions/twittersettings.php:153
 msgid "Subscribe to my Twitter friends here."
-msgstr ""
+msgstr "Subscriure'm als meus amics de Twitter aquí."
 
 #: actions/twittersettings.php:122
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
+"El nom d'usuari sols pot contenir números, lletres en majúscules i "
+"minúscules, i guions baixos (_). 15 caràcters màxim."
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
 msgid "Could not verify your Twitter credentials!"
-msgstr ""
+msgstr "No es poden verificar les teves credencials de Twitter!"
 
 #: actions/twittersettings.php:137
 #, php-format
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr ""
+msgstr "No es pot recuperar la informació del compte per \"%s\" de Twitter."
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
 msgid "Unable to save your Twitter settings!"
-msgstr ""
+msgstr "No s'ha pogut guardar la teva configuració de Twitter!"
 
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
 msgid "Twitter settings saved."
-msgstr ""
+msgstr "Configuració de Twitter guardada."
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
 msgid "That is not your Twitter account."
-msgstr ""
+msgstr "Aquest no és el teu compte de Twitter."
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
 #: actions/twittersettings.php:403
 msgid "Couldn't remove Twitter user."
-msgstr ""
+msgstr "No es pot eliminar aquest usuari de Twitter."
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
 msgid "Twitter account removed."
-msgstr ""
+msgstr "Compte de Twitter eliminat."
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
 #: actions/twittersettings.php:428 actions/twittersettings.php:439
 #: actions/twittersettings.php:453
 msgid "Couldn't save Twitter preferences."
-msgstr ""
+msgstr "No es poden guardar les preferències de Twitter."
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
 msgid "Twitter preferences saved."
-msgstr ""
+msgstr "Preferències de Twitter guardades."
 
 #: actions/userauthorization.php:84 actions/userauthorization.php:86
 msgid "Please check these details to make sure "
-msgstr ""
+msgstr "Si us plau verifica aquests detalls per estar-ne segur/a "
 
 #: actions/userauthorization.php:324 actions/userauthorization.php:340
 msgid "The subscription has been authorized, but no "
-msgstr ""
+msgstr "La subscripció s'ha autoritzat, però no "
 
 #: actions/userauthorization.php:334 actions/userauthorization.php:351
 msgid "The subscription has been rejected, but no "
-msgstr ""
+msgstr "La subscripció ha estat rebutjada, però no "
 
 #: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
 msgid "Command results"
-msgstr ""
+msgstr "Resultats de les comandes"
 
 #: classes/Channel.php:148 classes/Channel.php:204
 msgid "Command complete"
-msgstr ""
+msgstr "Comanda completada"
 
 #: classes/Channel.php:158 classes/Channel.php:215
 msgid "Command failed"
-msgstr ""
+msgstr "Comanda fallida"
 
 #: classes/Command.php:39 classes/Command.php:44
 msgid "Sorry, this command is not yet implemented."
-msgstr ""
+msgstr "Perdona, aquesta comanda no està implementada."
 
 #: classes/Command.php:96 classes/Command.php:113
 #, php-format
 msgid "Subscriptions: %1$s\n"
-msgstr ""
+msgstr "Subscripcions: %1$s\n"
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
 #: classes/Command.php:276
 msgid "User has no last notice"
-msgstr ""
+msgstr "L'usuari no té última nota"
 
 #: classes/Command.php:146 classes/Command.php:166
 msgid "Notice marked as fave."
-msgstr ""
+msgstr "Nota marcada com a favorita."
 
 #: classes/Command.php:166 classes/Command.php:189
 #, php-format
 msgid "%1$s (%2$s)"
-msgstr ""
+msgstr "%1$s (%2$s)"
 
 #: classes/Command.php:169 classes/Command.php:192
 #, php-format
 msgid "Fullname: %s"
-msgstr ""
+msgstr "Nom complet: %s"
 
 #: classes/Command.php:172 classes/Command.php:195
 #, php-format
 msgid "Location: %s"
-msgstr ""
+msgstr "Localització: %s"
 
 #: classes/Command.php:175 classes/Command.php:198
 #, php-format
 msgid "Homepage: %s"
-msgstr ""
+msgstr "Pàgina web: %s"
 
 #: classes/Command.php:178 classes/Command.php:201
 #, php-format
 msgid "About: %s"
-msgstr ""
+msgstr "Sobre tu: %s"
 
 #: classes/Command.php:200 classes/Command.php:228
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
-msgstr ""
+msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d"
 
 #: classes/Command.php:214 classes/Command.php:245
 #, php-format
 msgid "Direct message to %s sent"
-msgstr ""
+msgstr "Missatge directe per a %s enviat"
 
 #: classes/Command.php:216 classes/Command.php:247
 msgid "Error sending direct message."
-msgstr ""
+msgstr "Error al enviar el missatge directe."
 
 #: classes/Command.php:263 classes/Command.php:300
 msgid "Specify the name of the user to subscribe to"
-msgstr ""
+msgstr "Especifica el nom de l'usuari a que vols subscriure't"
 
 #: classes/Command.php:270 classes/Command.php:307
 #, php-format
 msgid "Subscribed to %s"
-msgstr ""
+msgstr "Subscrit a %s"
 
 #: classes/Command.php:288 classes/Command.php:328
 msgid "Specify the name of the user to unsubscribe from"
-msgstr ""
+msgstr "Especifica el nom de l'usuari del que vols deixar d'estar subscrit"
 
 #: classes/Command.php:295 classes/Command.php:335
 #, php-format
 msgid "Unsubscribed from %s"
-msgstr ""
+msgstr "Has deixat d'estar subscrit a %s"
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
 #: classes/Command.php:376
 msgid "Command not yet implemented."
-msgstr ""
+msgstr "Comanda encara no implementada."
 
 #: classes/Command.php:313 classes/Command.php:356
 msgid "Notification off."
-msgstr ""
+msgstr "Notificacions off."
 
 #: classes/Command.php:315 classes/Command.php:358
 msgid "Can't turn off notification."
-msgstr ""
+msgstr "No es poden posar en off les notificacions."
 
 #: classes/Command.php:333 classes/Command.php:379
 msgid "Notification on."
-msgstr ""
+msgstr "Notificacions on."
 
 #: classes/Command.php:335 classes/Command.php:381
 msgid "Can't turn on notification."
-msgstr ""
+msgstr "No es poden posar en on les notificacions."
 
 #: classes/Command.php:344 classes/Command.php:392
 msgid "Commands:\n"
-msgstr ""
+msgstr "Comandes:\n"
 
 #: classes/Message.php:53 classes/Message.php:56
 msgid "Could not insert message."
-msgstr ""
+msgstr "No s'ha pogut inserir el missatge."
 
 #: classes/Message.php:63 classes/Message.php:66
 msgid "Could not update message with new URI."
-msgstr ""
+msgstr "No s'ha pogut inserir el missatge amb la nova URI."
 
 #: lib/gallery.php:46
 msgid "User without matching profile in system."
-msgstr ""
+msgstr "L'usuari no té cap perfil que coincideixi en aquest sistema."
 
 #: lib/mail.php:147 lib/mail.php:289
 #, php-format
@@ -3291,11 +3389,13 @@ msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgstr ""
+"Tens una nova direcció per publicar a %1$s.\n"
+"\n"
 
 #: lib/mail.php:249 lib/mail.php:508
 #, php-format
 msgid "New private message from %s"
-msgstr ""
+msgstr "Nou missatge privat de %s"
 
 #: lib/mail.php:253 lib/mail.php:512
 #, php-format
@@ -3303,88 +3403,89 @@ msgid ""
 "%1$s (%2$s) sent you a private message:\n"
 "\n"
 msgstr ""
+"%1$s (%2$s) t'ha enviat un nou missatge privat:\n"
+"\n"
 
 #: lib/mailbox.php:43 lib/mailbox.php:89
 msgid "Only the user can read their own mailboxes."
-msgstr ""
+msgstr "Només l'usuari pot llegir les seves safates de correu."
 
 #: lib/openid.php:195 lib/openid.php:203
 msgid "This form should automatically submit itself. "
-msgstr ""
+msgstr "Aquest formulari s'ha d'enviar automàticament. "
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
 msgid "Favorites"
-msgstr ""
+msgstr "Favorits"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
 #, php-format
 msgid "%s's favorite notices"
-msgstr ""
+msgstr "%s's notes favorites"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
 msgid "User"
-msgstr ""
+msgstr "Usuari"
 
 #: lib/personal.php:75 lib/personalgroupnav.php:123
 msgid "Inbox"
-msgstr ""
+msgstr "Safata d'entrada"
 
 #: lib/personal.php:76 lib/personalgroupnav.php:124
 msgid "Your incoming messages"
-msgstr ""
+msgstr "Els teus missatges rebuts"
 
 #: lib/personal.php:80 lib/personalgroupnav.php:128
 msgid "Outbox"
-msgstr ""
+msgstr "Safata de sortida"
 
 #: lib/personal.php:81 lib/personalgroupnav.php:129
 msgid "Your sent messages"
-msgstr ""
+msgstr "Els teus missatges enviats"
 
 #: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
 msgid "Twitter"
-msgstr ""
+msgstr "Twitter"
 
 #: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
 msgid "Twitter integration options"
-msgstr ""
+msgstr "Opcions d'integració amb Twitter"
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
 msgid "To"
-msgstr ""
+msgstr "A"
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
 msgid "Could not parse message."
-msgstr ""
+msgstr "No es pot analitzar el missatge."
 
 #: actions/all.php:63 actions/facebookhome.php:162
-#, fuzzy, php-format
+#, php-format
 msgid "%s and friends, page %d"
-msgstr "%s i amics"
+msgstr "%s i amics, pàgina %d"
 
 #: actions/avatarsettings.php:76
 msgid "You can upload your personal avatar."
-msgstr ""
+msgstr "Pots pujar el teu avatar personal."
 
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
 #: actions/grouplogo.php:250
-#, fuzzy
 msgid "Avatar settings"
-msgstr "Configuració"
+msgstr "Configuració de l'avatar"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
 msgid "Original"
-msgstr ""
+msgstr "Original"
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
 msgid "Preview"
-msgstr ""
+msgstr "Previsualitzar"
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
 msgid "Crop"
-msgstr ""
+msgstr "Crop"
 
 #: actions/avatarsettings.php:248 actions/deletenotice.php:133
 #: actions/emailsettings.php:224 actions/grouplogo.php:307
@@ -3396,595 +3497,563 @@ msgstr ""
 #: actions/subedit.php:38 actions/twittersettings.php:290
 #: actions/userauthorization.php:39
 msgid "There was a problem with your session token. "
-msgstr ""
+msgstr "Ha ocorregut un error amb la teva sessió. "
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
+"Selecciona un quadrat de l'àrea de la imatge que vols que sigui el teu "
+"avatar."
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
 msgid "Lost our file data."
-msgstr ""
+msgstr "S'ha perdut el nostre fitxer de dades."
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
 #: classes/User_group.php:112
-#, fuzzy
 msgid "Lost our file."
-msgstr "No existeix aquest avís."
+msgstr "Hem perdut el nostre arxiu."
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
 #: classes/User_group.php:129 classes/User_group.php:161
 msgid "Unknown file type"
-msgstr ""
+msgstr "Tipus de fitxer desconegut"
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
 msgid "No profile specified."
-msgstr ""
+msgstr "No s'ha especificat perfil."
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
 #: actions/unblock.php:75
 msgid "No profile with that ID."
-msgstr ""
+msgstr "No hi ha cap perfil amb aquesta ID."
 
 #: actions/block.php:111
-#, fuzzy
 msgid "Block user"
-msgstr "No existeix aquest usuari."
+msgstr "Usuari bloquejat."
 
 #: actions/block.php:129
 msgid "Are you sure you want to block this user? "
-msgstr ""
+msgstr "N'estàs segur/a que vols bloquejar aquest usuari? "
 
 #: actions/block.php:162
-#, fuzzy
 msgid "You have already blocked this user."
-msgstr "Ja t'has connectat!"
+msgstr "Ja havies bloquejat aquest usuari."
 
 #: actions/block.php:167
 msgid "Failed to save block information."
-msgstr ""
+msgstr "Error al guardar la informació del block."
 
 #: actions/confirmaddress.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "The address \"%s\" has been "
-msgstr "L'adreça ha estat eliminada."
+msgstr "L'adreça \"%s\" ha estat eliminada "
 
 #: actions/deletenotice.php:73
 msgid "You are about to permanently delete a notice. "
-msgstr ""
+msgstr "Estàs a punt d'eliminar permanentment una notificació. "
 
 #: actions/disfavor.php:94
 msgid "Add to favorites"
-msgstr ""
+msgstr "Afegir a favorits"
 
 #: actions/editgroup.php:54
 #, php-format
 msgid "Edit %s group"
-msgstr ""
+msgstr "Editar el grup %s"
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
 msgid "Inboxes must be enabled for groups to work"
-msgstr ""
+msgstr "La safata d'entrada ha d'estar habilitat per als grups de treball"
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
 msgid "You must be logged in to create a group."
-msgstr ""
+msgstr "Has d'haver entrat per crear un grup."
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
 #: actions/showgroup.php:121
-#, fuzzy
 msgid "No nickname"
 msgstr "Cap sobrenom."
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
 #: actions/showgroup.php:128
-#, fuzzy
 msgid "No such group"
-msgstr "No existeix aquest avís."
+msgstr "No existeix tal grup"
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
 #: actions/grouplogo.php:107
 msgid "You must be an admin to edit the group"
-msgstr ""
+msgstr "Has de ser admin per editar aquest grup"
 
 #: actions/editgroup.php:157
 msgid "Use this form to edit the group."
-msgstr ""
+msgstr "Utilitza aquest formulari per editar el grup."
 
 #: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
-#, fuzzy
 msgid "Nickname must have only lowercase letters "
 msgstr ""
 "El sobrenom ha de tenir només lletres minúscules i números i no pot tenir "
-"espais."
+"espais. "
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
-#, fuzzy
 msgid "description is too long (max 140 chars)."
-msgstr "La biografia és massa llarga (màx. 140 caràcters)."
+msgstr "la descripció és massa llarga (màx. 140 caràcters)."
 
 #: actions/editgroup.php:218
-#, fuzzy
 msgid "Could not update group."
-msgstr "No s'ha pogut actualitzar l'usuari."
+msgstr "No s'ha pogut actualitzar el grup."
 
 #: actions/editgroup.php:226
-#, fuzzy
 msgid "Options saved."
 msgstr "Configuració guardada."
 
 #: actions/emailsettings.php:107 actions/imsettings.php:108
-#, fuzzy, php-format
+#, php-format
 msgid "Awaiting confirmation on this address. "
-msgstr "Error amb el codi de confirmació."
+msgstr "Esperant el codi de confirmació en aquesta direcció. "
 
 #: actions/emailsettings.php:139 actions/smssettings.php:150
 msgid "Make a new email address for posting to; "
-msgstr ""
+msgstr "Indicar una nova direcció de correu electrònic per publicar; "
 
 #: actions/emailsettings.php:157
 msgid "Send me email when someone "
-msgstr ""
+msgstr "Envia'm un correu electrònic quan algú "
 
 #: actions/emailsettings.php:168
 msgid "Allow friends to nudge me and send me an email."
-msgstr ""
+msgstr "Permetre que els amics em reclamin i m'enviïn un correu electrònic."
 
 #: actions/emailsettings.php:321
-#, fuzzy
 msgid "That email address already belongs "
-msgstr "L'adreça de correu electrònic ja existeix."
+msgstr "L'adreça de correu electrònic ja pertany "
 
 #: actions/emailsettings.php:343
-#, fuzzy
 msgid "A confirmation code was sent to the email address you added. "
 msgstr ""
 "S'ha enviat un codi de confirmació a l'adreça de missatgeria instantània que "
-"has afegit. Has d'acceptar que %s et pugui enviar missatges."
+"has afegit. "
 
 #: actions/facebookhome.php:110
 msgid "Server error - couldn't get user!"
-msgstr ""
+msgstr "Error del servidor - no es pot obtenir l'usuari!"
 
 #: actions/facebookhome.php:196
 #, php-format
 msgid "If you would like the %s app to automatically update "
-msgstr ""
+msgstr "Si vols l'aplicació %s per actualitzar automàticament "
 
 #: actions/facebookhome.php:213 actions/facebooksettings.php:137
 #, php-format
 msgid "Allow %s to update my Facebook status"
-msgstr ""
+msgstr "Permetre %s actualitzar el meu estat a Facebook"
 
 #: actions/facebookhome.php:218
 msgid "Skip"
-msgstr ""
+msgstr "Saltar"
 
 #: actions/facebookhome.php:235
-#, fuzzy
 msgid "No notice content!"
 msgstr "Cap contingut!"
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
 msgid "Pagination"
-msgstr ""
+msgstr "Paginació"
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-#, fuzzy
 msgid "After"
-msgstr "« Següent"
+msgstr "Posteriors"
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
-#, fuzzy
 msgid "Before"
-msgstr "Anterior »"
+msgstr "Anteriors"
 
 #: actions/facebookinvite.php:70
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
-msgstr ""
+msgstr "Gràcies per convidar els teus amics a utilitzar %s"
 
 #: actions/facebookinvite.php:72
 msgid "Invitations have been sent to the following users:"
-msgstr ""
+msgstr "Les invitacions han estat enviades als següents usuaris:"
 
 #: actions/facebookinvite.php:96
 #, php-format
 msgid "You have been invited to %s"
-msgstr ""
+msgstr "Has estat convidat a %s"
 
 #: actions/facebookinvite.php:105
-#, fuzzy, php-format
+#, php-format
 msgid "Invite your friends to use %s"
-msgstr "Feed per a amics de %s"
+msgstr "Convidar els teus amics a utilitzar %s"
 
 #: actions/facebookinvite.php:113
 #, php-format
 msgid "Friends already using %s:"
-msgstr ""
+msgstr "Amics ja utilitzant %s:"
 
 #: actions/facebookinvite.php:130
 #, php-format
 msgid "Send invitations"
-msgstr ""
+msgstr "Enviar invitacions"
 
 #: actions/facebookremove.php:56
-#, fuzzy
 msgid "Couldn't remove Facebook user."
-msgstr "No s'ha pogut actualitzar l'usuari."
+msgstr "No s'ha pogut eliminar l'usuari de Facebook."
 
 #: actions/facebooksettings.php:65
 msgid "There was a problem saving your sync preferences!"
-msgstr ""
+msgstr "Ha ocorregut un problema al guardar les preferències de sincronització!"
 
 #: actions/facebooksettings.php:67
-#, fuzzy
 msgid "Sync preferences saved."
-msgstr "Preferències guardades."
+msgstr "Preferències de sincronització guardades."
 
 #: actions/facebooksettings.php:90
 msgid "Automatically update my Facebook status with my notices."
 msgstr ""
+"Actualitzar automàticament el meu estat a Facebook amb les meves "
+"notificacions."
 
 #: actions/facebooksettings.php:97
 msgid "Send \"@\" replies to Facebook."
-msgstr ""
+msgstr "Envia \"@\" respostes a Facebook."
 
 #: actions/facebooksettings.php:106
-#, fuzzy
 msgid "Prefix"
-msgstr "Perfil"
+msgstr "Prefix"
 
 #: actions/facebooksettings.php:108
 msgid "A string to prefix notices with."
-msgstr ""
+msgstr "La frase que serveixi de prefix a les notes."
 
 #: actions/facebooksettings.php:124
 #, php-format
 msgid "If you would like %s to automatically update "
-msgstr ""
+msgstr "Si vols que %s s'actualitzi automàticament "
 
 #: actions/facebooksettings.php:147
-#, fuzzy
 msgid "Sync preferences"
-msgstr "Preferències"
+msgstr "Preferències de sincronització"
 
 #: actions/favor.php:94 lib/disfavorform.php:140
 msgid "Disfavor favorite"
-msgstr ""
+msgstr "Desfavoritar favorit"
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
 #: lib/publicgroupnav.php:91
-#, fuzzy
 msgid "Popular notices"
-msgstr "No existeix aquest avís."
+msgstr "Notificacions populars"
 
 #: actions/favorited.php:67
-#, fuzzy, php-format
+#, php-format
 msgid "Popular notices, page %d"
-msgstr "No existeix aquest avís."
+msgstr "Notificacions populars, pàgina %d"
 
 #: actions/favorited.php:79
 msgid "The most popular notices on the site right now."
-msgstr ""
+msgstr "Les notificacions més populars en aquest lloc ara mateix."
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
 #: lib/publicgroupnav.php:87
 msgid "Featured users"
-msgstr ""
+msgstr "Usuaris destacats"
 
 #: actions/featured.php:71
 #, php-format
 msgid "Featured users, page %d"
-msgstr ""
+msgstr "Usuaris destacats, pàgina %d"
 
 #: actions/featured.php:99
 #, php-format
 msgid "A selection of some of the great users on %s"
-msgstr ""
+msgstr "Una selecció d'alguns dels millors usuaris a %s"
 
 #: actions/finishremotesubscribe.php:188
 msgid "That user has blocked you from subscribing."
-msgstr ""
+msgstr "Aquest usuari t'ha bloquejat com a subscriptor."
 
 #: actions/groupbyid.php:79
 msgid "No ID"
-msgstr ""
+msgstr "No ID"
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
 msgid "Group logo"
-msgstr ""
+msgstr "Logo del grup"
 
 #: actions/grouplogo.php:149
 msgid "You can upload a logo image for your group."
-msgstr ""
+msgstr "Pots pujar una imatge de logo per al grup."
 
 #: actions/grouplogo.php:448
-#, fuzzy
 msgid "Logo updated."
-msgstr "Avatar actualitzat."
+msgstr "Logo actualitzat."
 
 #: actions/grouplogo.php:450
-#, fuzzy
 msgid "Failed updating logo."
-msgstr "Error en actualitzar avatar."
+msgstr "Error en actualitzar logo."
 
 #: actions/groupmembers.php:93 lib/groupnav.php:91
 #, php-format
 msgid "%s group members"
-msgstr ""
+msgstr "%s membre/s en el grup"
 
 #: actions/groupmembers.php:96
 #, php-format
 msgid "%s group members, page %d"
-msgstr ""
+msgstr "%s membre/s en el grup, pàgina %d"
 
 #: actions/groupmembers.php:111
 msgid "A list of the users in this group."
-msgstr ""
+msgstr "La llista dels usuaris d'aquest grup."
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
 #: lib/subgroupnav.php:96
 msgid "Groups"
-msgstr ""
+msgstr "Grups"
 
 #: actions/groups.php:64
 #, php-format
 msgid "Groups, page %d"
-msgstr ""
+msgstr "Grups, pàgina %d"
 
 #: actions/groups.php:90
 #, php-format
 msgid "%%%%site.name%%%% groups let you find and talk with "
-msgstr ""
+msgstr "%%%%site.name%%%% grups amb qui pots trobar i parlar "
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-#, fuzzy
 msgid "Create a new group"
-msgstr "Crear nou compte"
+msgstr "Crear nou grup"
 
 #: actions/groupsearch.php:57
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
-msgstr ""
-"Troba gent a %%site.name%% per nom, ubicació o interessos. Separa els termes "
-"de cerca amb espais; han de ser majors a 3 caràcters."
+msgstr "Troba grups a %%site.name%% per nom, ubicació o descripció. "
 
 #: actions/groupsearch.php:63
-#, fuzzy
 msgid "Group search"
-msgstr "Cerca de gent"
+msgstr "Cercar grup"
 
 #: actions/imsettings.php:70
 msgid "You can send and receive notices through "
-msgstr ""
+msgstr "Pots enviar i rebre notificacions a través de "
 
 #: actions/imsettings.php:120
 #, php-format
 msgid "Jabber or GTalk address, "
-msgstr ""
+msgstr "Adreça Jabber o GTalk, "
 
 #: actions/imsettings.php:147
-#, fuzzy
 msgid "Send me replies through Jabber/GTalk "
 msgstr "Enviar-me avisos per Jabber/GTalk."
 
 #: actions/imsettings.php:321
-#, fuzzy, php-format
+#, php-format
 msgid "A confirmation code was sent "
-msgstr "Cap codi de confirmació."
+msgstr "Un codi de confirmació ha estat enviat "
 
 #: actions/joingroup.php:65
 msgid "You must be logged in to join a group."
-msgstr ""
+msgstr "Has d'haver entrat per participar en un grup."
 
 #: actions/joingroup.php:95
-#, fuzzy
 msgid "You are already a member of that group"
-msgstr "Ja t'has connectat!"
+msgstr "Ja ets membre d'aquest grup"
 
 #: actions/joingroup.php:128
-#, fuzzy, php-format
+#, php-format
 msgid "Could not join user %s to group %s"
-msgstr "No s'ha pogut redirigir al servidor: %s"
+msgstr "No s'ha pogut afegir l'usuari %s al grup %s"
 
 #: actions/joingroup.php:135
 #, php-format
 msgid "%s joined group %s"
-msgstr ""
+msgstr "%s s'ha pogut afegir al grup %s"
 
 #: actions/leavegroup.php:60
 msgid "Inboxes must be enabled for groups to work."
 msgstr ""
+"Les safates d'entrada han d'estar activades per entrar a formar part dels "
+"grups."
 
 #: actions/leavegroup.php:65
 msgid "You must be logged in to leave a group."
-msgstr ""
+msgstr "Has d'haver entrat per a poder marxar d'un grup."
 
 #: actions/leavegroup.php:88
-#, fuzzy
 msgid "No such group."
-msgstr "No existeix aquest avís."
+msgstr "No s'ha trobat el grup."
 
 #: actions/leavegroup.php:95
-#, fuzzy
 msgid "You are not a member of that group."
-msgstr "No ens vas enviar aquest perfil"
+msgstr "No ets membre d'aquest grup."
 
 #: actions/leavegroup.php:100
 msgid "You may not leave a group while you are its administrator."
-msgstr ""
+msgstr "No pots abandonar aquest grup mentre en sigui l'administrador."
 
 #: actions/leavegroup.php:130
 msgid "Could not find membership record."
-msgstr ""
+msgstr "No s'han trobat registres dels membres."
 
 #: actions/leavegroup.php:138
-#, fuzzy, php-format
+#, php-format
 msgid "Could not remove user %s to group %s"
-msgstr "No s'ha pogut crear el formulari OpenID: %s"
+msgstr "No s'ha pogut eliminar l'usuari %s del grup %s"
 
 #: actions/leavegroup.php:145
 #, php-format
 msgid "%s left group %s"
-msgstr ""
+msgstr "%s ha abandonat el grup %s"
 
 #: actions/login.php:225 lib/facebookaction.php:304
 msgid "Login to site"
-msgstr ""
+msgstr "Accedir al lloc"
 
 #: actions/microsummary.php:69
 msgid "No current status"
-msgstr ""
+msgstr "No té cap estatus ara mateix"
 
 #: actions/newgroup.php:53
 msgid "New group"
-msgstr ""
+msgstr "Nou grup"
 
 #: actions/newgroup.php:115
 msgid "Use this form to create a new group."
-msgstr ""
+msgstr "Utilitza aquest formulari per crear un nou grup."
 
 #: actions/newgroup.php:177
-#, fuzzy
 msgid "Could not create group."
-msgstr "No s'ha pogut guardar la informació de l'avatar"
+msgstr "No s'ha pogut crear el grup."
 
 #: actions/newgroup.php:191
-#, fuzzy
 msgid "Could not set group membership."
-msgstr "No s'ha pogut crear la subscripció."
+msgstr "No s'ha pogut establir la pertinença d'aquest grup."
 
 #: actions/newmessage.php:119 actions/newnotice.php:132
-#, fuzzy
 msgid "That's too long. "
-msgstr "Aquest fitxer és massa gran."
+msgstr "Això és massa llarg. "
 
 #: actions/newmessage.php:134
 msgid "Don't send a message to yourself; "
-msgstr ""
+msgstr "No t'enviïs missatges a tu mateix; "
 
 #: actions/newnotice.php:166
-#, fuzzy
 msgid "Notice posted"
-msgstr "Avisos"
+msgstr "Notificació publicada"
 
 #: actions/newnotice.php:200 classes/Channel.php:163
 msgid "Ajax Error"
-msgstr ""
+msgstr "Ajax Error"
 
 #: actions/nudge.php:85
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
+"Aquest usuari no permet reclamacions o no ha confirmar encara cap correu "
+"electrònic."
 
 #: actions/nudge.php:94
 msgid "Nudge sent"
-msgstr ""
+msgstr "Reclamació enviada"
 
 #: actions/nudge.php:97
 msgid "Nudge sent!"
-msgstr ""
+msgstr "Reclamació enviada!"
 
 #: actions/openidlogin.php:97
-#, fuzzy
 msgid "OpenID login"
 msgstr "Accés OpenID"
 
 #: actions/openidsettings.php:128
-#, fuzzy
 msgid "Removing your only OpenID "
 msgstr "Eliminar OpenID"
 
 #: actions/othersettings.php:60
-#, fuzzy
 msgid "Other Settings"
-msgstr "Configuració"
+msgstr "Altres configuracions"
 
 #: actions/othersettings.php:71
 msgid "Manage various other options."
-msgstr ""
+msgstr "Gestionar altres vàries opcions."
 
 #: actions/othersettings.php:93
 msgid "URL Auto-shortening"
-msgstr ""
+msgstr "Auto-escurçament de la URL"
 
 #: actions/othersettings.php:112
-#, fuzzy
 msgid "Service"
-msgstr "Cercar"
+msgstr "Servei"
 
 #: actions/othersettings.php:113
 msgid "Automatic shortening service to use."
-msgstr ""
+msgstr "Servei d'auto-escurçament a utilitzar."
 
 #: actions/othersettings.php:144
-#, fuzzy
 msgid "URL shortening service is too long (max 50 chars)."
-msgstr "La ubicació és massa llarga (màx. 255 caràcters)."
+msgstr "El servei d'auto-escurçament d'URL és massa llarga (màx. 50 caràcters)."
 
 #: actions/passwordsettings.php:69
-#, fuzzy
 msgid "Change your password."
 msgstr "Canviar contrasenya"
 
 #: actions/passwordsettings.php:89
-#, fuzzy
 msgid "Password change"
-msgstr "Contrasenya guardada."
+msgstr "Contrasenya canviada."
 
 #: actions/peopletag.php:35
-#, fuzzy, php-format
+#, php-format
 msgid "Not a valid people tag: %s"
-msgstr "Adreça de correu electrònic no vàlida."
+msgstr "Etiqueta no vàlida per a la gent: %s"
 
 #: actions/peopletag.php:47
 #, php-format
 msgid "Users self-tagged with %s - page %d"
-msgstr ""
+msgstr "Usuaris que s'han etiquetat %s - pàgina %d"
 
 #: actions/peopletag.php:91
 #, php-format
 msgid "These are users who have tagged themselves \"%s\" "
-msgstr ""
+msgstr "Aquests són usuaris que s'han etiquetat ells mateixos \"%s\" "
 
 #: actions/profilesettings.php:91
-#, fuzzy
 msgid "Profile information"
-msgstr "Perfil desconegut"
+msgstr "Informació del perfil"
 
 #: actions/profilesettings.php:124
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
+"Etiquetes per a tu mateix (lletres, números, -, ., i _), per comes o separat "
+"por espais"
 
 #: actions/profilesettings.php:144
 msgid "Automatically subscribe to whoever "
-msgstr ""
+msgstr "Automàticament subscriure's a tothom "
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid tag: \"%s\""
-msgstr "La pàgina personal '%s' és invàlida"
+msgstr "Etiqueta no vàlida: \"%s\""
 
 #: actions/profilesettings.php:311
-#, fuzzy
 msgid "Couldn't save tags."
-msgstr "No s'ha pogut guardar el perfil."
+msgstr "No s'han pogut guardar les etiquetes."
 
 #: actions/public.php:107
-#, fuzzy, php-format
+#, php-format
 msgid "Public timeline, page %d"
-msgstr "Línia temporal pública"
+msgstr "Línia temporal pública, pàgina %d"
 
 #: actions/public.php:173
 msgid "Could not retrieve public stream."
-msgstr ""
+msgstr "No s'ha pogut recuperar la conversa pública."
 
 #: actions/public.php:220
 #, php-format
@@ -3992,140 +4061,128 @@ msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service "
 msgstr ""
+"Això és %%site.name%%, un servei de "
+"[microblogging](http://ca.wikipedia.org/wiki/Microblogging) "
 
 #: actions/publictagcloud.php:57
-#, fuzzy
 msgid "Public tag cloud"
-msgstr "Feed del flux públic"
+msgstr "Núvol públic d'etiquetes"
 
 #: actions/publictagcloud.php:63
 #, php-format
 msgid "These are most popular recent tags on %s "
-msgstr ""
+msgstr "Aquestes són les etiquetes recents més populars a %s "
 
 #: actions/publictagcloud.php:119
 msgid "Tag cloud"
-msgstr ""
+msgstr "Núvol d'etiquetes"
 
 #: actions/register.php:139 actions/register.php:349
 msgid "Sorry, only invited people can register."
-msgstr ""
+msgstr "Ho senti, però només la gent convidada pot registrar-se."
 
 #: actions/register.php:149
-#, fuzzy
 msgid "You can't register if you don't "
-msgstr "No pots registrar-te si no estàs d'acord amb la llicència."
+msgstr "No pots registrar-te si no "
 
 #: actions/register.php:286
 msgid "With this form you can create "
-msgstr ""
+msgstr "Amb aquest formulari pots crear "
 
 #: actions/register.php:368
-#, fuzzy
 msgid "1-64 lowercase letters or numbers, "
 msgstr ""
-"1-64 lletres en minúscula o números, sense signes de puntuació o espais"
+"1-64 lletres en minúscula o números, sense signes de puntuació o espais, "
 
 #: actions/register.php:382 actions/register.php:386
-#, fuzzy
 msgid "Used only for updates, announcements, "
-msgstr ""
-"Utilitzat només per a actualitzacions, anuncis i recuperació de contrasenyes"
+msgstr "Utilitzat només per a actualitzacions, anuncis, "
 
 #: actions/register.php:398
-#, fuzzy
 msgid "URL of your homepage, blog, "
-msgstr "URL del teu web, blog o perfil en un altre lloc"
+msgstr "URL del teu web, blog o perfil en un altre lloc, "
 
 #: actions/register.php:404
-#, fuzzy
 msgid "Describe yourself and your "
-msgstr "Explica'ns alguna cosa sobre tu i els teus interessos en 140 caràcters"
+msgstr "Explica'ns alguna cosa sobre tu "
 
 #: actions/register.php:410
-#, fuzzy
 msgid "Where you are, like \"City, "
-msgstr "On ets, per exemple \"Ciutat, Estat (o Regió), País\""
+msgstr "On ets, per exemple \"Ciutat, "
 
 #: actions/register.php:432
-#, fuzzy
 msgid " except this private data: password, "
-msgstr ""
-"excepte les següents dades privades: contrasenya, adreça de correu "
-"electrònic, adreça de missatgeria instantània, número de telèfon."
+msgstr " excepte les següents dades privades: contrasenya, "
 
 #: actions/register.php:471
 #, php-format
 msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
-msgstr ""
+msgstr "Felicitats, %s! I benvingut/da a %%%%site.name%%%%. "
 
 #: actions/register.php:495
 msgid "(You should receive a message by email "
-msgstr ""
+msgstr "(Hauries de rebre un missatge per correu electrònic "
 
 #: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
 msgid "That's a local profile! Login to subscribe."
-msgstr ""
+msgstr "Aquest és un perfil local! Entra per subscriure-t'hi."
 
 #: actions/replies.php:118
-#, fuzzy, php-format
+#, php-format
 msgid "Replies to %s, page %d"
-msgstr "Respostes a %s"
+msgstr "Respostes a %s, pàgina %d"
 
 #: actions/showfavorites.php:79
 #, php-format
 msgid "%s favorite notices, page %d"
-msgstr ""
+msgstr "%s notificacions favorites, pàgina %d"
 
 #: actions/showgroup.php:77 lib/groupnav.php:85
 #, php-format
 msgid "%s group"
-msgstr ""
+msgstr "%s grup"
 
 #: actions/showgroup.php:79
 #, php-format
 msgid "%s group, page %d"
-msgstr ""
+msgstr "%s grup, pàgina %d"
 
 #: actions/showgroup.php:206
-#, fuzzy
 msgid "Group profile"
-msgstr "No existeix aquest avís."
+msgstr "Perfil del grup"
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
-#, fuzzy
 msgid "Note"
 msgstr "Avisos"
 
 #: actions/showgroup.php:270
 msgid "Group actions"
-msgstr ""
+msgstr "Accions del grup"
 
 #: actions/showgroup.php:323
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group"
-msgstr "Feed d'avisos de %s"
+msgstr "Feed d'avisos del grup %s"
 
 #: actions/showgroup.php:357 lib/groupnav.php:90
-#, fuzzy
 msgid "Members"
-msgstr "Membre des de"
+msgstr "Membres"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
 #: lib/tagcloudsection.php:71
 msgid "(None)"
-msgstr ""
+msgstr "(Cap)"
 
 #: actions/showgroup.php:370
 msgid "All members"
-msgstr ""
+msgstr "Tots els membres"
 
 #: actions/showgroup.php:378
 #, php-format
@@ -4133,50 +4190,49 @@ msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
+"**%s** és un grup d'usuaris a %%%%site.name%%%%, un servei de "
+"[microblogging](http://ca.wikipedia.org/wiki/Microblogging)"
 
 #: actions/showmessage.php:98
 msgid "Only the sender and recipient "
-msgstr ""
+msgstr "Només el remitent i el destinatari "
 
 #: actions/showstream.php:73
 #, php-format
 msgid "%s, page %d"
-msgstr ""
+msgstr "%s, pàgina %d"
 
 #: actions/showstream.php:143
-#, fuzzy
 msgid "'s profile"
-msgstr "Perfil"
+msgstr "perfil"
 
 #: actions/showstream.php:236 actions/tagother.php:77
-#, fuzzy
 msgid "User profile"
-msgstr "L'usuari no té perfil."
+msgstr "Perfil de l'usuari"
 
 #: actions/showstream.php:240 actions/tagother.php:81
 msgid "Photo"
-msgstr ""
+msgstr "Foto"
 
 #: actions/showstream.php:317
 msgid "User actions"
-msgstr ""
+msgstr "Accions de l'usuari"
 
 #: actions/showstream.php:342
 msgid "Send a direct message to this user"
-msgstr ""
+msgstr "Enviar un missatge directe a aquest usuari"
 
 #: actions/showstream.php:343
 msgid "Message"
-msgstr ""
+msgstr "Missatge"
 
 #: actions/showstream.php:451
-#, fuzzy
 msgid "All subscribers"
-msgstr "Subscriptors"
+msgstr "Tots els subscriptors"
 
 #: actions/showstream.php:533
 msgid "All groups"
-msgstr ""
+msgstr "Tots els grups"
 
 #: actions/showstream.php:542
 #, php-format
@@ -4184,481 +4240,448 @@ msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
+"**%s** té un compte a %%%%site.name%%%%, un servei de "
+"[microblogging](http://ca.wikipedia.org/wiki/Microblogging) "
 
 #: actions/smssettings.php:128
-#, fuzzy
 msgid "Phone number, no punctuation or spaces, "
-msgstr ""
-"1-64 lletres en minúscula o números, sense signes de puntuació o espais"
+msgstr "Número de telèfon, sense puntuacions ni espais, "
 
 #: actions/smssettings.php:162
-#, fuzzy
 msgid "Send me notices through SMS; "
-msgstr "Enviar-me avisos per Jabber/GTalk."
+msgstr "Enviar-me avisos per SMS; "
 
 #: actions/smssettings.php:335
-#, fuzzy
 msgid "A confirmation code was sent to the phone number you added. "
-msgstr "Aquest codi de confirmació no és per a tu!"
+msgstr ""
+"El codi de confirmació s'ha enviat al número de telèfon que tens afegit. "
 
 #: actions/smssettings.php:453
 msgid "Mobile carrier"
-msgstr ""
+msgstr "Transport mòbil"
 
 #: actions/subedit.php:70
-#, fuzzy
 msgid "You are not subscribed to that profile."
-msgstr "No ens vas enviar aquest perfil"
+msgstr "No estàs subscrit a aquest perfil."
 
 #: actions/subedit.php:83
-#, fuzzy
 msgid "Could not save subscription."
-msgstr "No s'ha pogut crear la subscripció."
+msgstr "No s'ha pogut guardar la subscripció."
 
 #: actions/subscribe.php:55
-#, fuzzy
 msgid "Not a local user."
 msgstr "No existeix aquest usuari."
 
 #: actions/subscribe.php:69
-#, fuzzy
 msgid "Subscribed"
-msgstr "Subscriure's"
+msgstr "Subscrit"
 
 #: actions/subscribers.php:50
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscribers"
-msgstr "Subscriptors"
+msgstr "%s subscriptors"
 
 #: actions/subscribers.php:52
 #, php-format
 msgid "%s subscribers, page %d"
-msgstr ""
+msgstr "%s subscriptors, pàgina %d"
 
 #: actions/subscribers.php:63
-#, fuzzy
 msgid "These are the people who listen to "
-msgstr "Aquestes són les persones que escolten els avisos de %s."
+msgstr "Aquestes són les persones que escolten "
 
 #: actions/subscribers.php:67
-#, fuzzy, php-format
+#, php-format
 msgid "These are the people who "
-msgstr "Aquestes són les persones que escolten els avisos de %s."
+msgstr "Aquestes són les persones que "
 
 #: actions/subscriptions.php:52
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscriptions"
-msgstr "Totes les subscripcions"
+msgstr "%s subscripcions"
 
 #: actions/subscriptions.php:54
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscriptions, page %d"
-msgstr "Totes les subscripcions"
+msgstr "%s subscripcions, pàgina %d"
 
 #: actions/subscriptions.php:65
-#, fuzzy
 msgid "These are the people whose notices "
-msgstr "Aquestes són les persones que %s escolta."
+msgstr "Aquestes són les persones les notícies dels quals "
 
 #: actions/subscriptions.php:69
-#, fuzzy, php-format
+#, php-format
 msgid "These are the people whose "
-msgstr "Aquestes són les persones que escolten els avisos de %s."
+msgstr "Aquestes són les persones les quals"
 
 #: actions/subscriptions.php:122
-#, fuzzy
 msgid "Jabber"
-msgstr "Cap Jabber ID."
+msgstr "Jabber"
 
 #: actions/tag.php:43
-#, fuzzy, php-format
+#, php-format
 msgid "Notices tagged with %s, page %d"
-msgstr "Microblog de %s"
+msgstr "Notificació etiquetada amb %s, pàgina %d"
 
 #: actions/tag.php:66
 #, php-format
 msgid "Messages tagged \"%s\", most recent first"
-msgstr ""
+msgstr "Missatges etiquetats \"%s\", més recents primer"
 
 #: actions/tagother.php:33
-#, fuzzy
 msgid "Not logged in"
 msgstr "No connectat."
 
 #: actions/tagother.php:39
-#, fuzzy
 msgid "No id argument."
-msgstr "No existeix aquest document."
+msgstr "No argument de la id."
 
 #: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
-msgstr ""
+msgstr "Etiqueta %s"
 
 #: actions/tagother.php:141
 msgid "Tag user"
-msgstr ""
+msgstr "Etiqueta usuari"
 
 #: actions/tagother.php:149
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 msgstr ""
+"Etiquetes per aquest usuari (lletres, números,, -, ., i _), comes o separat "
+"per espais"
 
 #: actions/tagother.php:164
 msgid "There was a problem with your session token."
-msgstr ""
+msgstr "Ha ocorregut algun problema amb la teva sessió."
 
 #: actions/tagother.php:191
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
+"Només pots etiquetar gent a la que estiguis subscrit o que s'hagin subscrit "
+"a tu."
 
 #: actions/tagother.php:198
-#, fuzzy
 msgid "Could not save tags."
-msgstr "No s'ha pogut guardar la informació de l'avatar"
+msgstr "No s'han pogut guardar les etiquetes."
 
 #: actions/tagother.php:233
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
+"Utilitza aquest formulari per afegir etiquetes als teus subscriptors i "
+"subscripcions."
 
 #: actions/tagrss.php:35
-#, fuzzy
 msgid "No such tag."
-msgstr "No existeix aquest avís."
+msgstr "No existeix aquesta etiqueta."
 
 #: actions/tagrss.php:66
-#, fuzzy, php-format
+#, php-format
 msgid "Microblog tagged with %s"
-msgstr "Microblog de %s"
+msgstr "Microblog etiquetat com %s"
 
 #: actions/twitapiblocks.php:47
 msgid "Block user failed."
-msgstr ""
+msgstr "Ha fallat el bloqueig d'usuari."
 
 #: actions/twitapiblocks.php:69
 msgid "Unblock user failed."
-msgstr ""
+msgstr "Ha fallat el desbloqueig d'usuari."
 
 #: actions/twitapiusers.php:48
-#, fuzzy
 msgid "Not found."
-msgstr "Cap petició trobada!"
+msgstr "No s'ha trobat."
 
 #: actions/twittersettings.php:71
 msgid "Add your Twitter account to automatically send "
-msgstr ""
+msgstr "Afegeix el teu compte Twitter per automàticament enviar "
 
 #: actions/twittersettings.php:119
 msgid "Twitter user name"
-msgstr ""
+msgstr "Usuari Twitter"
 
 #: actions/twittersettings.php:126
-#, fuzzy
 msgid "Twitter password"
-msgstr "Nova contrasenya"
+msgstr "Contrasenya Twitter"
 
 #: actions/twittersettings.php:228
 msgid "Twitter Friends"
-msgstr ""
+msgstr "Amics Twitter"
 
 #: actions/twittersettings.php:327
 msgid "Username must have only numbers, "
-msgstr ""
+msgstr "Nom d'usuari sols pot contenir números, "
 
 #: actions/twittersettings.php:341
-#, fuzzy, php-format
+#, php-format
 msgid "Unable to retrieve account information "
-msgstr "No s'ha pogut eliminar la confirmació de correu electrònic."
+msgstr "No s'ha pogut obtenir informació del compte "
 
 #: actions/unblock.php:108
-#, fuzzy
 msgid "Error removing the block."
-msgstr "Error en guardar l'usuari."
+msgstr "Error al moure el block."
 
 #: actions/unsubscribe.php:50
-#, fuzzy
 msgid "No profile id in request."
-msgstr "Cap URL de perfil retornar pel servidor."
+msgstr "No id en el perfil sol·licitat."
 
 #: actions/unsubscribe.php:57
-#, fuzzy
 msgid "No profile with that id."
-msgstr "Perfil remot sense perfil corresponent"
+msgstr "No hi ha cap perfil amb aquesta id."
 
 #: actions/unsubscribe.php:71
-#, fuzzy
 msgid "Unsubscribed"
-msgstr "Cancel·lar subscripció"
+msgstr "No subscrit"
 
 #: actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
-msgstr ""
+msgstr "%s grups"
 
 #: actions/usergroups.php:65
 #, php-format
 msgid "%s groups, page %d"
-msgstr ""
+msgstr "%s grups, pàgina %d"
 
 #: classes/Notice.php:104
-#, fuzzy
 msgid "Problem saving notice. Unknown user."
-msgstr "Problema en guardar l'avís."
+msgstr "Problema al guardar la notificació. Usuari desconegut."
 
 #: classes/Notice.php:109
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
+"Masses notificacions massa ràpid; pren un respir i publica de nou en uns "
+"minuts."
 
 #: classes/Notice.php:116
 msgid "You are banned from posting notices on this site."
-msgstr ""
+msgstr "Ha estat bandejat de publicar notificacions en aquest lloc."
 
 #: lib/accountsettingsaction.php:108
-#, fuzzy
 msgid "Upload an avatar"
-msgstr "Error en actualitzar avatar."
+msgstr "Pujar un avatar"
 
 #: lib/accountsettingsaction.php:119
 msgid "Other"
-msgstr ""
+msgstr "Altres"
 
 #: lib/accountsettingsaction.php:120
 msgid "Other options"
-msgstr ""
+msgstr "Altres opcions"
 
 #: lib/action.php:130
 #, php-format
 msgid "%s - %s"
-msgstr ""
+msgstr "%s - %s"
 
 #: lib/action.php:145
 msgid "Untitled page"
-msgstr ""
+msgstr "Pàgina sense titol"
 
 #: lib/action.php:316
 msgid "Primary site navigation"
-msgstr ""
+msgstr "Navegació primària del lloc"
 
 #: lib/action.php:322
 msgid "Personal profile and friends timeline"
-msgstr ""
+msgstr "Perfil personal i línia temporal dels amics"
 
 #: lib/action.php:325
 msgid "Search for people or text"
-msgstr ""
+msgstr "Cercar gent o text"
 
 #: lib/action.php:328
-#, fuzzy
 msgid "Account"
-msgstr "Sobre"
+msgstr "Compte"
 
 #: lib/action.php:328
 msgid "Change your email, avatar, password, profile"
-msgstr ""
+msgstr "Canviar correu electrònic, avatar, contrasenya, perfil"
 
 #: lib/action.php:330
 msgid "Connect to IM, SMS, Twitter"
-msgstr ""
+msgstr "Connectar a missatgeria instantània, SMS, Twitter"
 
 #: lib/action.php:332
 msgid "Logout from the site"
-msgstr ""
+msgstr "Sortir d'aquest lloc"
 
 #: lib/action.php:335
 msgid "Login to the site"
-msgstr ""
+msgstr "Accedir a aquest lloc"
 
 #: lib/action.php:338
-#, fuzzy
 msgid "Create an account"
 msgstr "Crear nou compte"
 
 #: lib/action.php:341
-#, fuzzy
 msgid "Login with OpenID"
-msgstr "No existeix aquest compte OpenID."
+msgstr "Accedir amb OpenID"
 
 #: lib/action.php:344
-#, fuzzy
 msgid "Help me!"
-msgstr "Ajuda"
+msgstr "Ajuda'm"
 
 #: lib/action.php:362
-#, fuzzy
 msgid "Site notice"
-msgstr "Nou avís"
+msgstr "Avís del lloc"
 
 #: lib/action.php:417
 msgid "Local views"
-msgstr ""
+msgstr "Vistes locals"
 
 #: lib/action.php:472
-#, fuzzy
 msgid "Page notice"
-msgstr "Nou avís"
+msgstr "Notificació pàgina"
 
 #: lib/action.php:562
-#, fuzzy
 msgid "Secondary site navigation"
-msgstr "Subscripcions"
+msgstr "Navegació del lloc secundària"
 
 #: lib/action.php:602 lib/action.php:623
 msgid "Laconica software license"
-msgstr ""
+msgstr "Llicència del programari Laconica"
 
 #: lib/action.php:630
 msgid "All "
-msgstr ""
+msgstr "Tot "
 
 #: lib/action.php:635
 msgid "license."
-msgstr ""
+msgstr "llicència."
 
 #: lib/blockform.php:123 lib/blockform.php:153
-#, fuzzy
 msgid "Block this user"
-msgstr "No existeix aquest usuari."
+msgstr "Bloquejar aquest usuari"
 
 #: lib/blockform.php:153
 msgid "Block"
-msgstr ""
+msgstr "Bloquejar"
 
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
 msgid "Disfavor this notice"
-msgstr ""
+msgstr "Deixar de tenir favorita aquesta notificació"
 
 #: lib/facebookaction.php:268
 #, php-format
 msgid "To use the %s Facebook Application you need to login "
-msgstr ""
+msgstr "Per utilitzar la Aplicació de Facebook %s necessites haver accedit "
 
 #: lib/facebookaction.php:271
-#, fuzzy
 msgid " a new account."
-msgstr "Crear nou compte"
+msgstr " un nou compte."
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-#, fuzzy
 msgid "Published"
-msgstr "Públic"
+msgstr "Publicat"
 
 #: lib/favorform.php:114 lib/favorform.php:140
-#, fuzzy
 msgid "Favor this notice"
-msgstr "No existeix aquest avís."
+msgstr "Fer favorita aquesta notificació"
 
 #: lib/feedlist.php:64
 msgid "Export data"
-msgstr ""
+msgstr "Exportar data"
 
 #: lib/galleryaction.php:121
 msgid "Filter tags"
-msgstr ""
+msgstr "Filtre d'etiquetes"
 
 #: lib/galleryaction.php:131
 msgid "All"
-msgstr ""
+msgstr "Tot"
 
 #: lib/galleryaction.php:137
 msgid "Tag"
-msgstr ""
+msgstr "Etiqueta"
 
 #: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
-msgstr ""
+msgstr "Elegeix una etiqueta para reduir la llista"
 
 #: lib/galleryaction.php:139
 msgid "Go"
-msgstr ""
+msgstr "Anar"
 
 #: lib/groupeditform.php:148
-#, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
-msgstr "URL del teu web, blog o perfil en un altre lloc"
+msgstr "URL del teu web, blog del grup u tema"
 
 #: lib/groupeditform.php:151
-#, fuzzy
 msgid "Description"
-msgstr "Subscripcions"
+msgstr "Descripció"
 
 #: lib/groupeditform.php:153
-#, fuzzy
 msgid "Describe the group or topic in 140 chars"
-msgstr "Explica'ns alguna cosa sobre tu i els teus interessos en 140 caràcters"
+msgstr "Descriu el grup amb 140 caràcters"
 
 #: lib/groupeditform.php:158
-#, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr "On ets, per exemple \"Ciutat, Estat (o Regió), País\""
+msgstr "Localització del grup, si n'hi ha, com \"Ciutat, Estat (o Regió), País\""
 
 #: lib/groupnav.php:84 lib/searchgroupnav.php:84
 msgid "Group"
-msgstr ""
+msgstr "Grup"
 
 #: lib/groupnav.php:100
 msgid "Admin"
-msgstr ""
+msgstr "Admin"
 
 #: lib/groupnav.php:101
 #, php-format
 msgid "Edit %s group properties"
-msgstr ""
+msgstr "Editar propietats del grup %s"
 
 #: lib/groupnav.php:106
-#, fuzzy
 msgid "Logo"
-msgstr "Sortir"
+msgstr "Logo"
 
 #: lib/groupnav.php:107
 #, php-format
 msgid "Add or edit %s logo"
-msgstr ""
+msgstr "Afegir o editar logo %s"
 
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
-msgstr ""
+msgstr "Grups amb més membres"
 
 #: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
-msgstr ""
+msgstr "Grups amb més entrades"
 
 #: lib/grouptagcloudsection.php:56
 #, php-format
 msgid "Tags in %s group's notices"
-msgstr ""
+msgstr "Etiquetes en les notificacions del grup %s"
 
 #: lib/htmloutputter.php:104
-#, fuzzy
 msgid "This page is not available in a "
-msgstr "Aquesta pàgina no està disponible en un tipus de mèdia que acceptis."
+msgstr "Aquesta pàgina no està disponible en "
 
 #: lib/joinform.php:114
-#, fuzzy
 msgid "Join"
 msgstr "Inici de sessió"
 
 #: lib/leaveform.php:114
-#, fuzzy
 msgid "Leave"
-msgstr "Guardar"
+msgstr "Abandonar"
 
 #: lib/logingroupnav.php:76
-#, fuzzy
 msgid "Login with a username and password"
-msgstr "Nom d'usuari o contrasenya invàlids."
+msgstr "Accedir amb el nom d'usuari i contrasenya"
 
 #: lib/logingroupnav.php:79
-#, fuzzy
 msgid "Sign up for a new account"
 msgstr "Crear nou compte"
 
 #: lib/logingroupnav.php:82
 msgid "Login or register with OpenID"
-msgstr ""
+msgstr "Accedir o registrar-se amb OpenID"
 
 #: lib/mail.php:175
 #, php-format
@@ -4666,21 +4689,23 @@ msgid ""
 "Hey, %s.\n"
 "\n"
 msgstr ""
+"Ei, %s.\n"
+"\n"
 
 #: lib/mail.php:236
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s is now listening to "
-msgstr "%1$s ara està escoltant els teus avisos a %2$s."
+msgstr "%1$s ara està escoltant "
 
 #: lib/mail.php:254
-#, fuzzy, php-format
+#, php-format
 msgid "Location: %s\n"
-msgstr "Ubicació"
+msgstr "Ubicació: %s\n"
 
 #: lib/mail.php:256
-#, fuzzy, php-format
+#, php-format
 msgid "Homepage: %s\n"
-msgstr "Pàgina personal"
+msgstr "Pàgina personal: %s\n"
 
 #: lib/mail.php:258
 #, php-format
@@ -4688,82 +4713,80 @@ msgid ""
 "Bio: %s\n"
 "\n"
 msgstr ""
+"Biografia: %s\n"
+"\n"
 
 #: lib/mail.php:461
 #, php-format
 msgid "You've been nudged by %s"
-msgstr ""
+msgstr "Has estat reclamat per %s"
 
 #: lib/mail.php:465
 #, php-format
 msgid "%1$s (%2$s) is wondering what you are up to "
-msgstr ""
+msgstr "%1$s (%2$s) vol saber què estàs fent "
 
 #: lib/mail.php:555
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s just added your notice from %2$s"
-msgstr "%1$s ara està escoltant els teus avisos a %2$s."
+msgstr "%1$s ha afegit la teva notificació des de %2$s."
 
 #: lib/mailbox.php:229 lib/noticelist.php:380
 msgid "From"
-msgstr ""
+msgstr "Des de"
 
 #: lib/messageform.php:110
 msgid "Send a direct notice"
-msgstr ""
+msgstr "Enviar notificació directa"
 
 #: lib/noticeform.php:125
-#, fuzzy
 msgid "Send a notice"
-msgstr "Nou avís"
+msgstr "Enviar notificació"
 
 #: lib/noticeform.php:152
-#, fuzzy
 msgid "Available characters"
-msgstr "6 o més caràcters"
+msgstr "Caràcters disponibles"
 
 #: lib/noticelist.php:426
-#, fuzzy
 msgid "in reply to"
-msgstr "en resposta a..."
+msgstr "en resposta a"
 
 #: lib/noticelist.php:447 lib/noticelist.php:450
 msgid "Reply to this notice"
-msgstr ""
+msgstr "respondre a aquesta nota"
 
 #: lib/noticelist.php:451
-#, fuzzy
 msgid "Reply"
-msgstr "resposta"
+msgstr "Respondre"
 
 #: lib/noticelist.php:471 lib/noticelist.php:474
 msgid "Delete this notice"
-msgstr ""
+msgstr "Eliminar aquesta nota"
 
 #: lib/noticelist.php:474
 msgid "Delete"
-msgstr ""
+msgstr "Eliminar"
 
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
-msgstr ""
+msgstr "Reclamar aquest usuari"
 
 #: lib/nudgeform.php:128
 msgid "Nudge"
-msgstr ""
+msgstr "Reclamar"
 
 #: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
-msgstr ""
+msgstr "Enviar una reclamació a aquest usuari"
 
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
-msgstr ""
+msgstr "Etiquetes en les notificacions de %s's"
 
 #: lib/profilelist.php:182
 msgid "(none)"
-msgstr ""
+msgstr "(cap)"
 
 #: lib/publicgroupnav.php:76
 msgid "Public"
@@ -4771,84 +4794,79 @@ msgstr "Públic"
 
 #: lib/publicgroupnav.php:80
 msgid "User groups"
-msgstr ""
+msgstr "Grups d'usuaris"
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
 msgid "Recent tags"
-msgstr ""
+msgstr "Etiquetes recents"
 
 #: lib/publicgroupnav.php:86
 msgid "Featured"
-msgstr ""
+msgstr "Destacat"
 
 #: lib/publicgroupnav.php:90
-#, fuzzy
 msgid "Popular"
-msgstr "Cerca de gent"
+msgstr "Popular"
 
 #: lib/searchgroupnav.php:82
-#, fuzzy
 msgid "Notice"
 msgstr "Avisos"
 
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
-msgstr ""
+msgstr "Trobar un grup en aquest lloc"
 
 #: lib/section.php:89
 msgid "Untitled section"
-msgstr ""
+msgstr "Secció sense títol"
 
 #: lib/subgroupnav.php:81
-#, fuzzy, php-format
+#, php-format
 msgid "People %s subscribes to"
-msgstr "Subscripció remota"
+msgstr "Persones %s subscrites a"
 
 #: lib/subgroupnav.php:89
-#, fuzzy, php-format
+#, php-format
 msgid "People subscribed to %s"
-msgstr "Subscripció remota"
+msgstr "Persones subscrites a %s"
 
 #: lib/subgroupnav.php:97
 #, php-format
 msgid "Groups %s is a member of"
-msgstr ""
+msgstr "%s grups són membres de"
 
 #: lib/subgroupnav.php:104
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
+msgstr "Convidar amics i companys perquè participin a %s"
 
 #: lib/subs.php:53
-#, fuzzy
 msgid "User has blocked you."
-msgstr "L'usuari no té perfil."
+msgstr "Un usuari t'ha bloquejat."
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
-#, fuzzy
 msgid "Subscribe to this user"
-msgstr "Subscripció autoritzada"
+msgstr "Subscriure's a aquest usuari"
 
 #: lib/tagcloudsection.php:56
 msgid "None"
-msgstr ""
+msgstr "Cap"
 
 #: lib/topposterssection.php:74
 msgid "Top posters"
-msgstr ""
+msgstr "Que més publiquen"
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
-#, fuzzy
 msgid "Unblock this user"
-msgstr "No existeix aquest usuari."
+msgstr "Desbloquejar aquest usuari"
 
 #: lib/unblockform.php:150
 msgid "Unblock"
-msgstr ""
+msgstr "Desbloquejar"
 
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
-msgstr ""
+msgstr "Deixar d'estar subscrit des d'aquest usuari"
 
 #, fuzzy
 #~ msgid "Delete my account"
diff --git a/locale/cs_CZ/LC_MESSAGES/laconica.mo b/locale/cs_CZ/LC_MESSAGES/laconica.mo
index 0c6b4a3fa..790f5eb26 100644
--- a/locale/cs_CZ/LC_MESSAGES/laconica.mo
+++ b/locale/cs_CZ/LC_MESSAGES/laconica.mo
diff --git a/locale/cs_CZ/LC_MESSAGES/laconica.po b/locale/cs_CZ/LC_MESSAGES/laconica.po
index a6f5d4f89..9fce8edcd 100644
--- a/locale/cs_CZ/LC_MESSAGES/laconica.po
+++ b/locale/cs_CZ/LC_MESSAGES/laconica.po
@@ -3,29 +3,25 @@
 # 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: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2009-07-07 22:07+0000\n"
+"Last-Translator: Tomas Kral <tomas.kral@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"X-Generator: Pootle 1.1.0\n"
 
+# jak přeložit stream?
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
 #: actions/noticesearchrss.php:88
 #, fuzzy, php-format
 msgid " Search Stream for \"%s\""
-msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Hledej ve Streamu \"%s\"\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+msgstr " Hledej \"%s\" ve Streamu"
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
@@ -33,12 +29,13 @@ msgstr ""
 msgid ""
 " except this private data: password, email address, IM address, phone number."
 msgstr ""
-"až na tyto privátní data: heslo, emailová adresa, IM adresa, telefonní číslo."
+" až na tyto privátní data: heslo, emailová adresa, IM adresa, telefonní "
+"číslo."
 
 #: ../actions/showstream.php:400 ../lib/stream.php:109
 #: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
 msgid " from "
-msgstr ""
+msgstr " od "
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
 #: actions/twitapistatuses.php:347
@@ -861,20 +858,14 @@ msgstr "Nahrávání obrázku selhalo."
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
 #, fuzzy, php-format
 msgid "Feed for friends of %s"
-msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Feed přítel uživatele: %s\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+msgstr "Feed přítel uživatele: %s"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
 #: actions/repliesrss.php:71
 #, fuzzy, php-format
 msgid "Feed for replies to %s"
-msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Feed odpovědí na %s\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+msgstr "Feed odpovědí na %s"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
 #, php-format
@@ -1581,10 +1572,7 @@ msgstr ""
 #: actions/showstream.php:192
 #, fuzzy, php-format
 msgid "Notice feed for %s"
-msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Feed sdělení pro %s\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+msgstr "Feed sdělení pro %s"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
 #: actions/shownotice.php:94
@@ -1808,10 +1796,7 @@ msgstr "Neznámý profil"
 #: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
 #, fuzzy
 msgid "Public Stream Feed"
-msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Veřejný Stream Feed\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+msgstr "Veřejný Stream Feed"
 
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
 #: lib/publicgroupnav.php:77
@@ -1985,10 +1970,7 @@ msgstr "Hledat"
 #: actions/noticesearch.php:127
 #, fuzzy
 msgid "Search Stream Feed"
-msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Hledat ve Stream Feed\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+msgstr "Hledat ve Stream Feed"
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
 #: actions/noticesearch.php:57
@@ -3602,10 +3584,7 @@ msgstr ""
 #: actions/facebookinvite.php:105
 #, fuzzy, php-format
 msgid "Invite your friends to use %s"
-msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Feed přítel uživatele: %s\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+msgstr "Feed přítel uživatele: %s"
 
 #: actions/facebookinvite.php:113
 #, php-format
@@ -4001,10 +3980,7 @@ msgstr ""
 #: actions/publictagcloud.php:57
 #, fuzzy
 msgid "Public tag cloud"
-msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Veřejný Stream Feed\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+msgstr "Veřejný Stream Feed"
 
 #: actions/publictagcloud.php:63
 #, php-format
@@ -4115,10 +4091,7 @@ msgstr ""
 #: actions/showgroup.php:323
 #, fuzzy, php-format
 msgid "Notice feed for %s group"
-msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Feed sdělení pro %s\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+msgstr "Feed sdělení pro %s"
 
 #: actions/showgroup.php:357 lib/groupnav.php:90
 #, fuzzy
@@ -4682,12 +4655,12 @@ msgstr "%1 od teď naslouchá tvým sdělením v %2"
 #: lib/mail.php:254
 #, fuzzy, php-format
 msgid "Location: %s\n"
-msgstr "Umístění"
+msgstr "Umístění %s\n"
 
 #: lib/mail.php:256
 #, fuzzy, php-format
 msgid "Homepage: %s\n"
-msgstr "Moje stránky"
+msgstr "Moje stránky: %s\n"
 
 #: lib/mail.php:258
 #, php-format
diff --git a/locale/de_DE/LC_MESSAGES/laconica.mo b/locale/de_DE/LC_MESSAGES/laconica.mo
index 2084eb579..684fa131c 100644
--- a/locale/de_DE/LC_MESSAGES/laconica.mo
+++ b/locale/de_DE/LC_MESSAGES/laconica.mo
diff --git a/locale/de_DE/LC_MESSAGES/laconica.po b/locale/de_DE/LC_MESSAGES/laconica.po
index dffce3775..5e1f346af 100644
--- a/locale/de_DE/LC_MESSAGES/laconica.po
+++ b/locale/de_DE/LC_MESSAGES/laconica.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-03-12 16:13+0000\n"
-"Last-Translator: Evan Prodromou <evan@controlyourself.ca>\n"
+"PO-Revision-Date: 2009-04-28 00:01+0000\n"
+"Last-Translator: Dawid Jan <dawidjan@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -440,7 +440,7 @@ msgstr "Warte auf die Bestätigung dieser Telefonnummer."
 
 #: ../lib/util.php:1318 lib/util.php:1452
 msgid "Before »"
-msgstr "Ältere »"
+msgstr "Ältere"
 
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
@@ -819,7 +819,7 @@ msgstr "Gib einen Spitznamen oder eine E-Mail Adresse ein."
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
 #: actions/smssettings.php:119
 msgid "Enter the code you received on your phone."
-msgstr "Gib den Code ein, den du auf deinem Handy via SMS bekommen hast"
+msgstr "Gib den Code ein, den du auf deinem Handy via SMS bekommen hast."
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 #: actions/userauthorization.php:161
@@ -909,7 +909,7 @@ msgstr "FAQ"
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397
 msgid "Failed updating avatar."
-msgstr "Aktualisierung des Avatars fehlgeschlagen"
+msgstr "Aktualisierung des Avatars fehlgeschlagen."
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
@@ -945,7 +945,7 @@ msgid ""
 "changing your settings."
 msgstr ""
 "Bitte geben Sie aus Sicherheitsgründen ihren Benutzernamen und ihr Passwort "
-"ein, bevor die Änderungen an ihren Einstellungen vorgenommen werden."
+"ein, bevor die Änderungen an ihren Einstellungen übernommen werden."
 
 #: ../actions/profilesettings.php:44 ../actions/register.php:164
 #: actions/profilesettings.php:77 actions/register.php:178
@@ -962,7 +962,7 @@ msgstr "Vollständiger Name"
 #: actions/profilesettings.php:202 actions/register.php:171
 #: actions/updateprofile.php:97
 msgid "Full name is too long (max 255 chars)."
-msgstr "Ihr vollständiger Name ist zu lang (maximal 255 Zeichen)"
+msgstr "Ihr vollständiger Name ist zu lang (maximal 255 Zeichen)."
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
 msgid "Help"
@@ -985,7 +985,8 @@ msgstr "Homepage"
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
 msgid "Homepage is not a valid URL."
-msgstr "Homepage ist kein gültiger URL."
+msgstr ""
+"Homepage ist kein gültiger URL. URL´s müssen ein Präfix wie http enthalten."
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
 #: actions/emailsettings.php:173
@@ -2697,6 +2698,7 @@ msgstr "Dieses Profil hast du uns nicht geschickt"
 
 #: ../lib/mail.php:147
 #, php-format
+#, fuzzy
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
@@ -2707,24 +2709,39 @@ msgid ""
 "Faithfully yours,\n"
 "%4$s"
 msgstr ""
+"Du hast eine neue Adresse zum Hinzufügen von Nachrichten auf %1$s.\n"
+"\n"
+"Schicke eine E-mail an %2$s um eine neue Nachricht hinzuzufügen.\n"
+"\n"
+"Weitere E-Mailanweisungen unter %3$s.\n"
+"\n"
+"Viele Grüße,\n"
+"%4$s"
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
 #: actions/twitapistatuses.php:463
+#, fuzzy
 msgid "You may not delete another user's status."
-msgstr ""
+msgstr "Du kannst den Status eines anderen Benutzers nicht löschen."
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
 #, php-format
+#, fuzzy
 msgid "You must be logged in to invite other users to use %s"
-msgstr ""
+msgstr "Du musst angemeldet sein, um andere Benutzer zu %s einzuladen"
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#, fuzzy
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
 msgstr ""
+"Du wirst benachrichtigt, wenn deine Einladungen angenommen wurden und sich "
+"die Empfänger auf der Seite registriert haben. Danke, dass du uns hilfst zu "
+"wachsen!"
 
 #: ../actions/recoverpassword.php:149
+#, fuzzy
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Du wurdest indentifiziert. Bitte trage unten ein neues Passwort ein."
 
@@ -2793,13 +2810,14 @@ msgstr "vor einer Stunde"
 #: ../actions/showstream.php:423 ../lib/stream.php:132
 #: actions/showstream.php:441 lib/stream.php:99
 msgid "delete"
-msgstr ""
+msgstr "löschen"
 
 #: ../actions/noticesearch.php:130 ../actions/showstream.php:408
 #: ../lib/stream.php:117 actions/noticesearch.php:136
 #: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
+#, fuzzy
 msgid "in reply to..."
-msgstr "als Antwort auf... "
+msgstr "als Antwort auf..."
 
 #: ../actions/noticesearch.php:137 ../actions/showstream.php:415
 #: ../lib/stream.php:124 actions/noticesearch.php:143
@@ -2809,18 +2827,18 @@ msgstr "antworten"
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
 #: actions/passwordsettings.php:106
+#, fuzzy
 msgid "same as password above"
-msgstr "Gleiches Passwort wie zuvor"
+msgstr "Gleiches Passwort wie oben"
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
 #: actions/twitapistatuses.php:555
 msgid "unsupported file type"
-msgstr "Nicht unterstützer Datei Typ"
+msgstr "Nicht unterstützter Dateityp"
 
 #: ../lib/util.php:1309 lib/util.php:1443
-#, fuzzy
 msgid "« After"
-msgstr "« Später"
+msgstr "Früher"
 
 #: actions/deletenotice.php:74 actions/disfavor.php:43
 #: actions/emailsettings.php:127 actions/favor.php:45
@@ -2835,110 +2853,135 @@ msgstr "« Später"
 #: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
 #: actions/openidlogin.php:37 actions/recoverpassword.php:316
 #: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
+#, fuzzy
 msgid "There was a problem with your session token. Try again, please."
-msgstr "Es gab ein Problem mit deinem Session Token. Bitte versuche es erneut."
+msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
 
 #: actions/disfavor.php:55 actions/disfavor.php:81
+#, fuzzy
 msgid "This notice is not a favorite!"
-msgstr ""
+msgstr "Diese Nachricht ist kein Favorit!"
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
 msgid "Could not delete favorite."
-msgstr ""
+msgstr "Konnte Favoriten nicht löschen."
 
 #: actions/disfavor.php:72 lib/favorform.php:140
+#, fuzzy
 msgid "Favor"
-msgstr ""
+msgstr "Zu Favoriten hinzufügen"
 
 #: actions/emailsettings.php:92
+#, fuzzy
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
+"Mir eine E-Mail schicken, wenn jemand meine Nachricht als Favorit speichert."
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
+#, fuzzy
 msgid "Send me email when someone sends me a private message."
 msgstr ""
+"Mir eine E-Mail schicken, wenn mir jemand eine private Nachricht schickt."
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
 #: actions/twitapifavorites.php:118
+#, fuzzy
 msgid "This notice is already a favorite!"
-msgstr ""
+msgstr "Diese Nachricht ist bereits ein Favorit!"
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
 msgid "Could not create favorite."
-msgstr ""
+msgstr "Konnte keinen Favoriten erstellen."
 
 #: actions/favor.php:70
+#, fuzzy
 msgid "Disfavor"
-msgstr ""
+msgstr "Aus Favoriten entfernen"
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
 #, php-format
+#, fuzzy
 msgid "%s favorite notices"
-msgstr ""
+msgstr "%ss Favoriten"
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
 #, php-format
+#, fuzzy
 msgid "Feed of favorite notices of %s"
-msgstr ""
+msgstr "Feed von %ss Favoriten"
 
 #: actions/inbox.php:28 actions/inbox.php:59
 #, php-format
+#, fuzzy
 msgid "Inbox for %s - page %d"
-msgstr ""
+msgstr "Posteingang von %s - Seite %d"
 
 #: actions/inbox.php:30 actions/inbox.php:62
 #, php-format
+#, fuzzy
 msgid "Inbox for %s"
-msgstr ""
+msgstr "Posteingang von %s"
 
 #: actions/inbox.php:53 actions/inbox.php:115
+#, fuzzy
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
+"Das hier ist dein Posteingang, der deine eingehenden privaten Nachrichten "
+"enthält."
 
 #: actions/invite.php:178 actions/invite.php:213
 #, php-format
+#, fuzzy
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
 "\n"
 msgstr ""
+"%1$s hat dich zu %2$s (%3$s) eingeladen.\n"
+"\n"
 
 #: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
 #: actions/register.php:416
+#, fuzzy
 msgid "Automatically login in the future; "
-msgstr ""
+msgstr "In Zukunft automatisch anmelden; "
 
 #: actions/login.php:122 actions/login.php:264
+#, fuzzy
 msgid "For security reasons, please re-enter your "
-msgstr ""
+msgstr "Aus Sicherheitsgründen, bitte erneutes Eingeben des "
 
 #: actions/login.php:126 actions/login.php:268
+#, fuzzy
 msgid "Login with your username and password. "
-msgstr ""
+msgstr "Anmelden mit deinem Benutzernamen und Passwort. "
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
 #: actions/twitapidirect_messages.php:141
+#, fuzzy
 msgid "That's too long. Max message size is 140 chars."
-msgstr ""
+msgstr "Das ist zu lang. Die maximale Nachrichtenlänge ist 140 Zeichen."
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
 msgid "No recipient specified."
-msgstr ""
+msgstr "Kein Empfänger angegeben."
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
 msgid "You can't send a message to this user."
-msgstr ""
+msgstr "Du kannst diesem Benutzer keine Nachricht schicken."
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
 #: classes/Command.php:240
+#, fuzzy
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
+"Schicke dir selbst keine Nachrichten; sag es dir stattdessen einfach leise."
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
 #: actions/newmessage.php:163
@@ -2950,81 +2993,96 @@ msgid "New message"
 msgstr "Neue Nachricht"
 
 #: actions/noticesearch.php:95 actions/noticesearch.php:146
+#, fuzzy
 msgid "Notice without matching profile"
-msgstr ""
+msgstr "Nachricht ohne entsprechendes Profil"
 
 #: actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
+#, fuzzy
 msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
 msgstr ""
+"Mit [OpenID](%%doc.openid%%) kannst du dich auf mehreren Seiten anmelden "
 
 #: actions/openidsettings.php:46 actions/openidsettings.php:96
 msgid "If you want to add an OpenID to your account, "
-msgstr ""
+msgstr "Wenn du deinem Konto eine OpenID hinzufügen möchtest, "
 
 #: actions/openidsettings.php:74
+#, fuzzy
 msgid "Removing your only OpenID would make it impossible to log in! "
 msgstr ""
+"Das Entfernen deiner einzigen OpenID würde die Anmeldung unmöglich machen!"
 
 #: actions/openidsettings.php:87 actions/openidsettings.php:143
+#, fuzzy
 msgid "You can remove an OpenID from your account "
-msgstr ""
+msgstr "Du kannst eine OpenID von deinem Konto entfernen "
 
 #: actions/outbox.php:28 actions/outbox.php:58
 #, fuzzy, php-format
 msgid "Outbox for %s - page %d"
-msgstr "Nachrichtenausgang von %s - Seite %d"
+msgstr "Postausgang von %s - Seite %d"
 
 #: actions/outbox.php:30 actions/outbox.php:61
 #, fuzzy, php-format
 msgid "Outbox for %s"
-msgstr "Nachrichtenausgang von %s"
+msgstr "Postausgang von %s"
 
 #: actions/outbox.php:53 actions/outbox.php:116
+#, fuzzy
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
+"Das hier ist dein Postausgang, er beinhaltet deine gesendeten Nachrichten."
 
 #: actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
+#, fuzzy
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
-msgstr ""
+msgstr "Suche nach Leuten auf %%site.name%% nach Name, Ort oder Interessen."
 
 #: actions/profilesettings.php:27 actions/profilesettings.php:69
+#, fuzzy
 msgid "You can update your personal profile info here "
-msgstr ""
+msgstr "Du kannst dein persönliches Profil hier aktualisieren "
 
 #: actions/profilesettings.php:115 actions/remotesubscribe.php:320
 #: actions/userauthorization.php:159 actions/userrss.php:76
 #: actions/avatarsettings.php:104 actions/avatarsettings.php:179
 #: actions/grouplogo.php:177 actions/remotesubscribe.php:367
 #: actions/userauthorization.php:176 actions/userrss.php:82
+#, fuzzy
 msgid "User without matching profile"
-msgstr ""
+msgstr "Benutzer ohne passendes Profil"
 
 #: actions/recoverpassword.php:91 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. "
-msgstr ""
+msgstr "Dieser Bestätigungscode ist zu alt. "
 
 #: actions/recoverpassword.php:141 actions/recoverpassword.php:152
+#, fuzzy
 msgid "If you've forgotten or lost your"
-msgstr ""
+msgstr "Keine Erinnerung mehr an dein"
 
 #: actions/recoverpassword.php:154 actions/recoverpassword.php:158
+#, fuzzy
 msgid "You've been identified. Enter a "
-msgstr ""
+msgstr "Du wurdest identifiziert. Eingabe eines "
 
 #: actions/recoverpassword.php:169 actions/recoverpassword.php:188
+#, fuzzy
 msgid "Your nickname on this server, "
-msgstr "Dein Spitzname auf diesem Server, "
+msgstr "Dein Benutzername auf diesem Server, "
 
 #: actions/recoverpassword.php:271 actions/recoverpassword.php:304
+#, fuzzy
 msgid "Instructions for recovering your password "
-msgstr "Anweisungen für die Passwort-Widerherstellung "
+msgstr "Anweisungen zur Passwort-Wiederherstellung "
 
 #: actions/recoverpassword.php:327 actions/recoverpassword.php:361
 msgid "New password successfully saved. "
-msgstr "Neues Passwort erfolgreich gespeichert."
+msgstr "Neues Passwort erfolgreich gespeichert. "
 
 #: actions/register.php:95 actions/register.php:180
 msgid "Password must be 6 or more characters."
@@ -3036,52 +3094,62 @@ msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
 msgstr ""
-"Gratulier, %s! Und willkommen auf %%%%site.name%%%%. Jetzt möchtest du "
+"Gratuliere, %s! Und willkommen auf %%%%site.name%%%%. Jetzt möchtest du "
 "vielleicht..."
 
 #: actions/register.php:227
+#, fuzzy
 msgid "(You should receive a message by email momentarily, with "
-msgstr ""
+msgstr "(Du solltest jeden Moment eine E-Mail erhalten mit "
 
 #: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
 #, php-format
+#, fuzzy
 msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr ""
+msgstr "Zum Abonnieren bitte [anmelden](%%action.login%%),"
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
 #, php-format
+#, fuzzy
 msgid "Feed for favorites of %s"
-msgstr ""
+msgstr "Feed der Favoriten von %s"
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
+#, fuzzy
 msgid "Could not retrieve favorite notices."
-msgstr ""
+msgstr "Konnte Favoriten nicht abrufen."
 
 #: actions/showmessage.php:33 actions/showmessage.php:81
+#, fuzzy
 msgid "No such message."
-msgstr ""
+msgstr "Keine derartige Nachricht."
 
 #: actions/showmessage.php:42
+#, fuzzy
 msgid "Only the sender and recipient may read this message."
-msgstr ""
+msgstr "Nur der Absender und Empfänger können diese Nachricht lesen."
 
 #: actions/showmessage.php:61 actions/showmessage.php:108
 #, php-format
+#, fuzzy
 msgid "Message to %1$s on %2$s"
-msgstr ""
+msgstr "Nachricht an %1$s auf %2$s"
 
 #: actions/showmessage.php:66 actions/showmessage.php:113
 #, php-format
+#, fuzzy
 msgid "Message from %1$s on %2$s"
-msgstr ""
+msgstr "Nachricht von %1$s auf %2$s"
 
 #: actions/showstream.php:154
+#, fuzzy
 msgid "Send a message"
-msgstr "Sende eine Nachricht"
+msgstr "Eine Nachricht verschicken"
 
 #: actions/smssettings.php:312 actions/smssettings.php:464
 #, php-format
+#, fuzzy
 msgid "Mobile carrier for your phone. "
 msgstr "Mobilfunkanbieter deines Telefons. "
 
@@ -3107,7 +3175,7 @@ msgstr "Alle von %s gesendeten direkten Nachrichten"
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
 msgid "No message text!"
-msgstr "Fehlender Nachrichten Text!"
+msgstr "Fehlender Nachrichtentext!"
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
@@ -3116,18 +3184,23 @@ msgstr "Empfänger nicht gefunden."
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
+#, fuzzy
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
+"Es können keine direkten Nachrichten an Benutzer geschickt werden mit denen "
+"du nicht befreundet bist."
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
 #, php-format
+#, fuzzy
 msgid "%s / Favorites from %s"
-msgstr ""
+msgstr "%s / Favoriten von %s"
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
 #, php-format
+#, fuzzy
 msgid "%s updates favorited by %s / %s."
-msgstr ""
+msgstr "%s Updates in den Favoriten von %s / %s."
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
 #: actions/twitapifavorites.php:164 lib/mail.php:553
@@ -3138,15 +3211,21 @@ msgstr "%s hat deine Nachricht als Favorit gespeichert"
 #: actions/twitapifavorites.php:188 lib/mail.php:276
 #: actions/twitapifavorites.php:165
 #, php-format
+#, fuzzy
 msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
 "\n"
 msgstr ""
+"%1$s hat soeben deine Nachricht von %2$s zu seinen Favoriten hinzugefügt.\n"
+"\n"
 
 #: actions/twittersettings.php:27
+#, fuzzy
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
+"Füge dein Twitter-Konto hinzu, um automatisch deine Nachrichten an Twitter "
+"zu übermitteln, "
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
 msgid "Twitter settings"
@@ -3154,11 +3233,11 @@ msgstr "Twitter Einstellungen"
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
 msgid "Twitter Account"
-msgstr "Twitter Account"
+msgstr "Twitter Konto"
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
 msgid "Current verified Twitter account."
-msgstr "Momentan bestätigter Twitter Account."
+msgstr "Derzeit bestätigter Twitter Account."
 
 #: actions/twittersettings.php:63
 msgid "Twitter Username"
@@ -3166,7 +3245,7 @@ msgstr "Twitter Benutzername"
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
 msgid "No spaces, please."
-msgstr "Keine Leerzeichen bitte."
+msgstr "Keine Leerzeichen, bitte."
 
 #: actions/twittersettings.php:67
 msgid "Twitter Password"
@@ -3174,30 +3253,37 @@ msgstr "Twitter Passwort"
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
 msgid "Automatically send my notices to Twitter."
-msgstr "Sende meine Nachrichten automatisch zu Twitter."
+msgstr "Sende meine Nachrichten automatisch an Twitter."
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
+#, fuzzy
 msgid "Send local \"@\" replies to Twitter."
-msgstr ""
+msgstr "Sende lokale \"@\" Antworten an Twitter."
 
 #: actions/twittersettings.php:78 actions/twittersettings.php:153
 msgid "Subscribe to my Twitter friends here."
-msgstr "Abonniere meine Twitter Freunde hier."
+msgstr "Hier meine Twitter Freunde abonnieren."
 
 #: actions/twittersettings.php:122
+#, fuzzy
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
+"Der Benutzername darf nur Zahlen, Groß- und Kleinbuchstaben und Unterstriche "
+"(_) enthalten. Maximal 15 Zeichen."
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
+#, fuzzy
 msgid "Could not verify your Twitter credentials!"
-msgstr ""
+msgstr "Das Überprüfen deiner Twitter Berechtigungen war nicht erfolgreich!"
 
 #: actions/twittersettings.php:137
 #, php-format
+#, fuzzy
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
 msgstr ""
+"Es konnten keine Kontoinformationen zu \"%s\" von Twitter empfangen werden."
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
@@ -3210,7 +3296,7 @@ msgstr "Twitter Einstellungen gespeichert."
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
 msgid "That is not your Twitter account."
-msgstr "Das ist nicht dein Twitter Account."
+msgstr "Das ist nicht dein Twitter Konto."
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
 #: actions/twittersettings.php:403
@@ -3232,32 +3318,39 @@ msgid "Twitter preferences saved."
 msgstr "Twitter Einstellungen gespeichert."
 
 #: actions/userauthorization.php:84 actions/userauthorization.php:86
+#, fuzzy
 msgid "Please check these details to make sure "
-msgstr ""
+msgstr "Bitte überprüfe die Details um sicherzustellen, dass "
 
 #: actions/userauthorization.php:324 actions/userauthorization.php:340
+#, fuzzy
 msgid "The subscription has been authorized, but no "
-msgstr ""
+msgstr "Das Abonnement wurde genehmigt, aber kein "
 
 #: actions/userauthorization.php:334 actions/userauthorization.php:351
+#, fuzzy
 msgid "The subscription has been rejected, but no "
-msgstr ""
+msgstr "Das Abonnement wurde abgelehnt, aber kein "
 
 #: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+#, fuzzy
 msgid "Command results"
-msgstr ""
+msgstr "Befehl Ausgabe"
 
 #: classes/Channel.php:148 classes/Channel.php:204
+#, fuzzy
 msgid "Command complete"
-msgstr ""
+msgstr "Befehl ausgeführt"
 
 #: classes/Channel.php:158 classes/Channel.php:215
+#, fuzzy
 msgid "Command failed"
-msgstr ""
+msgstr "Befehl fehlgeschlagen"
 
 #: classes/Command.php:39 classes/Command.php:44
+#, fuzzy
 msgid "Sorry, this command is not yet implemented."
-msgstr ""
+msgstr "Leider ist dieser Befehl noch nicht implementiert."
 
 #: classes/Command.php:96 classes/Command.php:113
 #, php-format
@@ -3266,12 +3359,14 @@ msgstr "Abonnements: %1$s\n"
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
 #: classes/Command.php:276
+#, fuzzy
 msgid "User has no last notice"
-msgstr ""
+msgstr "Benutzer hat keine letzte Nachricht"
 
 #: classes/Command.php:146 classes/Command.php:166
+#, fuzzy
 msgid "Notice marked as fave."
-msgstr ""
+msgstr "Nachricht als Favorit markiert."
 
 #: classes/Command.php:166 classes/Command.php:189
 #, php-format
@@ -3323,51 +3418,56 @@ msgid "Subscribed to %s"
 msgstr "%s abonniert"
 
 #: classes/Command.php:288 classes/Command.php:328
+#, fuzzy
 msgid "Specify the name of the user to unsubscribe from"
-msgstr ""
+msgstr "Gib den Namen des Benutzers ein, den du nicht mehr abonnieren möchtest"
 
 #: classes/Command.php:295 classes/Command.php:335
 #, php-format
+#, fuzzy
 msgid "Unsubscribed from %s"
-msgstr ""
+msgstr "%s nicht mehr abonniert"
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
 #: classes/Command.php:376
+#, fuzzy
 msgid "Command not yet implemented."
-msgstr "Kommando noch nicht implementiert."
+msgstr "Befehl noch nicht implementiert."
 
 #: classes/Command.php:313 classes/Command.php:356
 msgid "Notification off."
-msgstr "Benachrichtigungen deaktiviert."
+msgstr "Benachrichtigung deaktiviert."
 
 #: classes/Command.php:315 classes/Command.php:358
 msgid "Can't turn off notification."
-msgstr "Konnte Benachrichtigungen nicht deaktivieren."
+msgstr "Konnte Benachrichtigung nicht deaktivieren."
 
 #: classes/Command.php:333 classes/Command.php:379
 msgid "Notification on."
-msgstr "Benachrichtigungen aktiviert."
+msgstr "Benachrichtigung aktiviert."
 
 #: classes/Command.php:335 classes/Command.php:381
 msgid "Can't turn on notification."
-msgstr "Konnte Benachrichtigungen nicht aktivieren."
+msgstr "Konnte Benachrichtigung nicht aktivieren."
 
 #: classes/Command.php:344 classes/Command.php:392
 msgid "Commands:\n"
-msgstr "Kommandos:\n"
+msgstr "Befehle:\n"
 
 #: classes/Message.php:53 classes/Message.php:56
+#, fuzzy
 msgid "Could not insert message."
 msgstr "Konnte Nachricht nicht einfügen."
 
 #: classes/Message.php:63 classes/Message.php:66
+#, fuzzy
 msgid "Could not update message with new URI."
-msgstr ""
+msgstr "Konnte Nachricht nicht mit neuer URI versehen."
 
 #: lib/gallery.php:46
 #, fuzzy
 msgid "User without matching profile in system."
-msgstr "Benutzer ohne zutreffendes Profil im System."
+msgstr "Benutzer ohne entsprechendes Profil im System."
 
 #: lib/mail.php:147 lib/mail.php:289
 #, fuzzy, php-format
@@ -3375,7 +3475,7 @@ msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgstr ""
-"Du hast eine neue Posting Addresse auf %1$s.\n"
+"Du hast eine neue Adresse zum Hinzufügen von Nachrichten auf %1$s.\n"
 "\n"
 
 #: lib/mail.php:249 lib/mail.php:508
@@ -3389,17 +3489,18 @@ msgid ""
 "%1$s (%2$s) sent you a private message:\n"
 "\n"
 msgstr ""
-"%s$s (%2$s) hat dir einen private Nachricht geschickt:\n"
+"%1$s (%2$s) hat dir einen private Nachricht geschickt:\n"
 "\n"
 
 #: lib/mailbox.php:43 lib/mailbox.php:89
 #, fuzzy
 msgid "Only the user can read their own mailboxes."
-msgstr "Nur der Benutzer selbst kann seinen Posteingang lesen"
+msgstr "Nur der Benutzer selbst kann seinen Posteingang lesen."
 
 #: lib/openid.php:195 lib/openid.php:203
+#, fuzzy
 msgid "This form should automatically submit itself. "
-msgstr ""
+msgstr "Dieses Formular sollte sich automatisch abschicken. "
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
 msgid "Favorites"
@@ -3407,8 +3508,9 @@ msgstr "Favoriten"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
 #, php-format
+#, fuzzy
 msgid "%s's favorite notices"
-msgstr "%s's favorisierte Nachrichten"
+msgstr "%ss favorisierte Nachrichten"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
 msgid "User"
@@ -3436,44 +3538,44 @@ msgstr "Twitter"
 
 #: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
 msgid "Twitter integration options"
-msgstr "Twitter Integrations Optionen"
+msgstr "Twitter Integrationseinstellungen"
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
 msgid "To"
 msgstr "An"
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+#, fuzzy
 msgid "Could not parse message."
 msgstr "Konnte Nachricht nicht parsen."
 
 #: actions/all.php:63 actions/facebookhome.php:162
 #, fuzzy, php-format
 msgid "%s and friends, page %d"
-msgstr "%s und Freunde"
+msgstr "%s und Freunde, Seite %d"
 
 #: actions/avatarsettings.php:76
 msgid "You can upload your personal avatar."
-msgstr ""
+msgstr "Du kannst dein persönliches Avatar hochladen."
 
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
 #: actions/grouplogo.php:250
-#, fuzzy
 msgid "Avatar settings"
-msgstr "Twitter Einstellungen"
+msgstr "Avatar Einstellungen"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
 msgid "Original"
-msgstr ""
+msgstr "Original"
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
 msgid "Preview"
-msgstr ""
+msgstr "Vorschau"
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
 msgid "Crop"
-msgstr ""
+msgstr "Zuschneiden"
 
 #: actions/avatarsettings.php:248 actions/deletenotice.php:133
 #: actions/emailsettings.php:224 actions/grouplogo.php:307
@@ -3486,65 +3588,69 @@ msgstr ""
 #: actions/userauthorization.php:39
 #, fuzzy
 msgid "There was a problem with your session token. "
-msgstr "Es gab ein Problem mit deinem Session Token. Bitte versuche es erneut."
+msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
+#, fuzzy
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
+"Wähle eine quadratische Fläche aus dem Bild, um dein Avatar zu speichern"
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
+#, fuzzy
 msgid "Lost our file data."
-msgstr ""
+msgstr "Daten verloren."
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
 #: classes/User_group.php:112
 #, fuzzy
 msgid "Lost our file."
-msgstr "Blocken des Benutzer fehlgeschlagen."
+msgstr "Daten verloren."
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
 #: classes/User_group.php:129 classes/User_group.php:161
-#, fuzzy
 msgid "Unknown file type"
-msgstr "Nicht unterstützer Datei Typ"
+msgstr "Unbekannter Dateityp"
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
 msgid "No profile specified."
-msgstr "Kein Profile spezifiziert."
+msgstr "Kein Profil angegeben."
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
 #: actions/unblock.php:75
 msgid "No profile with that ID."
-msgstr "Kein Benutzer-Profil mit dieser ID"
+msgstr "Kein Benutzer-Profil mit dieser ID."
 
 #: actions/block.php:111
 msgid "Block user"
-msgstr "Blocke Benutzer"
+msgstr "Benutzer blockieren"
 
 #: actions/block.php:129
 msgid "Are you sure you want to block this user? "
-msgstr "Bist du sicher das du diesen Benutzer blocken möchtest?"
+msgstr "Bist du sicher, dass du diesen Benutzer blockieren möchtest? "
 
 #: actions/block.php:162
 msgid "You have already blocked this user."
-msgstr "Du hast diesen Benutzer bereits geblockt."
+msgstr "Du hast diesen Benutzer bereits blockiert."
 
 #: actions/block.php:167
+#, fuzzy
 msgid "Failed to save block information."
-msgstr "Konnte Block Daten nicht speichern."
+msgstr "Konnte Blockierungsdaten nicht speichern."
 
 #: actions/confirmaddress.php:159
 #, fuzzy, php-format
 msgid "The address \"%s\" has been "
-msgstr "Die Adresse wurde entfernt."
+msgstr "Die Adresse \"%s\" wurde "
 
 #: actions/deletenotice.php:73
 #, fuzzy
 msgid "You are about to permanently delete a notice. "
-msgstr "Sind Sie sicher, dass sie diese Nachricht löschen wollen?"
+msgstr "Du bist dabei diese Nachricht dauerhaft zu entfernen. "
 
 #: actions/disfavor.php:94
+#, fuzzy
 msgid "Add to favorites"
 msgstr "Zu Favoriten hinzufügen"
 
@@ -3555,52 +3661,49 @@ msgstr "Gruppe %s bearbeiten"
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+#, fuzzy
 msgid "Inboxes must be enabled for groups to work"
-msgstr ""
+msgstr "Posteingänge müssen aktiviert sein, damit Gruppen funktionieren"
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
 msgid "You must be logged in to create a group."
-msgstr "Sie müssen eingeloggt sein, um eine Gruppe zu erzeugen."
+msgstr "Du musst angemeldet sein, um eine Gruppe zu erstellen."
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
 #: actions/showgroup.php:121
 #, fuzzy
 msgid "No nickname"
-msgstr "Kein Nutzername."
+msgstr "Kein Benutzername"
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
 #: actions/showgroup.php:128
 #, fuzzy
 msgid "No such group"
-msgstr "Kein solcher Benutzer"
+msgstr "Keine derartige Gruppe"
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
 #: actions/grouplogo.php:107
 msgid "You must be an admin to edit the group"
-msgstr ""
+msgstr "Du musst ein Administrator sein, um die Gruppe zu bearbeiten"
 
 #: actions/editgroup.php:157
 msgid "Use this form to edit the group."
-msgstr ""
+msgstr "Benutze dieses Formular, um die Gruppe zu bearbeiten."
 
 #: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
 #, fuzzy
 msgid "Nickname must have only lowercase letters "
-msgstr ""
-"Der Nutzername darf nur aus Kleinbuchstaben und Ziffern bestehen. "
-"Leerzeichen sind nicht erlaubt."
+msgstr "Der Benutzername darf nur aus Kleinbuchstaben bestehen "
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
-#, fuzzy
 msgid "description is too long (max 140 chars)."
-msgstr "Die Biografie ist zu lang (max. 140 Zeichen)"
+msgstr "Die Beschreibung ist zu lang (max. 140 Zeichen)."
 
 #: actions/editgroup.php:218
-#, fuzzy
 msgid "Could not update group."
-msgstr "Konnte Benutzerdaten nicht aktualisieren."
+msgstr "Konnte Gruppe nicht aktualisieren."
 
 #: actions/editgroup.php:226
 #, fuzzy
@@ -3610,16 +3713,16 @@ msgstr "Einstellungen gespeichert."
 #: actions/emailsettings.php:107 actions/imsettings.php:108
 #, fuzzy, php-format
 msgid "Awaiting confirmation on this address. "
-msgstr "Warte auf die Bestätigung dieser Telefonnummer."
+msgstr "Warte auf die Bestätigung dieser Adresse. "
 
 #: actions/emailsettings.php:139 actions/smssettings.php:150
 #, fuzzy
 msgid "Make a new email address for posting to; "
-msgstr "Neue E-Mail Adresse um auf %s zu schreiben"
+msgstr "Neue E-Mailadresse um Nachrichten auf %s hinzuzufügen; "
 
 #: actions/emailsettings.php:157
 msgid "Send me email when someone "
-msgstr ""
+msgstr "Schicke mir eine E-Mail, wenn jemand "
 
 #: actions/emailsettings.php:168
 msgid "Allow friends to nudge me and send me an email."
@@ -3628,28 +3731,29 @@ msgstr "Erlaube Freunden mich zu stupsen und mir E-Mails zu senden."
 #: actions/emailsettings.php:321
 #, fuzzy
 msgid "That email address already belongs "
-msgstr "Diese E-Mail Adresse gehört einem anderen Nutzer."
+msgstr "Diese E-Mailadresse gehört "
 
 #: actions/emailsettings.php:343
-#, fuzzy
 msgid "A confirmation code was sent to the email address you added. "
 msgstr ""
-"Ein Bestätigungscode wurde an die IM Adresse geschickt, die du hinzugefügt "
-"hast. Du musst zulassen, dass %s dir Nachrichten schicken darf."
+"Ein Bestätigungscode wurde an die E-Mailadresse geschickt, die du "
+"hinzugefügt hast."
 
 #: actions/facebookhome.php:110
+#, fuzzy
 msgid "Server error - couldn't get user!"
-msgstr "Serverfehler - User nicht gefunden!"
+msgstr "Serverfehler - Benutzer nicht gefunden!"
 
 #: actions/facebookhome.php:196
 #, php-format
+#, fuzzy
 msgid "If you would like the %s app to automatically update "
-msgstr ""
+msgstr "Wenn du automatische Aktualisierungen der Anwendung %s möchtest "
 
 #: actions/facebookhome.php:213 actions/facebooksettings.php:137
 #, php-format
 msgid "Allow %s to update my Facebook status"
-msgstr ""
+msgstr "Erlaube %s meinen Facebook Status zu aktualisieren"
 
 #: actions/facebookhome.php:218
 msgid "Skip"
@@ -3661,23 +3765,24 @@ msgid "No notice content!"
 msgstr "Kein Inhalt!"
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#, fuzzy
 msgid "Pagination"
-msgstr ""
+msgstr "Seitenerstellung"
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-#, fuzzy
 msgid "After"
-msgstr "« Später"
+msgstr "Später"
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
 #, fuzzy
 msgid "Before"
-msgstr "Früher »"
+msgstr "Vorher"
 
 #: actions/facebookinvite.php:70
 #, php-format
+#, fuzzy
 msgid "Thanks for inviting your friends to use %s"
-msgstr ""
+msgstr "Danke, dass du deine Freunde zu %s einlädst"
 
 #: actions/facebookinvite.php:72
 #, fuzzy
@@ -3692,17 +3797,17 @@ msgstr "Du wurdest von %s angestupst"
 #: actions/facebookinvite.php:105
 #, fuzzy, php-format
 msgid "Invite your friends to use %s"
-msgstr "Feed der Freunde von %s"
+msgstr "Lade deine Freunde ein %s zu nutzen"
 
 #: actions/facebookinvite.php:113
 #, php-format
 msgid "Friends already using %s:"
-msgstr ""
+msgstr "Freunde, die %s bereits benutzen:"
 
 #: actions/facebookinvite.php:130
 #, php-format
 msgid "Send invitations"
-msgstr "Einladungen senden"
+msgstr "Einladungen versenden"
 
 #: actions/facebookremove.php:56
 msgid "Couldn't remove Facebook user."
@@ -3711,83 +3816,89 @@ msgstr "Konnte Facebook Benutzer nicht entfernen."
 #: actions/facebooksettings.php:65
 #, fuzzy
 msgid "There was a problem saving your sync preferences!"
-msgstr "Es gab ein Problem mit deinem Session Token. Bitte versuche es erneut."
+msgstr "Es gab ein Problem beim Speichern deiner Synchronisationseinstellungen."
 
 #: actions/facebooksettings.php:67
 #, fuzzy
 msgid "Sync preferences saved."
-msgstr "Einstellungen gesichert."
+msgstr "Synchronisationseinstellungen gespeichert."
 
 #: actions/facebooksettings.php:90
 #, fuzzy
 msgid "Automatically update my Facebook status with my notices."
-msgstr "Sende meine Nachrichten automatisch zu Twitter."
+msgstr ""
+"Meinen Facebook Status automatisch über meine Nachrichten aktualisieren."
 
 #: actions/facebooksettings.php:97
+#, fuzzy
 msgid "Send \"@\" replies to Facebook."
-msgstr ""
+msgstr "Schicke \"@\" Antworten an Facebook."
 
 #: actions/facebooksettings.php:106
 #, fuzzy
 msgid "Prefix"
-msgstr "Profil"
+msgstr "Prefix"
 
 #: actions/facebooksettings.php:108
+#, fuzzy
 msgid "A string to prefix notices with."
-msgstr ""
+msgstr "Eine Zeichenfolge, die deinen Nachrichten vorangestellt wird."
 
 #: actions/facebooksettings.php:124
 #, php-format
 msgid "If you would like %s to automatically update "
-msgstr ""
+msgstr "Wenn du %s automatisch aktualisieren lassen möchtest "
 
 #: actions/facebooksettings.php:147
 #, fuzzy
 msgid "Sync preferences"
-msgstr "Einstellungen"
+msgstr "Synchronisationseinstellungen"
 
 #: actions/favor.php:94 lib/disfavorform.php:140
+#, fuzzy
 msgid "Disfavor favorite"
-msgstr ""
+msgstr "Aus Favoriten entfernen"
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
 #: lib/publicgroupnav.php:91
-#, fuzzy
 msgid "Popular notices"
-msgstr "Unbekannte Nachricht."
+msgstr "Beliebte Nachrichten"
 
 #: actions/favorited.php:67
-#, fuzzy, php-format
+#, php-format
 msgid "Popular notices, page %d"
-msgstr "Unbekannte Nachricht."
+msgstr "Beliebte Nachrichten, Seite %d"
 
 #: actions/favorited.php:79
 msgid "The most popular notices on the site right now."
-msgstr ""
+msgstr "Die momentan beliebtesten Nachrichten auf dieser Seite."
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
 #: lib/publicgroupnav.php:87
+#, fuzzy
 msgid "Featured users"
-msgstr ""
+msgstr "Featured Benutzer"
 
 #: actions/featured.php:71
 #, php-format
+#, fuzzy
 msgid "Featured users, page %d"
-msgstr ""
+msgstr "Featured Benutzer, Seite %d"
 
 #: actions/featured.php:99
 #, php-format
+#, fuzzy
 msgid "A selection of some of the great users on %s"
-msgstr ""
+msgstr "Eine Auswahl der tollen Benutzer auf %s"
 
 #: actions/finishremotesubscribe.php:188
 #, fuzzy
 msgid "That user has blocked you from subscribing."
-msgstr "Dieser Benutzer erlaubt dir nicht zu abbonieren."
+msgstr "Dieser Benutzer erlaubt dir nicht ihn zu abonnieren."
 
 #: actions/groupbyid.php:79
 msgid "No ID"
-msgstr ""
+msgstr "Keine ID"
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
 msgid "Group logo"
@@ -3800,12 +3911,12 @@ msgstr "Du kannst ein Logo für Deine Gruppe hochladen."
 #: actions/grouplogo.php:448
 #, fuzzy
 msgid "Logo updated."
-msgstr "Avatar aktualisiert."
+msgstr "Logo aktualisiert."
 
 #: actions/grouplogo.php:450
 #, fuzzy
 msgid "Failed updating logo."
-msgstr "Aktualisierung des Avatars fehlgeschlagen"
+msgstr "Aktualisierung des Logos fehlgeschlagen."
 
 #: actions/groupmembers.php:93 lib/groupnav.php:91
 #, php-format
@@ -3815,11 +3926,11 @@ msgstr "%s Gruppen-Mitglieder"
 #: actions/groupmembers.php:96
 #, php-format
 msgid "%s group members, page %d"
-msgstr ""
+msgstr "%s Gruppen-Mitglieder, Seite %d"
 
 #: actions/groupmembers.php:111
 msgid "A list of the users in this group."
-msgstr "Liste der Benutzer in dieser Gruppe"
+msgstr "Liste der Benutzer in dieser Gruppe."
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
 #: lib/subgroupnav.php:96
@@ -3833,37 +3944,35 @@ msgstr "Gruppen, Seite %d"
 
 #: actions/groups.php:90
 #, php-format
+#, fuzzy
 msgid "%%%%site.name%%%% groups let you find and talk with "
-msgstr ""
+msgstr "%%%%site.name%%%% Gruppen - finde und tausche dich aus mit "
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-#, fuzzy
 msgid "Create a new group"
-msgstr "Neues Konto anlegen"
+msgstr "Neue Gruppe erstellen"
 
 # Suche nach "Nutzern" stimmt ja nicht, es ist die Gruppensuche.
 #: actions/groupsearch.php:57
 #, fuzzy, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
-msgstr ""
-"Suche nach Gruppen auf %%site.name%%, nach Name, Ort oder Beschreibung der "
-"Gruppe. Trenne mehrere Suchbegriffe durch Leerzeichen. Ein Suchbegriff muss "
-"aus mindestens 3 Zeichen bestehen."
+msgstr "Suche nach Gruppen auf %%site.name%% nach Name, Ort oder Beschreibung. "
 
 #: actions/groupsearch.php:63
 #, fuzzy
 msgid "Group search"
-msgstr "Suche nach Gruppen"
+msgstr "Gruppen-Suche"
 
 #: actions/imsettings.php:70
+#, fuzzy
 msgid "You can send and receive notices through "
-msgstr ""
+msgstr "Du kannst Nachrichten senden und empfangen über "
 
 #: actions/imsettings.php:120
 #, php-format
 msgid "Jabber or GTalk address, "
-msgstr ""
+msgstr "Jabber oder GTalk Adressen, "
 
 #: actions/imsettings.php:147
 #, fuzzy
@@ -3873,67 +3982,71 @@ msgstr "Schicke mir Nachrichten mittels Jabber/GTalk."
 #: actions/imsettings.php:321
 #, fuzzy, php-format
 msgid "A confirmation code was sent "
-msgstr "Kein Bestätigungs-Code."
+msgstr "Es wurde ein Bestätigungscode gesendet "
 
 #: actions/joingroup.php:65
 msgid "You must be logged in to join a group."
-msgstr "Du mußt eingeloggt sein, um Mitglied einer Gruppe zu werden."
+msgstr "Du musst angemeldet sein, um Mitglied einer Gruppe zu werden."
 
 #: actions/joingroup.php:95
 #, fuzzy
 msgid "You are already a member of that group"
-msgstr "Du hast diese Benutzer bereits abonniert:"
+msgstr "Du bist bereits Mitglied dieser Gruppe"
 
 #: actions/joingroup.php:128
 #, fuzzy, php-format
 msgid "Could not join user %s to group %s"
-msgstr "Kann Nutzer %s nicht folgen: Nutzer nicht gefunden"
+msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen"
 
 #: actions/joingroup.php:135
 #, php-format
 msgid "%s joined group %s"
-msgstr ""
+msgstr "%s ist der Gruppe %s beigetreten"
 
 #: actions/leavegroup.php:60
+#, fuzzy
 msgid "Inboxes must be enabled for groups to work."
-msgstr ""
+msgstr "Damit Gruppen funktionieren müssen Posteingänge aktiviert sein."
 
 #: actions/leavegroup.php:65
 msgid "You must be logged in to leave a group."
-msgstr "Du mußt eingeloggt sein, um aus einer Gruppe auszutreten."
+msgstr "Du musst angemeldet sein, um aus einer Gruppe auszutreten."
 
 #: actions/leavegroup.php:88
 #, fuzzy
 msgid "No such group."
-msgstr "Tag nicht vorhanden."
+msgstr "Keine derartige Gruppe."
 
 #: actions/leavegroup.php:95
 #, fuzzy
 msgid "You are not a member of that group."
-msgstr "Dieses Profil hast du uns nicht geschickt"
+msgstr "Du bist kein Mitglied dieser Gruppe."
 
 #: actions/leavegroup.php:100
+#, fuzzy
 msgid "You may not leave a group while you are its administrator."
 msgstr ""
+"Du kannst eine Gruppe nicht verlassen solange du der Administrator bist."
 
 #: actions/leavegroup.php:130
 #, fuzzy
 msgid "Could not find membership record."
-msgstr "Konnte Nutzereintrag nicht schreiben"
+msgstr "Konnte Mitgliedseintrag nicht finden."
 
 #: actions/leavegroup.php:138
 #, fuzzy, php-format
 msgid "Could not remove user %s to group %s"
-msgstr "Kann Nutzer %s nicht folgen: Nutzer nicht gefunden"
+msgstr "Konnte Benutzer %s aus der Gruppe %s nicht entfernen"
 
 #: actions/leavegroup.php:145
 #, php-format
 msgid "%s left group %s"
-msgstr ""
+msgstr "%s hat die Gruppe %s verlassen"
 
 #: actions/login.php:225 lib/facebookaction.php:304
+#, fuzzy
 msgid "Login to site"
-msgstr ""
+msgstr "An Seite anmelden"
 
 #: actions/microsummary.php:69
 msgid "No current status"
@@ -3946,31 +4059,31 @@ msgstr "Neue Gruppe"
 #: actions/newgroup.php:115
 #, fuzzy
 msgid "Use this form to create a new group."
-msgstr "Hier kannst du einen neuen Account erstellen. "
+msgstr "Benutzer dieses Formular, um eine neue Gruppe zu erstellen."
 
 #: actions/newgroup.php:177
 #, fuzzy
 msgid "Could not create group."
-msgstr "Konnte Tags nicht speichern."
+msgstr "Konnte Gruppe nicht erstellen."
 
 #: actions/newgroup.php:191
 #, fuzzy
 msgid "Could not set group membership."
-msgstr "Konnte Abonnement nicht erstellen."
+msgstr "Konnte Gruppenmitgliedschaft nicht setzen."
 
 #: actions/newmessage.php:119 actions/newnotice.php:132
 #, fuzzy
 msgid "That's too long. "
-msgstr "Diese Datei ist zu groß."
+msgstr "Das ist zu lang. "
 
 #: actions/newmessage.php:134
 msgid "Don't send a message to yourself; "
-msgstr ""
+msgstr "Schreibe dir selbst keine Nachrichten; "
 
 #: actions/newnotice.php:166
 #, fuzzy
 msgid "Notice posted"
-msgstr "Nachrichten"
+msgstr "Nachricht hinzugefügt"
 
 #: actions/newnotice.php:200 classes/Channel.php:163
 msgid "Ajax Error"
@@ -3980,6 +4093,8 @@ msgstr "Ajax Fehler"
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
+"Dieser Benutzer erlaubt keine Stupser oder hat seine E-Mailadresse noch "
+"nicht bestätigt."
 
 #: actions/nudge.php:94
 msgid "Nudge sent"
@@ -3997,20 +4112,20 @@ msgstr "OpenID Anmeldung"
 #: actions/openidsettings.php:128
 #, fuzzy
 msgid "Removing your only OpenID "
-msgstr "Entferne OpenID"
+msgstr "Entfernen deiner einzigen OpenID "
 
 #: actions/othersettings.php:60
 #, fuzzy
 msgid "Other Settings"
-msgstr "Einstellungen"
+msgstr "Andere Einstellungen"
 
 #: actions/othersettings.php:71
 msgid "Manage various other options."
-msgstr ""
+msgstr "Verwalte zahlreiche andere Einstellungen."
 
 #: actions/othersettings.php:93
 msgid "URL Auto-shortening"
-msgstr "URL Auto-Kürzung"
+msgstr "URL Auto-Verkürzung"
 
 #: actions/othersettings.php:112
 msgid "Service"
@@ -4022,17 +4137,17 @@ msgstr "URL Auto-Kürzungs Dienst."
 
 #: actions/othersettings.php:144
 msgid "URL shortening service is too long (max 50 chars)."
-msgstr "URL Aut-Kürzungs Dienst ist zu lange (max. 50 Zeichen)"
+msgstr "URL Auto-Kürzungs Dienst ist zu lange (max. 50 Zeichen)"
 
 #: actions/passwordsettings.php:69
 #, fuzzy
 msgid "Change your password."
-msgstr "Ändere dein Passwort"
+msgstr "Ändere dein Passwort,"
 
 #: actions/passwordsettings.php:89
 #, fuzzy
 msgid "Password change"
-msgstr "Passwort gespeichert."
+msgstr "Passwort gespeichert"
 
 #: actions/peopletag.php:35
 #, fuzzy, php-format
@@ -4052,7 +4167,7 @@ msgstr "Benutzer die sich selbst mit \"%s\" getagged haben "
 #: actions/profilesettings.php:91
 #, fuzzy
 msgid "Profile information"
-msgstr "Profil unbekannt"
+msgstr "Profilinformation"
 
 #: actions/profilesettings.php:124
 msgid ""
@@ -4064,9 +4179,7 @@ msgstr ""
 #: actions/profilesettings.php:144
 #, fuzzy
 msgid "Automatically subscribe to whoever "
-msgstr ""
-"Abonniere automatisch alle Kontakte, die mich abonnieren (sinnvoll für Nicht-"
-"Menschen)"
+msgstr "Abonniere automatisch alle Kontakte, die mich abonnieren "
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
 #, php-format
@@ -4080,11 +4193,11 @@ msgstr "Konnte Tags nicht speichern."
 #: actions/public.php:107
 #, fuzzy, php-format
 msgid "Public timeline, page %d"
-msgstr "Öffentliche Zeitleiste"
+msgstr "Öffentliche Zeitleiste, Seite %d"
 
 #: actions/public.php:173
 msgid "Could not retrieve public stream."
-msgstr "Konnte öffentlichen Stream nicht abrufen"
+msgstr "Konnte öffentlichen Stream nicht abrufen."
 
 #: actions/public.php:220
 #, php-format
@@ -4098,91 +4211,85 @@ msgstr ""
 #: actions/publictagcloud.php:57
 #, fuzzy
 msgid "Public tag cloud"
-msgstr "Feed des öffentlichen Streams"
+msgstr "Öffentliche Tag-Wolke"
 
 #: actions/publictagcloud.php:63
 #, php-format
 msgid "These are most popular recent tags on %s "
-msgstr ""
+msgstr "Das sind die beliebtesten Tags auf %s "
 
 #: actions/publictagcloud.php:119
 msgid "Tag cloud"
-msgstr ""
+msgstr "Tag-Wolke"
 
 #: actions/register.php:139 actions/register.php:349
 msgid "Sorry, only invited people can register."
-msgstr "Sorry, zum registrieren benötigst du eine Einladung."
+msgstr "Es tut uns leid, zum Registrieren benötigst du eine Einladung."
 
 #: actions/register.php:149
 #, fuzzy
 msgid "You can't register if you don't "
-msgstr ""
-"Du kannst dich nicht registrieren, wenn du die Lizenz nicht akzeptierst."
+msgstr "Du kannst dich nicht registrieren, wenn du nicht "
 
 #: actions/register.php:286
 #, fuzzy
 msgid "With this form you can create "
-msgstr "Hier kannst du einen neuen Account erstellen. "
+msgstr "Dieses Formular hilft die beim Erstellen von "
 
 #: actions/register.php:368
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, "
-msgstr "1-64 Kleinbuchstaben oder Ziffern, keine Sonder- oder Leerzeichen"
+msgstr "1-64 Kleinbuchstaben oder Ziffern, "
 
 #: actions/register.php:382 actions/register.php:386
 #, fuzzy
 msgid "Used only for updates, announcements, "
-msgstr ""
-"Wird nur für Updates, wichtige Mitteilungen und zur "
-"Passwortwiederherstellung verwendet"
+msgstr "Verwendet nur für Updates und wichtige Mitteilungen, "
 
 #: actions/register.php:398
 #, fuzzy
 msgid "URL of your homepage, blog, "
-msgstr ""
-"URL deiner Homepage, deines Blogs, oder deines Profils auf einer anderen Site"
+msgstr "URL deiner Homepage, Blogs, "
 
 #: actions/register.php:404
 #, fuzzy
 msgid "Describe yourself and your "
-msgstr "Beschreibe dich selbst in 140 Zeichen"
+msgstr "Beschreibe dich selbst und deine "
 
 #: actions/register.php:410
 #, fuzzy
 msgid "Where you are, like \"City, "
-msgstr "Wo du bist, z.B. \"Stadt, Gebiet, Land\""
+msgstr "Wo du bist, z.B. \"Stadt, "
 
 #: actions/register.php:432
 #, fuzzy
 msgid " except this private data: password, "
-msgstr ""
-"außer folgende private Daten: Passwort, E-Mail, Adresse, IM Adresse, "
-"Telefonnummer."
+msgstr " außer folgende private Daten: Passwort, "
 
 #: actions/register.php:471
 #, fuzzy, php-format
 msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
-msgstr ""
-"Gratulier, %s! Und willkommen auf %%%%site.name%%%%. Jetzt möchtest du "
-"vielleicht..."
+msgstr "Gratuliere, %s! Und willkommen auf %%%%site.name%%%%. "
 
 #: actions/register.php:495
+#, fuzzy
 msgid "(You should receive a message by email "
-msgstr ""
+msgstr "(Du solltest eine Nachricht per E-Mail erhalten "
 
 #: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
+#, fuzzy
 msgid "That's a local profile! Login to subscribe."
-msgstr ""
+msgstr "Das ist ein lokales Profil! Zum Abonnieren anmelden."
 
 #: actions/replies.php:118
 #, fuzzy, php-format
 msgid "Replies to %s, page %d"
-msgstr "Antworten an %s"
+msgstr "Antworten an %s, Seite %d"
 
 #: actions/showfavorites.php:79
 #, fuzzy, php-format
 msgid "%s favorite notices, page %d"
-msgstr "%s's favorisierte Nachrichten"
+msgstr "%ss favorisierte Nachrichten, Seite %d"
 
 #: actions/showgroup.php:77 lib/groupnav.php:85
 #, php-format
@@ -4192,44 +4299,45 @@ msgstr "%s Gruppe"
 #: actions/showgroup.php:79
 #, php-format
 msgid "%s group, page %d"
-msgstr ""
+msgstr "%s Gruppe, Seite %d"
 
 #: actions/showgroup.php:206
 #, fuzzy
 msgid "Group profile"
-msgstr "Unbekanntes Benutzer Profil."
+msgstr "Gruppenprofil"
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
 #, fuzzy
 msgid "Note"
-msgstr "Nachrichten"
+msgstr "Nachricht"
 
 #: actions/showgroup.php:270
 #, fuzzy
 msgid "Group actions"
-msgstr "Andere Optionen"
+msgstr "Gruppenaktionen"
 
 #: actions/showgroup.php:323
 #, fuzzy, php-format
 msgid "Notice feed for %s group"
-msgstr "Feed der Nachrichten von %s"
+msgstr "Nachrichtenfeed der Gruppe %s"
 
 #: actions/showgroup.php:357 lib/groupnav.php:90
 #, fuzzy
 msgid "Members"
-msgstr "Mitglied seit"
+msgstr "Mitglieder"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
 #: lib/tagcloudsection.php:71
+#, fuzzy
 msgid "(None)"
-msgstr ""
+msgstr "(Kein)"
 
 #: actions/showgroup.php:370
 msgid "All members"
@@ -4241,27 +4349,27 @@ msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
-"Dies ist %%site.name%%, ein [mikro-blogging] (http://de.wikipedia.org/wiki/"
-"Mikro-blogging) Dienst "
+"**%s** ist eine Benutzergruppe auf %%site.name%%, einem [mikro-blogging] "
+"(http://de.wikipedia.org/wiki/Mikro-blogging) Dienst "
 
 #: actions/showmessage.php:98
 msgid "Only the sender and recipient "
-msgstr ""
+msgstr "Nur der Absender und Empfänger "
 
 #: actions/showstream.php:73
 #, php-format
 msgid "%s, page %d"
-msgstr ""
+msgstr "%s, Seite %d"
 
 #: actions/showstream.php:143
 #, fuzzy
 msgid "'s profile"
-msgstr "Profil"
+msgstr "s Profil"
 
 #: actions/showstream.php:236 actions/tagother.php:77
 #, fuzzy
 msgid "User profile"
-msgstr "Benutzer hat kein Profil."
+msgstr "Benutzerprofil"
 
 #: actions/showstream.php:240 actions/tagother.php:81
 msgid "Photo"
@@ -4270,22 +4378,22 @@ msgstr "Foto"
 #: actions/showstream.php:317
 #, fuzzy
 msgid "User actions"
-msgstr "Andere Optionen"
+msgstr "Benutzeraktionen"
 
 #: actions/showstream.php:342
 #, fuzzy
 msgid "Send a direct message to this user"
-msgstr "Direkte Nachricht an %s abgeschickt"
+msgstr "Direkte Nachricht an Benutzer verschickt"
 
 #: actions/showstream.php:343
 #, fuzzy
 msgid "Message"
-msgstr "Neue Nachricht"
+msgstr "Nachricht"
 
 #: actions/showstream.php:451
 #, fuzzy
 msgid "All subscribers"
-msgstr "Abonnenten"
+msgstr "Alle Abonnenten"
 
 #: actions/showstream.php:533
 msgid "All groups"
@@ -4297,33 +4405,35 @@ msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
-"Dies ist %%site.name%%, ein [mikro-blogging] (http://de.wikipedia.org/wiki/"
-"Mikro-blogging) Dienst "
+"**%s** hat ein Konto auf %%site.name%%, einem [mikro-blogging] "
+"(http://de.wikipedia.org/wiki/Mikro-blogging) Dienst "
 
 #: actions/smssettings.php:128
 #, fuzzy
 msgid "Phone number, no punctuation or spaces, "
-msgstr "1-64 Kleinbuchstaben oder Ziffern, keine Sonder- oder Leerzeichen"
+msgstr "Telefonnummer, keine Satz- oder Leerzeichen, "
 
 #: actions/smssettings.php:162
 #, fuzzy
 msgid "Send me notices through SMS; "
-msgstr "Schicke mir Nachrichten mittels Jabber/GTalk."
+msgstr "Schicke mir Nachrichten per SMS; "
 
 #: actions/smssettings.php:335
 #, fuzzy
 msgid "A confirmation code was sent to the phone number you added. "
-msgstr "Warte auf die Bestätigung dieser Telefonnummer."
+msgstr ""
+"Ein Bestätigungscode wurde an die Telefonnummer gesendet, die du hinzugefügt "
+"hast. "
 
 #: actions/smssettings.php:453
 #, fuzzy
 msgid "Mobile carrier"
-msgstr "Wähle einen Netzanbieter"
+msgstr "Netzanbieter"
 
 #: actions/subedit.php:70
 #, fuzzy
 msgid "You are not subscribed to that profile."
-msgstr "Dieses Profil hast du uns nicht geschickt"
+msgstr "Du hast dieses Profil nicht abonniert."
 
 #: actions/subedit.php:83
 #, fuzzy
@@ -4333,7 +4443,7 @@ msgstr "Konnte Abonnement nicht erstellen."
 #: actions/subscribe.php:55
 #, fuzzy
 msgid "Not a local user."
-msgstr "Unbekannter Benutzer."
+msgstr "Kein lokaler Benutzer."
 
 #: actions/subscribe.php:69
 msgid "Subscribed"
@@ -4342,42 +4452,43 @@ msgstr "Abonniert"
 #: actions/subscribers.php:50
 #, fuzzy, php-format
 msgid "%s subscribers"
-msgstr "Abonnenten"
+msgstr "%s Abonnenten"
 
 #: actions/subscribers.php:52
 #, php-format
+#, fuzzy
 msgid "%s subscribers, page %d"
-msgstr ""
+msgstr "%s Abonnenten, Seite %d"
 
 #: actions/subscribers.php:63
 #, fuzzy
 msgid "These are the people who listen to "
-msgstr "Dies sind die Leute, die %ss Nachrichten lesen."
+msgstr "Folgende Leute lesen "
 
 #: actions/subscribers.php:67
 #, fuzzy, php-format
 msgid "These are the people who "
-msgstr "Dies sind die Leute, die %ss Nachrichten lesen."
+msgstr "Folgende Leute "
 
 #: actions/subscriptions.php:52
 #, fuzzy, php-format
 msgid "%s subscriptions"
-msgstr "Alle Abonnements"
+msgstr "%s Abonnements"
 
 #: actions/subscriptions.php:54
 #, fuzzy, php-format
 msgid "%s subscriptions, page %d"
-msgstr "Alle Abonnements"
+msgstr "%s Abonnements, Seite %d"
 
 #: actions/subscriptions.php:65
 #, fuzzy
 msgid "These are the people whose notices "
-msgstr "Dies sind die Leute, deren Nachrichten %s liest."
+msgstr "Dies sind die Leute, deren Nachrichten "
 
 #: actions/subscriptions.php:69
 #, fuzzy, php-format
 msgid "These are the people whose "
-msgstr "Dies sind die Leute, die %ss Nachrichten lesen."
+msgstr "Dies sind die Leute, deren "
 
 #: actions/subscriptions.php:122
 msgid "Jabber"
@@ -4386,17 +4497,18 @@ msgstr "Jabber"
 #: actions/tag.php:43
 #, fuzzy, php-format
 msgid "Notices tagged with %s, page %d"
-msgstr "Nachrichten, die mit %s getagt sind"
+msgstr "Nachrichten, die mit %s getagt sind, Seite %d"
 
 #: actions/tag.php:66
 #, php-format
+#, fuzzy
 msgid "Messages tagged \"%s\", most recent first"
-msgstr ""
+msgstr "Nachrichten getagt mit \"%s\", neueste zuerst"
 
 #: actions/tagother.php:33
 #, fuzzy
 msgid "Not logged in"
-msgstr "Nicht eingeloggt."
+msgstr "Nicht angemeldet"
 
 #: actions/tagother.php:39
 #, fuzzy
@@ -4406,12 +4518,12 @@ msgstr "Kein id Argument."
 #: actions/tagother.php:65
 #, fuzzy, php-format
 msgid "Tag %s"
-msgstr "Tags"
+msgstr "Tag %s"
 
 #: actions/tagother.php:141
 #, fuzzy
 msgid "Tag user"
-msgstr "Tags"
+msgstr "Benutzer taggen"
 
 #: actions/tagother.php:149
 msgid ""
@@ -4424,21 +4536,25 @@ msgstr ""
 #: actions/tagother.php:164
 #, fuzzy
 msgid "There was a problem with your session token."
-msgstr "Es gab ein Problem mit deinem Session Token. Bitte versuche es erneut."
+msgstr "Es gab ein Problem mit deinem Sessiontoken."
 
 #: actions/tagother.php:191
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
-msgstr "Du kannst nur Benutzer taggen die du abonniert hast."
+msgstr ""
+"Du kannst nur Benutzer taggen, die du abonniert hast oder die dich abonniert "
+"haben."
 
 #: actions/tagother.php:198
-#, fuzzy
 msgid "Could not save tags."
 msgstr "Konnte Tags nicht speichern."
 
 #: actions/tagother.php:233
+#, fuzzy
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
+"Benutze dieses Formular, um Tags zu deinen Abonnenten oder Abonnements "
+"hinzuzufügen."
 
 #: actions/tagrss.php:35
 #, fuzzy
@@ -4448,66 +4564,67 @@ msgstr "Tag nicht vorhanden."
 #: actions/tagrss.php:66
 #, fuzzy, php-format
 msgid "Microblog tagged with %s"
-msgstr "Microblog getagged mit %s"
+msgstr "Microblog getaggt mit %s"
 
 #: actions/twitapiblocks.php:47
 msgid "Block user failed."
-msgstr "Blocken des Benutzer fehlgeschlagen."
+msgstr "Blockieren des Benutzers fehlgeschlagen."
 
 #: actions/twitapiblocks.php:69
+#, fuzzy
 msgid "Unblock user failed."
-msgstr ""
+msgstr "Freigeben des Benutzers fehlgeschlagen."
 
 #: actions/twitapiusers.php:48
-#, fuzzy
 msgid "Not found."
-msgstr "Keine Anfrage gefunden!"
+msgstr "Nicht gefunden."
 
 #: actions/twittersettings.php:71
+#, fuzzy
 msgid "Add your Twitter account to automatically send "
-msgstr ""
+msgstr "Füge dein Twitter Konto hinzu zum automatischen Versenden von "
 
 #: actions/twittersettings.php:119
 msgid "Twitter user name"
 msgstr "Twitter Benutzername"
 
 #: actions/twittersettings.php:126
-#, fuzzy
 msgid "Twitter password"
-msgstr "Neues Passwort"
+msgstr "Twitter Passwort"
 
 #: actions/twittersettings.php:228
 msgid "Twitter Friends"
 msgstr "Twitter Freunde"
 
 #: actions/twittersettings.php:327
+#, fuzzy
 msgid "Username must have only numbers, "
-msgstr ""
+msgstr "Für den Benutzernamen gelten nur Nummern, "
 
 #: actions/twittersettings.php:341
 #, fuzzy, php-format
 msgid "Unable to retrieve account information "
-msgstr "Konnte Block Daten nicht speichern."
+msgstr "Konnte Kontoinformationen nicht abrufen "
 
 #: actions/unblock.php:108
 #, fuzzy
 msgid "Error removing the block."
-msgstr "Fehler beim Speichern des Nutzers."
+msgstr "Fehler beim Freigeben des Benutzers."
 
 #: actions/unsubscribe.php:50
 #, fuzzy
 msgid "No profile id in request."
-msgstr "Der entfernte Server hat keine Profil-URL geliefert."
+msgstr "Der entfernte Server hat keine Profil-ID geliefert."
 
 #: actions/unsubscribe.php:57
 #, fuzzy
 msgid "No profile with that id."
-msgstr "Entferntes Profil ohne ein passendes Profil"
+msgstr "Kein Profil mit dieser ID."
 
 #: actions/unsubscribe.php:71
 #, fuzzy
 msgid "Unsubscribed"
-msgstr "Abbestellen"
+msgstr "Abbestellt"
 
 #: actions/usergroups.php:63
 #, php-format
@@ -4522,30 +4639,33 @@ msgstr "%s Gruppen, Seite %d"
 #: classes/Notice.php:104
 #, fuzzy
 msgid "Problem saving notice. Unknown user."
-msgstr "Problem bei Speichern der Nachricht."
+msgstr "Problem bei Speichern der Nachricht. Unbekannter Benutzer."
 
 #: classes/Notice.php:109
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
+"Zu schnell zu viele Nachrichten; atme kurz durch und schicke sie erneut in "
+"ein paar Minuten ab."
 
 #: classes/Notice.php:116
 msgid "You are banned from posting notices on this site."
-msgstr ""
+msgstr "Du wurdest für das Schreiben von Nachrichten auf dieser Seite gesperrt."
 
 #: lib/accountsettingsaction.php:108
 #, fuzzy
 msgid "Upload an avatar"
-msgstr "Aktualisierung des Avatars fehlgeschlagen"
+msgstr "Avatar hochladen"
 
 #: lib/accountsettingsaction.php:119
 #, fuzzy
 msgid "Other"
-msgstr "Anderes"
+msgstr "Sonstige"
 
 #: lib/accountsettingsaction.php:120
+#, fuzzy
 msgid "Other options"
-msgstr "Andere Optionen"
+msgstr "Sonstige Optionen"
 
 #: lib/action.php:130
 #, fuzzy, php-format
@@ -4554,56 +4674,59 @@ msgstr "%s (%s)"
 
 #: lib/action.php:145
 msgid "Untitled page"
-msgstr ""
+msgstr "Seite ohne Titel"
 
 #: lib/action.php:316
 msgid "Primary site navigation"
-msgstr ""
+msgstr "Hauptnavigation"
 
 #: lib/action.php:322
+#, fuzzy
 msgid "Personal profile and friends timeline"
-msgstr ""
+msgstr "Persönliches Profil und Freundes-Zeitleiste"
 
 #: lib/action.php:325
+#, fuzzy
 msgid "Search for people or text"
-msgstr ""
+msgstr "Suche nach Leuten oder Text"
 
 #: lib/action.php:328
-#, fuzzy
 msgid "Account"
-msgstr "Über"
+msgstr "Konto"
 
 #: lib/action.php:328
 #, fuzzy
 msgid "Change your email, avatar, password, profile"
-msgstr "Ändere dein Passwort"
+msgstr "Ändere deine E-Mail, dein Avatar, Passwort, Profil"
 
 #: lib/action.php:330
+#, fuzzy
 msgid "Connect to IM, SMS, Twitter"
-msgstr ""
+msgstr "Verbinde zu IM, SMS, Twitter"
 
 #: lib/action.php:332
+#, fuzzy
 msgid "Logout from the site"
-msgstr "Ausloggen"
+msgstr "Von der Seite abmelden"
 
 #: lib/action.php:335
+#, fuzzy
 msgid "Login to the site"
-msgstr "Einloggen"
+msgstr "Auf der Seite anmelden"
 
 #: lib/action.php:338
-#, fuzzy
 msgid "Create an account"
-msgstr "Neues Konto anlegen"
+msgstr "Neues Konto erstellen"
 
 #: lib/action.php:341
 #, fuzzy
 msgid "Login with OpenID"
-msgstr "Diese OpenID ist nicht bekannt."
+msgstr "Mit OpenID anmelden"
 
 #: lib/action.php:344
 #, fuzzy
 msgid "Help me!"
-msgstr "Hilfe"
+msgstr "Hilf mir!"
 
 #: lib/action.php:362
 #, fuzzy
@@ -4611,8 +4734,9 @@ msgid "Site notice"
 msgstr "Neue Nachricht"
 
 #: lib/action.php:417
+#, fuzzy
 msgid "Local views"
-msgstr ""
+msgstr "Lokale Ansichten"
 
 #: lib/action.php:472
 #, fuzzy
@@ -4622,25 +4746,27 @@ msgstr "Neue Nachricht"
 #: lib/action.php:562
 #, fuzzy
 msgid "Secondary site navigation"
-msgstr "Abonnements"
+msgstr "Unternavigation"
 
 #: lib/action.php:602 lib/action.php:623
+#, fuzzy
 msgid "Laconica software license"
-msgstr ""
+msgstr "Laconica Software Lizenz"
 
 #: lib/action.php:630
 #, fuzzy
 msgid "All "
-msgstr "Alle"
+msgstr "Alle "
 
 #: lib/action.php:635
+#, fuzzy
 msgid "license."
-msgstr ""
+msgstr "Lizenz."
 
 #: lib/blockform.php:123 lib/blockform.php:153
 #, fuzzy
 msgid "Block this user"
-msgstr "Blocke Benutzer"
+msgstr "Benutzer blockieren"
 
 #: lib/blockform.php:153
 msgid "Block"
@@ -4649,17 +4775,17 @@ msgstr "Blockieren"
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
 #, fuzzy
 msgid "Disfavor this notice"
-msgstr "%s's favorisierte Nachrichten"
+msgstr "Aus Favoriten entfernen"
 
 #: lib/facebookaction.php:268
 #, php-format
 msgid "To use the %s Facebook Application you need to login "
-msgstr ""
+msgstr "Um die %s Facebookanwendung zu benutzen, musst du dich anmelden "
 
 #: lib/facebookaction.php:271
 #, fuzzy
 msgid " a new account."
-msgstr "Neues Konto anlegen"
+msgstr " ein neues Konto."
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
 #, fuzzy
@@ -4669,7 +4795,7 @@ msgstr "Öffentlich"
 #: lib/favorform.php:114 lib/favorform.php:140
 #, fuzzy
 msgid "Favor this notice"
-msgstr "%s's favorisierte Nachrichten"
+msgstr "Zu den Favoriten hinzufügen"
 
 #: lib/feedlist.php:64
 msgid "Export data"
@@ -4688,57 +4814,61 @@ msgid "Tag"
 msgstr "Tag"
 
 #: lib/galleryaction.php:138
+#, fuzzy
 msgid "Choose a tag to narrow list"
-msgstr ""
+msgstr "Wähle einen Tag, um die Liste einzuschränken"
 
 #: lib/galleryaction.php:139
+#, fuzzy
 msgid "Go"
-msgstr ""
+msgstr "Los"
 
 #: lib/groupeditform.php:148
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
-msgstr ""
-"URL deiner Homepage, deines Blogs, oder deines Profils auf einer anderen Site"
+msgstr "URL der Homepage oder Blogs der Gruppe oder des Themas"
 
 #: lib/groupeditform.php:151
 #, fuzzy
 msgid "Description"
-msgstr "Abonnements"
+msgstr "Beschreibung"
 
 #: lib/groupeditform.php:153
 #, fuzzy
 msgid "Describe the group or topic in 140 chars"
-msgstr "Beschreibe dich selbst in 140 Zeichen"
+msgstr "Beschreibe die Gruppe oder das Thema in 140 Zeichen"
 
 #: lib/groupeditform.php:158
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr "Wo du bist, z.B. \"Stadt, Gebiet, Land\""
+msgstr "Ort der Gruppe, optional, z.B. \"Stadt, Gebiet (oder Region), Land\""
 
 #: lib/groupnav.php:84 lib/searchgroupnav.php:84
 msgid "Group"
 msgstr "Gruppe"
 
 #: lib/groupnav.php:100
+#, fuzzy
 msgid "Admin"
-msgstr ""
+msgstr "Admin"
 
 #: lib/groupnav.php:101
 #, php-format
+#, fuzzy
 msgid "Edit %s group properties"
-msgstr ""
+msgstr "%s Gruppeneinstellungen bearbeiten"
 
 #: lib/groupnav.php:106
 #, fuzzy
 msgid "Logo"
-msgstr "Abmelden"
+msgstr "Logo"
 
 #: lib/groupnav.php:107
 #, php-format
+#, fuzzy
 msgid "Add or edit %s logo"
-msgstr ""
+msgstr "%s Logo hinzufügen oder bearbeiten"
 
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
@@ -4750,66 +4880,73 @@ msgstr "Gruppen mit den meisten Beiträgen"
 
 #: lib/grouptagcloudsection.php:56
 #, php-format
+#, fuzzy
 msgid "Tags in %s group's notices"
-msgstr ""
+msgstr "Tags in den Nachrichten der Gruppe %s"
 
 #: lib/htmloutputter.php:104
 #, fuzzy
 msgid "This page is not available in a "
-msgstr "Dies Seite liegt in keinem von dir akzeptierten Mediatype vor."
+msgstr "Diese Seite liegt in nicht verfügbar in einem "
 
 #: lib/joinform.php:114
 #, fuzzy
 msgid "Join"
-msgstr "Einloggen"
+msgstr "Beitreten"
 
 #: lib/leaveform.php:114
 #, fuzzy
 msgid "Leave"
-msgstr "Speichern"
+msgstr "Verlassen"
 
 #: lib/logingroupnav.php:76
 #, fuzzy
 msgid "Login with a username and password"
-msgstr "Benutzername oder Passwort falsch."
+msgstr "Anmelden mit einem Benutzernamen und Passwort"
 
 #: lib/logingroupnav.php:79
 #, fuzzy
 msgid "Sign up for a new account"
-msgstr "Neues Konto anlegen"
+msgstr "Für ein neues Konto registrieren"
 
 #: lib/logingroupnav.php:82
 msgid "Login or register with OpenID"
-msgstr "Einloggen oder registrieren mit OpenID"
+msgstr "Anmelden oder registrieren mit OpenID"
 
 #: lib/mail.php:175
 #, php-format
+#, fuzzy
 msgid ""
 "Hey, %s.\n"
 "\n"
 msgstr ""
+"Hallo, %s.\n"
+"\n"
 
 #: lib/mail.php:236
 #, fuzzy, php-format
 msgid "%1$s is now listening to "
-msgstr "%1$s hat deine Nachrichten auf %2$s abonniert."
+msgstr "%1$s liest ab sofort "
 
 #: lib/mail.php:254
 #, fuzzy, php-format
 msgid "Location: %s\n"
-msgstr "Standort: %s"
+msgstr "Standort: %s\n"
 
 #: lib/mail.php:256
 #, fuzzy, php-format
 msgid "Homepage: %s\n"
-msgstr "Homepage: %s"
+msgstr "Homepage: %s\n"
 
 #: lib/mail.php:258
 #, php-format
+#, fuzzy
 msgid ""
 "Bio: %s\n"
 "\n"
 msgstr ""
+"Biografie: %s\n"
+"\n"
 
 #: lib/mail.php:461
 #, php-format
@@ -4819,49 +4956,47 @@ msgstr "Du wurdest von %s angestupst"
 #: lib/mail.php:465
 #, fuzzy, php-format
 msgid "%1$s (%2$s) is wondering what you are up to "
-msgstr ""
-"%s$s (%2$s) hat dir einen private Nachricht geschickt:\n"
-"\n"
+msgstr "%s$s (%2$s) fragt sich was du so machst "
 
 #: lib/mail.php:555
 #, fuzzy, php-format
 msgid "%1$s just added your notice from %2$s"
-msgstr "%1$s hat deine Nachrichten auf %2$s abonniert."
+msgstr "%1$s hat deine Nachrichten von %2$s hinzugefügt"
 
 #: lib/mailbox.php:229 lib/noticelist.php:380
 #, fuzzy
 msgid "From"
-msgstr "von"
+msgstr "Von"
 
 #: lib/messageform.php:110
 #, fuzzy
 msgid "Send a direct notice"
-msgstr "Notiz löschen"
+msgstr "Versende eine direkte Nachricht"
 
 #: lib/noticeform.php:125
 #, fuzzy
 msgid "Send a notice"
-msgstr "Sende einen Stupser"
+msgstr "Nachricht versenden"
 
 #: lib/noticeform.php:152
 #, fuzzy
 msgid "Available characters"
-msgstr "6 oder mehr Zeichen"
+msgstr "Verfügbare Zeichen"
 
 #: lib/noticelist.php:426
 #, fuzzy
 msgid "in reply to"
-msgstr "als Antwort auf... "
+msgstr "als Antwort auf"
 
 #: lib/noticelist.php:447 lib/noticelist.php:450
 #, fuzzy
 msgid "Reply to this notice"
-msgstr "Die Nachricht konnte nicht gelöscht werden."
+msgstr "Auf diese Nachricht antworten"
 
 #: lib/noticelist.php:451
 #, fuzzy
 msgid "Reply"
-msgstr "antworten"
+msgstr "Antworten"
 
 #: lib/noticelist.php:471 lib/noticelist.php:474
 #, fuzzy
@@ -4871,57 +5006,58 @@ msgstr "Notiz löschen"
 #: lib/noticelist.php:474
 #, fuzzy
 msgid "Delete"
-msgstr "Notiz löschen"
+msgstr "Löschen"
 
 #: lib/nudgeform.php:116
 #, fuzzy
 msgid "Nudge this user"
-msgstr "Stups abgeschickt"
+msgstr "Diesen Benutzer stupsen"
 
 #: lib/nudgeform.php:128
 #, fuzzy
 msgid "Nudge"
-msgstr "Stups abgeschickt"
+msgstr "Stups"
 
 #: lib/nudgeform.php:128
 #, fuzzy
 msgid "Send a nudge to this user"
-msgstr "Sende einen Stupser"
+msgstr "Sende diesem Benutzer einen Stupser"
 
 #: lib/personaltagcloudsection.php:56
 #, php-format
+#, fuzzy
 msgid "Tags in %s's notices"
-msgstr ""
+msgstr "Tags in %ss Nachrichten"
 
 #: lib/profilelist.php:182
+#, fuzzy
 msgid "(none)"
-msgstr ""
+msgstr "(leer)"
 
 #: lib/publicgroupnav.php:76
 msgid "Public"
 msgstr "Öffentlich"
 
 #: lib/publicgroupnav.php:80
-#, fuzzy
 msgid "User groups"
 msgstr "Benutzer-Gruppen"
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
 msgid "Recent tags"
-msgstr "Kürzliche Tags"
+msgstr "Aktuelle Tags"
 
 #: lib/publicgroupnav.php:86
 msgid "Featured"
-msgstr ""
+msgstr "Featured"
 
 #: lib/publicgroupnav.php:90
-#, fuzzy
 msgid "Popular"
-msgstr "Suche nach anderen Nutzern"
+msgstr "Beliebt"
 
 #: lib/searchgroupnav.php:82
+#, fuzzy
 msgid "Notice"
-msgstr "Hinweis"
+msgstr "Nachricht"
 
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
@@ -4929,58 +5065,58 @@ msgstr "Finde Gruppen auf dieser Seite"
 
 #: lib/section.php:89
 msgid "Untitled section"
-msgstr ""
+msgstr "Abschnitt ohne Titel"
 
 #: lib/subgroupnav.php:81
 #, fuzzy, php-format
 msgid "People %s subscribes to"
-msgstr "Entferntes Abonnement"
+msgstr "Leute, die %s abonniert hat"
 
 #: lib/subgroupnav.php:89
 #, fuzzy, php-format
 msgid "People subscribed to %s"
-msgstr "%s abonniert"
+msgstr "Leute, die %s abonniert haben"
 
 #: lib/subgroupnav.php:97
 #, php-format
+#, fuzzy
 msgid "Groups %s is a member of"
-msgstr ""
+msgstr "Gruppen zu denen %s gehört"
 
 #: lib/subgroupnav.php:104
 #, fuzzy, php-format
 msgid "Invite friends and colleagues to join you on %s"
-msgstr "Lade deine Freunde und Kollegen ein diesen Dienst zu nutzen."
+msgstr "Lade Freunde und Kollegen ein dir auf %s beizutreten"
 
 #: lib/subs.php:53
-#, fuzzy
 msgid "User has blocked you."
-msgstr "Dieser Bemutzer hat Dich geblockt"
+msgstr "Dieser Benutzer hat dich blockiert."
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
 #, fuzzy
 msgid "Subscribe to this user"
-msgstr "%s abonniert"
+msgstr "Abonniere diesen Benutzer"
 
 #: lib/tagcloudsection.php:56
-#, fuzzy
 msgid "None"
-msgstr "Nein"
+msgstr "Nichts"
 
 #: lib/topposterssection.php:74
 msgid "Top posters"
-msgstr "Top-Poster"
+msgstr "Top-Schreiber"
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
+#, fuzzy
 msgid "Unblock this user"
-msgstr "Entblocke Benutzer"
+msgstr "Benutzer freigeben"
 
 #: lib/unblockform.php:150
 msgid "Unblock"
-msgstr "entblocken"
+msgstr "Freigeben"
 
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
-msgstr ""
+msgstr "Lösche dein Abonnement von diesem Benutzer"
 
 #~ msgid "Code not yet ready."
 #~ msgstr "Code noch nicht fertig."
diff --git a/locale/en_GB/LC_MESSAGES/laconica.mo b/locale/en_GB/LC_MESSAGES/laconica.mo
index 1459714e8..93ff37f9d 100644
--- a/locale/en_GB/LC_MESSAGES/laconica.mo
+++ b/locale/en_GB/LC_MESSAGES/laconica.mo
diff --git a/locale/en_GB/LC_MESSAGES/laconica.po b/locale/en_GB/LC_MESSAGES/laconica.po
index ec910d6e2..4e261723f 100644
--- a/locale/en_GB/LC_MESSAGES/laconica.po
+++ b/locale/en_GB/LC_MESSAGES/laconica.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-03-12 16:15+0000\n"
-"Last-Translator: Evan Prodromou <evan@controlyourself.ca>\n"
+"PO-Revision-Date: 2009-05-21 01:42+0000\n"
+"Last-Translator: Bruce Cowan <l10n@bcowan.fastmail.co.uk>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@ msgstr ""
 #: actions/noticesearchrss.php:88
 #, php-format
 msgid " Search Stream for \"%s\""
-msgstr "Search Stream for \"%s\""
+msgstr " Search Stream for \"%s\""
 
 # Adjusted for grammar.
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
@@ -30,8 +30,8 @@ msgstr "Search Stream for \"%s\""
 msgid ""
 " except this private data: password, email address, IM address, phone number."
 msgstr ""
-"except for the following private data: password, e-mail address, Instant "
-"Messenger address and phone number."
+" except this private data: password, e-mail address, IM address, phone "
+"number."
 
 #: ../actions/showstream.php:400 ../lib/stream.php:109
 #: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
@@ -188,8 +188,8 @@ msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr ""
-"(You should receive an e-mail message in a moment, containing instructions "
-"on how to confirm your e-mail address.)"
+"(You should receive a message by e-mail momentarily, with instructions on "
+"how to confirm your e-mail address.)"
 
 #: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
 #, php-format
@@ -198,42 +198,42 @@ msgid ""
 "broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
 "**%%site.name%%** is a microblogging service brought to you by "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"[%%site.broughtby%%](%%site.broughtbyurl%%)."
 
 #: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** is a microblogging service."
 
 #: ../lib/util.php:274 lib/util.php:290
 msgid ". Contributors should be attributed by full name or nickname."
-msgstr ""
+msgstr ". Contributors should be attributed by full name or nickname."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
 #: lib/groupeditform.php:139
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
+msgstr "1-64 lowercase letters or numbers, no punctuation or spaces"
 
 #: ../actions/register.php:152 actions/register.php:166
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
+msgstr "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
 #: actions/passwordsettings.php:102
 msgid "6 or more characters"
-msgstr ""
+msgstr "6 or more characters"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
 #: actions/recoverpassword.php:220
 msgid "6 or more characters, and don't forget it!"
-msgstr "6 or more characters, and don’t forget it!"
+msgstr "6 or more characters, and don't forget it!"
 
 #: ../actions/register.php:154 actions/register.php:168
 #: actions/register.php:373
 msgid "6 or more characters. Required."
-msgstr ""
+msgstr "6 or more characters. Required."
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, php-format
@@ -241,22 +241,24 @@ msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
 "s for sending messages to you."
 msgstr ""
+"A confirmation code was sent to the IM address you added. You must approve "
+"%s for sending messages to you."
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
 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 ""
-"A confirmation code was sent to the e-mail address you added. Check your in-"
-"box (and spam box!) for the code and instructions on how to use it."
+"A confirmation code was sent to the e-mail address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
 
 #: ../actions/smssettings.php:216 actions/smssettings.php:224
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your inbox "
 "(and spam box!) for the code and instructions on how to use it."
 msgstr ""
-"A confirmation code was sent to the phone number you added. Check your in-"
-"box (and spam box!) for the code and instructions on how to use it."
+"A confirmation code was sent to the phone number you added. Check your inbox "
+"(and spam box!) for the code and instructions on how to use it."
 
 #: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
 #: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
@@ -278,7 +280,7 @@ msgstr ""
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
 #: actions/twitapiusers.php:32
 msgid "API method not found!"
-msgstr ""
+msgstr "API method not found!"
 
 #: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
 #: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
@@ -301,16 +303,16 @@ msgstr ""
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
 #: actions/twitapistatuses.php:562
 msgid "API method under construction."
-msgstr ""
+msgstr "API method under construction."
 
 #: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
 msgid "About"
-msgstr ""
+msgstr "About"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
 #: actions/userauthorization.php:143
 msgid "Accept"
-msgstr ""
+msgstr "Accept"
 
 #: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
 #: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
@@ -320,17 +322,17 @@ msgstr ""
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
 msgid "Add"
-msgstr ""
+msgstr "Add"
 
 #: ../actions/openidsettings.php:43 actions/openidsettings.php:44
 #: actions/openidsettings.php:93
 msgid "Add OpenID"
-msgstr ""
+msgstr "Add OpenID"
 
 #: ../lib/settingsaction.php:97 lib/settingsaction.php:91
 #: lib/accountsettingsaction.php:117
 msgid "Add or remove OpenIDs"
-msgstr ""
+msgstr "Add or remove OpenIDs"
 
 #: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
@@ -338,28 +340,28 @@ msgstr ""
 #: actions/emailsettings.php:94 actions/imsettings.php:94
 #: actions/smssettings.php:92
 msgid "Address"
-msgstr ""
+msgstr "Address"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
 msgid "Addresses of friends to invite (one per line)"
-msgstr ""
+msgstr "Addresses of friends to invite (one per line)"
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
 #: actions/showstream.php:422
 msgid "All subscriptions"
-msgstr ""
+msgstr "All subscriptions"
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
 #: actions/publicrss.php:92
 #, php-format
 msgid "All updates for %s"
-msgstr ""
+msgstr "All updates for %s"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
 #: actions/noticesearchrss.php:90
 #, php-format
 msgid "All updates matching search term \"%s\""
-msgstr "All updates matching search term ‘%s’"
+msgstr "All updates matching search term \"%s\""
 
 #: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
 #: ../actions/openidlogin.php:29 ../actions/register.php:30
@@ -368,7 +370,7 @@ msgstr "All updates matching search term ‘%s’"
 #: actions/finishopenidlogin.php:34 actions/login.php:77
 #: actions/openidlogin.php:30 actions/register.php:92
 msgid "Already logged in."
-msgstr ""
+msgstr "Already logged in."
 
 #: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
 msgid "Already subscribed!."
@@ -377,7 +379,7 @@ msgstr "Already subscribed!"
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
 #: actions/deletenotice.php:113
 msgid "Are you sure you want to delete this notice?"
-msgstr ""
+msgstr "Are you sure you want to delete this notice?"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 #: actions/userauthorization.php:81
@@ -387,54 +389,59 @@ msgstr "Authorise subscription"
 #: ../actions/login.php:104 ../actions/register.php:178
 #: actions/register.php:192
 msgid "Automatically login in the future; not for shared computers!"
-msgstr "Automatically log-in in the future; not for shared computers!"
+msgstr "Automatically login in the future; not for shared computers!"
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
 
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
 msgid "Avatar"
-msgstr ""
+msgstr "Avatar"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395
 msgid "Avatar updated."
-msgstr ""
+msgstr "Avatar updated."
 
+# Buddy?
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
 #, php-format
+#, fuzzy
 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 ""
+"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
+"message with further instructions. (Did you add %s to your buddy list?)"
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
-"Awaiting confirmation on this address. Check your in-box (and spam box!) for "
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
 #: actions/smssettings.php:111
 msgid "Awaiting confirmation on this phone number."
-msgstr ""
+msgstr "Awaiting confirmation on this phone number."
 
 #  erm, not sure what to do here, » is recognised as a quotation mark.
 #: ../lib/util.php:1318 lib/util.php:1452
 msgid "Before »"
-msgstr "Before →"
+msgstr "Before »"
 
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
 msgid "Bio"
-msgstr ""
+msgstr "Bio"
 
 #: ../actions/profilesettings.php:101 ../actions/register.php:82
 #: ../actions/updateprofile.php:103 actions/profilesettings.php:216
@@ -442,23 +449,23 @@ msgstr ""
 #: actions/profilesettings.php:205 actions/register.php:174
 #: actions/updateprofile.php:107
 msgid "Bio is too long (max 140 chars)."
-msgstr "Bio is too long (max 140 chars)"
+msgstr "Bio is too long (max 140 chars)."
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
 msgid "Can't delete this notice."
-msgstr "Can’t delete this notice."
+msgstr "Can't delete this notice."
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #: actions/updateprofile.php:123
 #, php-format
 msgid "Can't read avatar URL '%s'"
-msgstr "Can’t read avatar URL ‘%s’"
+msgstr "Can't read avatar URL '%s'"
 
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 msgid "Can't save new password."
-msgstr "Can’t save new password."
+msgstr "Can't save new password."
 
 #: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
 #: ../actions/smssettings.php:62 actions/emailsettings.php:58
@@ -466,7 +473,7 @@ msgstr "Can’t save new password."
 #: actions/emailsettings.php:111 actions/imsettings.php:114
 #: actions/smssettings.php:114
 msgid "Cancel"
-msgstr ""
+msgstr "Cancel"
 
 #: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
 msgid "Cannot instantiate OpenID consumer object."
@@ -485,7 +492,7 @@ msgstr "Cannot normalise that e-mail address"
 #: ../actions/password.php:45 actions/profilesettings.php:184
 #: actions/passwordsettings.php:110
 msgid "Change"
-msgstr ""
+msgstr "Change"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
 #: lib/accountsettingsaction.php:114
@@ -495,16 +502,16 @@ msgstr "Change e-mail handling"
 #: ../actions/password.php:32 actions/profilesettings.php:36
 #: actions/passwordsettings.php:58
 msgid "Change password"
-msgstr ""
+msgstr "Change password"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
 msgid "Change your password"
-msgstr ""
+msgstr "Change your password"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
 #: lib/accountsettingsaction.php:105
 msgid "Change your profile settings"
-msgstr ""
+msgstr "Change your profile settings"
 
 #: ../actions/password.php:43 ../actions/recoverpassword.php:181
 #: ../actions/register.php:155 ../actions/smssettings.php:65
@@ -513,12 +520,12 @@ msgstr ""
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
 msgid "Confirm"
-msgstr ""
+msgstr "Confirm"
 
 #: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
 #: actions/confirmaddress.php:144
 msgid "Confirm Address"
-msgstr ""
+msgstr "Confirm Address"
 
 #: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
 #: ../actions/smssettings.php:245 actions/emailsettings.php:256
@@ -526,17 +533,17 @@ msgstr ""
 #: actions/emailsettings.php:379 actions/imsettings.php:361
 #: actions/smssettings.php:374
 msgid "Confirmation cancelled."
-msgstr ""
+msgstr "Confirmation cancelled."
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
 #: actions/smssettings.php:118
 msgid "Confirmation code"
-msgstr ""
+msgstr "Confirmation code"
 
 #: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 #: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
-msgstr ""
+msgstr "Confirmation code not found."
 
 #: ../actions/register.php:202
 #, php-format
@@ -556,20 +563,34 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to...\n"
+"\n"
+"* Go to [your profile](%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."
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
 #: actions/finishopenidlogin.php:119 lib/action.php:330
 msgid "Connect"
-msgstr ""
+msgstr "Connect"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
 #: actions/finishopenidlogin.php:114
 msgid "Connect existing account"
-msgstr ""
+msgstr "Connect existing account"
 
 #: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
 msgid "Contact"
-msgstr ""
+msgstr "Contact"
 
 #  Thought form was incorrect
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
@@ -582,45 +603,45 @@ msgstr "Could not create OpenID from: %s"
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
 #, php-format
 msgid "Could not follow user: %s is already on your list."
-msgstr ""
+msgstr "Could not follow user: %s is already on your list."
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
 #: actions/twitapifriendships.php:41
 msgid "Could not follow user: User not found."
-msgstr ""
+msgstr "Could not follow user: User not found."
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
 #, php-format
 msgid "Could not redirect to server: %s"
-msgstr ""
+msgstr "Could not redirect to server: %s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
 #: actions/updateprofile.php:166
 msgid "Could not save avatar info"
-msgstr ""
+msgstr "Could not save avatar info"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
 #: actions/updateprofile.php:159
 msgid "Could not save new profile info"
-msgstr ""
+msgstr "Could not save new profile info"
 
 #: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
 msgid "Could not subscribe other to you."
-msgstr ""
+msgstr "Could not subscribe other to you."
 
 #: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
 msgid "Could not subscribe."
-msgstr ""
+msgstr "Could not subscribe."
 
 #: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
 #: actions/recoverpassword.php:111
 msgid "Could not update user with confirmed email address."
-msgstr "Couldn’t update user with confirmed e-mail address."
+msgstr "Couldn't update user with confirmed e-mail address."
 
 #: ../actions/finishremotesubscribe.php:99
 #: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
 msgid "Couldn't convert request tokens to access tokens."
-msgstr "Couldn’t convert request tokens to access tokens."
+msgstr "Couldn't convert request tokens to access tokens."
 
 #: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
 #: ../actions/imsettings.php:218 ../actions/smssettings.php:241
@@ -629,21 +650,21 @@ msgstr "Couldn’t convert request tokens to access tokens."
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
 msgid "Couldn't delete email confirmation."
-msgstr "Couldn’t delete e-mail confirmation."
+msgstr "Couldn't delete e-mail confirmation."
 
 #: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
 msgid "Couldn't delete subscription."
-msgstr "Couldn’t delete subscription."
+msgstr "Couldn't delete subscription."
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
 #: actions/twitapistatuses.php:84
 msgid "Couldn't find any statuses."
-msgstr "Couldn’t find any statuses."
+msgstr "Couldn't find any statuses."
 
 #: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
 #: actions/remotesubscribe.php:178
 msgid "Couldn't get a request token."
-msgstr "Couldn’t get a request token."
+msgstr "Couldn't get a request token."
 
 #: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
 #: ../actions/smssettings.php:206 actions/emailsettings.php:223
@@ -651,29 +672,29 @@ msgstr "Couldn’t get a request token."
 #: actions/emailsettings.php:337 actions/imsettings.php:311
 #: actions/smssettings.php:325
 msgid "Couldn't insert confirmation code."
-msgstr "Couldn’t insert confirmation code."
+msgstr "Couldn't insert confirmation code."
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
 msgid "Couldn't insert new subscription."
-msgstr "Couldn’t insert new subscription."
+msgstr "Couldn't insert new subscription."
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 #: actions/profilesettings.php:302 actions/twitapiaccount.php:81
 msgid "Couldn't save profile."
-msgstr "Couldn’t save profile."
+msgstr "Couldn't save profile."
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
 #: actions/profilesettings.php:279
 msgid "Couldn't update user for autosubscribe."
-msgstr "Couldn’t update user for auto-subscribe."
+msgstr "Couldn't update user for autosubscribe."
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
 #: actions/emailsettings.php:440 actions/emailsettings.php:462
 msgid "Couldn't update user record."
-msgstr "Couldn’t update user record."
+msgstr "Couldn't update user record."
 
 #: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
 #: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
@@ -689,37 +710,37 @@ msgstr "Couldn’t update user record."
 #: actions/profilesettings.php:259 actions/smssettings.php:266
 #: actions/smssettings.php:408
 msgid "Couldn't update user."
-msgstr "Couldn’t update user."
+msgstr "Couldn't update user."
 
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
 #: actions/finishopenidlogin.php:112
 msgid "Create"
-msgstr ""
+msgstr "Create"
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
 #: actions/finishopenidlogin.php:98
 msgid "Create a new user with this nickname."
-msgstr ""
+msgstr "Create a new user with this nickname."
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
 #: actions/finishopenidlogin.php:96
 msgid "Create new account"
-msgstr ""
+msgstr "Create new account"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
 #: actions/finishopenidlogin.php:231
 msgid "Creating new account for OpenID that already has a user."
-msgstr ""
+msgstr "Creating new account for OpenID that already has a user."
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
 #: actions/imsettings.php:100
 msgid "Current confirmed Jabber/GTalk address."
-msgstr ""
+msgstr "Current confirmed Jabber/GTalk address."
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
 #: actions/smssettings.php:100
 msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
+msgstr "Current confirmed SMS-enabled phone number."
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
 #: actions/emailsettings.php:99
@@ -728,28 +749,28 @@ msgstr "Current confirmed e-mail address."
 
 #: ../actions/showstream.php:356 actions/showstream.php:367
 msgid "Currently"
-msgstr ""
+msgstr "Currently"
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
 #, php-format
 msgid "DB error inserting hashtag: %s"
-msgstr ""
+msgstr "DB error inserting hashtag: %s"
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
 #, php-format
 msgid "DB error inserting reply: %s"
-msgstr ""
+msgstr "DB error inserting reply: %s"
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
 #: actions/deletenotice.php:79
 msgid "Delete notice"
-msgstr ""
+msgstr "Delete notice"
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
 #: actions/profilesettings.php:114
 msgid "Describe yourself and your interests in 140 chars"
-msgstr ""
+msgstr "Describe yourself and your interests in 140 chars"
 
 #: ../actions/register.php:158 ../actions/register.php:161
 #: ../lib/settingsaction.php:87 actions/register.php:172
@@ -779,7 +800,7 @@ msgstr "E-mail address confirmation"
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
 #: actions/emailsettings.php:117
 msgid "Email address, like \"UserName@example.org\""
-msgstr "E-mail address, like ‘UserName@example.org’"
+msgstr "E-mail address, like \"UserName@example.org\""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
 msgid "Email addresses"
@@ -793,7 +814,7 @@ msgstr "Enter a nickname or e-mail address."
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
 #: actions/smssettings.php:119
 msgid "Enter the code you received on your phone."
-msgstr ""
+msgstr "Enter the code you received on your phone."
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 #: actions/userauthorization.php:161
@@ -803,12 +824,12 @@ msgstr "Error authorising token."
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
 #: actions/finishopenidlogin.php:297
 msgid "Error connecting user to OpenID."
-msgstr ""
+msgstr "Error connecting user to OpenID."
 
 #: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
 #: actions/finishaddopenid.php:126
 msgid "Error connecting user."
-msgstr ""
+msgstr "Error connecting user."
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
@@ -828,7 +849,7 @@ msgstr "Error inserting remote profile."
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
 #: actions/recoverpassword.php:280
 msgid "Error saving address confirmation."
-msgstr ""
+msgstr "Error saving address confirmation."
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
 #: actions/userauthorization.php:164
@@ -837,16 +858,16 @@ msgstr "Error saving remote profile."
 
 #: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
 msgid "Error saving the profile."
-msgstr ""
+msgstr "Error saving the profile."
 
 #: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
 msgid "Error saving the user."
-msgstr ""
+msgstr "Error saving the user."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 #: actions/passwordsettings.php:164
 msgid "Error saving user; invalid."
-msgstr "Error saving user - invalid."
+msgstr "Error saving user; invalid."
 
 #: ../actions/login.php:47 ../actions/login.php:73
 #: ../actions/recoverpassword.php:307 ../actions/register.php:98
@@ -854,7 +875,7 @@ msgstr "Error saving user - invalid."
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
 msgid "Error setting user."
-msgstr ""
+msgstr "Error setting user."
 
 #  Added full stop
 #: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
@@ -871,12 +892,12 @@ msgstr "Error updating remote profile."
 #: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
 #: actions/recoverpassword.php:86
 msgid "Error with confirmation code."
-msgstr ""
+msgstr "Error with confirmation code."
 
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
 #: actions/finishopenidlogin.php:117
 msgid "Existing nickname"
-msgstr ""
+msgstr "Existing nickname"
 
 #: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
 msgid "FAQ"
@@ -885,41 +906,43 @@ msgstr "F.A.Q."
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397
 msgid "Failed updating avatar."
-msgstr "Failed to update avatar."
+msgstr "Failed updating avatar."
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
 #, php-format
 msgid "Feed for friends of %s"
-msgstr ""
+msgstr "Feed for friends of %s"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
 #: actions/repliesrss.php:71
 #, php-format
 msgid "Feed for replies to %s"
-msgstr ""
+msgstr "Feed for replies to %s"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
 #, php-format
 msgid "Feed for tag %s"
-msgstr ""
+msgstr "Feed for tag %s"
 
 #: ../lib/searchaction.php:105 lib/searchaction.php:105
 #: lib/searchgroupnav.php:83
 msgid "Find content of notices"
-msgstr ""
+msgstr "Find content of notices"
 
 #: ../lib/searchaction.php:101 lib/searchaction.php:101
 #: lib/searchgroupnav.php:81
 msgid "Find people on this site"
-msgstr ""
+msgstr "Find people on this site"
 
 #: ../actions/login.php:122
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
 
 #: ../actions/profilesettings.php:44 ../actions/register.php:164
 #: actions/profilesettings.php:77 actions/register.php:178
@@ -927,7 +950,7 @@ msgstr ""
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
 msgid "Full name"
-msgstr ""
+msgstr "Full name"
 
 #: ../actions/profilesettings.php:98 ../actions/register.php:79
 #: ../actions/updateprofile.php:93 actions/profilesettings.php:213
@@ -936,30 +959,30 @@ msgstr ""
 #: actions/profilesettings.php:202 actions/register.php:171
 #: actions/updateprofile.php:97
 msgid "Full name is too long (max 255 chars)."
-msgstr ""
+msgstr "Full name is too long (max 255 chars)."
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
 msgid "Help"
-msgstr ""
+msgstr "Help"
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
 #: lib/facebookaction.php:200
 msgid "Home"
-msgstr ""
+msgstr "Home"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
 #: actions/profilesettings.php:107 actions/register.php:396
 #: lib/groupeditform.php:146
 msgid "Homepage"
-msgstr ""
+msgstr "Homepage"
 
 #: ../actions/profilesettings.php:95 ../actions/register.php:76
 #: actions/profilesettings.php:210 actions/register.php:83
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
 msgid "Homepage is not a valid URL."
-msgstr ""
+msgstr "Homepage is not a valid URL."
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
 #: actions/emailsettings.php:173
@@ -989,7 +1012,7 @@ msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
 msgstr ""
-"If you already have an account, log-in with your username and password to "
+"If you already have an account, login with your username and password to "
 "connect it to your OpenID."
 
 #: ../actions/openidsettings.php:45
@@ -998,7 +1021,7 @@ msgid ""
 "click \"Add\"."
 msgstr ""
 "If you want to add an OpenID to your account, enter it in the box below and "
-"click ‘Add’."
+"click \"Add\"."
 
 # double space here
 #: ../actions/recoverpassword.php:137
@@ -1006,8 +1029,8 @@ msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
 msgstr ""
-"If you’ve forgotten or lost your password, you can get a new one sent to the "
-"e-mail address you have stored in your account."
+"If you've forgotten or lost your password, you can get a new one sent to the "
+"e-mail address you have stored  in your account."
 
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
@@ -1023,12 +1046,12 @@ msgstr "Incoming e-mail address removed."
 #: ../actions/password.php:69 actions/profilesettings.php:388
 #: actions/passwordsettings.php:153
 msgid "Incorrect old password"
-msgstr ""
+msgstr "Incorrect old password"
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
 #: actions/login.php:132
 msgid "Incorrect username or password."
-msgstr ""
+msgstr "Incorrect username or password."
 
 #: ../actions/recoverpassword.php:265
 msgid ""
@@ -1043,29 +1066,29 @@ msgstr ""
 #: actions/updateprofile.php:118
 #, php-format
 msgid "Invalid avatar URL '%s'"
-msgstr "Invalid avatar URL ‘%s’"
+msgstr "Invalid avatar URL '%s'"
 
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
 #, php-format
 msgid "Invalid email address: %s"
-msgstr "Invalid e-mail address: ‘%s’"
+msgstr "Invalid e-mail address: %s"
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #: actions/updateprofile.php:102
 #, php-format
 msgid "Invalid homepage '%s'"
-msgstr "Invalid homepage ‘%s’"
+msgstr "Invalid homepage '%s'"
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
 #: actions/updateprofile.php:86
 #, php-format
 msgid "Invalid license URL '%s'"
-msgstr "Invalid licence URL ‘%s’"
+msgstr "Invalid licence URL '%s'"
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
 #: actions/postnotice.php:66
 msgid "Invalid notice content"
-msgstr ""
+msgstr "Invalid notice content"
 
 #: ../actions/postnotice.php:67 actions/postnotice.php:68
 #: actions/postnotice.php:72
@@ -1082,22 +1105,22 @@ msgstr "Invalid notice URL"
 #: actions/updateprofile.php:91
 #, php-format
 msgid "Invalid profile URL '%s'."
-msgstr "Invalid profile URL ‘%s’."
+msgstr "Invalid profile URL '%s'."
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
 #: actions/remotesubscribe.php:135
 msgid "Invalid profile URL (bad format)"
-msgstr ""
+msgstr "Invalid profile URL (bad format)"
 
 #: ../actions/finishremotesubscribe.php:77
 #: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
 msgid "Invalid profile URL returned by server."
-msgstr ""
+msgstr "Invalid profile URL returned by server."
 
 #: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 #: actions/avatarbynickname.php:69
 msgid "Invalid size."
-msgstr ""
+msgstr "Invalid size."
 
 #: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
 #: ../actions/register.php:111 actions/finishopenidlogin.php:241
@@ -1105,24 +1128,24 @@ msgstr ""
 #: actions/finishopenidlogin.php:279 actions/register.php:193
 #: actions/register.php:211
 msgid "Invalid username or password."
-msgstr ""
+msgstr "Invalid username or password."
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
 msgid "Invitation(s) sent"
-msgstr ""
+msgstr "Invitation(s) sent"
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
 msgid "Invitation(s) sent to the following people:"
-msgstr ""
+msgstr "Invitation(s) sent to the following people:"
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
 #: lib/subgroupnav.php:103
 msgid "Invite"
-msgstr ""
+msgstr "Invite"
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
 msgid "Invite new users"
-msgstr ""
+msgstr "Invite new users"
 
 #: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
 #, php-format
@@ -1138,7 +1161,7 @@ msgstr ""
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
 #: actions/imsettings.php:296
 msgid "Jabber ID already belongs to another user."
-msgstr ""
+msgstr "Jabber ID already belongs to another user."
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
 #, php-format
@@ -1146,18 +1169,18 @@ 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 ""
-"Jabber or GTalk address, like ‘UserName@example.org’. First, make sure to "
+"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
 "add %s to your buddy list in your IM client or on GTalk."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
 #: actions/profilesettings.php:128
 msgid "Language"
-msgstr ""
+msgstr "Language"
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
 #: actions/profilesettings.php:217
 msgid "Language is too long (max 50 chars)."
-msgstr ""
+msgstr "Language is too long (max 50 chars)."
 
 #: ../actions/profilesettings.php:52 ../actions/register.php:173
 #: actions/profilesettings.php:85 actions/register.php:187
@@ -1166,7 +1189,7 @@ msgstr ""
 #: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
 #: lib/profilelist.php:125
 msgid "Location"
-msgstr ""
+msgstr "Location"
 
 #: ../actions/profilesettings.php:104 ../actions/register.php:85
 #: ../actions/updateprofile.php:108 actions/profilesettings.php:219
@@ -1175,7 +1198,7 @@ msgstr ""
 #: actions/profilesettings.php:208 actions/register.php:177
 #: actions/updateprofile.php:112
 msgid "Location is too long (max 255 chars)."
-msgstr ""
+msgstr "Location is too long (max 255 chars)."
 
 #: ../actions/login.php:97 ../actions/login.php:106
 #: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
@@ -1185,13 +1208,13 @@ msgstr ""
 #: lib/facebookaction.php:315 lib/logingroupnav.php:75
 #, php-format
 msgid "Login"
-msgstr "Log-in"
+msgstr "Login"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
 #: actions/openidlogin.php:62
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Log-in with an [OpenID](%%doc.openid%%) account."
+msgstr "Login with an [OpenID](%%doc.openid%%) account."
 
 #: ../actions/login.php:126
 #, php-format
@@ -1200,22 +1223,23 @@ msgid ""
 "(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
 "%). "
 msgstr ""
-"Log-in with your username and password. Don’t have a username yet? [Register]"
-"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%%)."
+"Login with your username and password. Don't have a username yet? "
+"[Register](%%action.register%%) a new account, or try "
+"[OpenID](%%action.openidlogin%%). "
 
 #: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
 msgid "Logout"
-msgstr "Log out"
+msgstr "Logout"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393
 msgid "Longer name, preferably your \"real\" name"
-msgstr "Longer name, preferably your ‘real’ name"
+msgstr "Longer name, preferably your \"real\" name"
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
 #: lib/facebookaction.php:320
 msgid "Lost or forgotten password?"
-msgstr ""
+msgstr "Lost or forgotten password?"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
@@ -1231,33 +1255,35 @@ msgstr "Manage how you get e-mail from %%site.name%%."
 #: ../actions/showstream.php:300 actions/showstream.php:315
 #: actions/showstream.php:480
 msgid "Member since"
-msgstr ""
+msgstr "Member since"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
 #, php-format
 msgid "Microblog by %s"
-msgstr ""
+msgstr "Microblog by %s"
 
+# Carrier?
 #: ../actions/smssettings.php:304
 #, php-format
+#, fuzzy
 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 ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
-"email but isn’t listed here, send e-mail to let us know at %s."
+"e-mail but isn't listed here, send e-mail to let us know at %s."
 
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
 msgid "My text and files are available under "
-msgstr ""
+msgstr "My text and files are available under "
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
 msgid "New"
-msgstr ""
+msgstr "New"
 
 #: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
 #, php-format
@@ -1272,22 +1298,22 @@ msgstr "New incoming e-mail address added."
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
 #: actions/finishopenidlogin.php:99
 msgid "New nickname"
-msgstr ""
+msgstr "New nickname"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
 #: actions/newnotice.php:68
 msgid "New notice"
-msgstr ""
+msgstr "New notice"
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
 #: actions/passwordsettings.php:101 actions/recoverpassword.php:219
 msgid "New password"
-msgstr ""
+msgstr "New password"
 
 #: ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
-msgstr ""
+msgstr "New password successfully saved. You are now logged in."
 
 #: ../actions/login.php:101 ../actions/profilesettings.php:41
 #: ../actions/register.php:151 actions/login.php:101
@@ -1297,7 +1323,7 @@ msgstr ""
 #: actions/showstream.php:251 actions/tagother.php:95
 #: lib/facebookaction.php:308 lib/groupeditform.php:137
 msgid "Nickname"
-msgstr ""
+msgstr "Nickname"
 
 #: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
 #: ../actions/register.php:69 actions/finishopenidlogin.php:181
@@ -1306,7 +1332,7 @@ msgstr ""
 #: actions/newgroup.php:134 actions/profilesettings.php:214
 #: actions/register.php:159
 msgid "Nickname already in use. Try another one."
-msgstr ""
+msgstr "Nickname already in use. Try another one."
 
 #: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
 #: ../actions/register.php:67 ../actions/updateprofile.php:77
@@ -1320,12 +1346,12 @@ msgstr "Nickname must have only lowercase letters and numbers, and no spaces."
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
 #: actions/finishopenidlogin.php:210
 msgid "Nickname not allowed."
-msgstr ""
+msgstr "Nickname not allowed."
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
 #: actions/remotesubscribe.php:106
 msgid "Nickname of the user you want to follow"
-msgstr ""
+msgstr "Nickname of the user you want to follow"
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
 #: actions/recoverpassword.php:186
@@ -1335,38 +1361,40 @@ msgstr "Nickname or e-mail"
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
 msgid "No"
-msgstr ""
+msgstr "No"
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
 #: actions/imsettings.php:279
 msgid "No Jabber ID."
-msgstr ""
+msgstr "No Jabber ID."
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
 #: actions/userauthorization.php:153
 msgid "No authorization request!"
 msgstr "No authorisation request!"
 
+# Carrier?
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
 #: actions/smssettings.php:299
+#, fuzzy
 msgid "No carrier selected."
-msgstr ""
+msgstr "No carrier selected."
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
 #: actions/smssettings.php:486
 msgid "No code entered"
-msgstr ""
+msgstr "No code entered"
 
 #: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 #: actions/confirmaddress.php:75
 msgid "No confirmation code."
-msgstr ""
+msgstr "No confirmation code."
 
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
 msgid "No content!"
-msgstr ""
+msgstr "No content!"
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
 #: actions/emailsettings.php:304
@@ -1375,7 +1403,7 @@ msgstr "No e-mail address."
 
 #: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
 msgid "No id."
-msgstr ""
+msgstr "No id."
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
 #: actions/emailsettings.php:430
@@ -1385,12 +1413,12 @@ msgstr "No incoming e-mail address."
 #: ../actions/finishremotesubscribe.php:65
 #: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
 msgid "No nickname provided by remote server."
-msgstr ""
+msgstr "No nickname provided by remote server."
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
 msgid "No nickname."
-msgstr ""
+msgstr "No nickname."
 
 #: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
 #: ../actions/smssettings.php:229 actions/emailsettings.php:240
@@ -1398,17 +1426,17 @@ msgstr ""
 #: actions/emailsettings.php:363 actions/imsettings.php:345
 #: actions/smssettings.php:358
 msgid "No pending confirmation to cancel."
-msgstr ""
+msgstr "No pending confirmation to cancel."
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
 #: actions/smssettings.php:294
 msgid "No phone number."
-msgstr ""
+msgstr "No phone number."
 
 #: ../actions/finishremotesubscribe.php:72
 #: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
 msgid "No profile URL returned by server."
-msgstr ""
+msgstr "No profile URL returned by server."
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
 #: actions/recoverpassword.php:266
@@ -1418,56 +1446,56 @@ msgstr "No registered e-mail address for that user."
 #: ../actions/userauthorization.php:49 actions/userauthorization.php:55
 #: actions/userauthorization.php:57
 msgid "No request found!"
-msgstr ""
+msgstr "No request found!"
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
 #: actions/groupsearch.php:81 actions/noticesearch.php:104
 #: actions/peoplesearch.php:85
 msgid "No results"
-msgstr ""
+msgstr "No results"
 
 #: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
 #: actions/avatarbynickname.php:64
 msgid "No size."
-msgstr ""
+msgstr "No size."
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
 #: actions/twitapistatuses.php:446
 msgid "No status found with that ID."
-msgstr ""
+msgstr "No status found with that ID."
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
 #: actions/twitapistatuses.php:418
 msgid "No status with that ID found."
-msgstr ""
+msgstr "No status with that ID found."
 
 #: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 #: actions/openidsettings.php:222
 msgid "No such OpenID."
-msgstr ""
+msgstr "No such OpenID."
 
 #: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
 msgid "No such document."
-msgstr ""
+msgstr "No such document."
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
 #: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
 #: lib/deleteaction.php:51
 msgid "No such notice."
-msgstr ""
+msgstr "No such notice."
 
 #: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
 #: actions/recoverpassword.php:62
 msgid "No such recovery code."
-msgstr ""
+msgstr "No such recovery code."
 
 #: ../actions/postnotice.php:56 actions/postnotice.php:57
 #: actions/postnotice.php:60
 msgid "No such subscription"
-msgstr ""
+msgstr "No such subscription"
 
 #: ../actions/all.php:34 ../actions/allrss.php:35
 #: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
@@ -1495,7 +1523,7 @@ msgstr ""
 #: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
 #: lib/subs.php:34 lib/subs.php:109
 msgid "No such user."
-msgstr ""
+msgstr "No such user."
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
 #: actions/recoverpassword.php:251
@@ -1504,33 +1532,33 @@ msgstr "No user with that e-mail address or username."
 
 #: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
-msgstr ""
+msgstr "Nobody to show!"
 
 #: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
 #: actions/recoverpassword.php:66
 msgid "Not a recovery code."
-msgstr ""
+msgstr "Not a recovery code."
 
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
 #: scripts/maildaemon.php:53
 msgid "Not a registered user."
-msgstr ""
+msgstr "Not a registered user."
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
 #: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
 #: lib/twitterapi.php:566
 msgid "Not a supported data format."
-msgstr ""
+msgstr "Not a supported data format."
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
 #: actions/imsettings.php:290
 msgid "Not a valid Jabber ID"
-msgstr ""
+msgstr "Not a valid Jabber ID"
 
 #: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
 msgid "Not a valid OpenID."
-msgstr ""
+msgstr "Not a valid OpenID."
 
 # Missing full stop, needs to merge with: actions/register.php:63 actions/register.php:70 actions/register.php:152
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
@@ -1547,27 +1575,27 @@ msgstr "Not a valid e-mail address."
 #: actions/editgroup.php:186 actions/newgroup.php:137
 #: actions/profilesettings.php:195 actions/register.php:161
 msgid "Not a valid nickname."
-msgstr ""
+msgstr "Not a valid nickname."
 
 #: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
 #: actions/remotesubscribe.php:159
 msgid "Not a valid profile URL (incorrect services)."
-msgstr ""
+msgstr "Not a valid profile URL (incorrect services)."
 
 #: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
 #: actions/remotesubscribe.php:152
 msgid "Not a valid profile URL (no XRDS defined)."
-msgstr ""
+msgstr "Not a valid profile URL (no XRDS defined)."
 
 #: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
 #: actions/remotesubscribe.php:143
 msgid "Not a valid profile URL (no YADIS document)."
-msgstr ""
+msgstr "Not a valid profile URL (no YADIS document)."
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
 #: lib/imagefile.php:87
 msgid "Not an image or corrupt file."
-msgstr ""
+msgstr "Not an image or corrupt file."
 
 #: ../actions/finishremotesubscribe.php:51
 #: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
@@ -1577,12 +1605,12 @@ msgstr "Not authorised."
 #: ../actions/finishremotesubscribe.php:38
 #: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
 msgid "Not expecting this response!"
-msgstr ""
+msgstr "Not expecting this response!"
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309
 msgid "Not found"
-msgstr ""
+msgstr "Not found"
 
 #: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
 #: ../actions/newnotice.php:29 ../actions/subscribe.php:28
@@ -1598,7 +1626,7 @@ msgstr ""
 #: actions/unsubscribe.php:27 lib/deleteaction.php:66
 #: lib/settingsaction.php:72
 msgid "Not logged in."
-msgstr ""
+msgstr "Not logged in."
 
 # removed full stop
 #: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
@@ -1608,101 +1636,101 @@ msgstr "Not subscribed!"
 #: ../actions/opensearch.php:35 actions/opensearch.php:35
 #: actions/opensearch.php:67
 msgid "Notice Search"
-msgstr ""
+msgstr "Notice Search"
 
 #: ../actions/showstream.php:82 actions/showstream.php:82
 #: actions/showstream.php:180 actions/showstream.php:187
 #: actions/showstream.php:192
 #, php-format
 msgid "Notice feed for %s"
-msgstr ""
+msgstr "Notice feed for %s"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
 #: actions/shownotice.php:94
 msgid "Notice has no profile"
-msgstr ""
+msgstr "Notice has no profile"
 
 #: ../actions/showstream.php:316 actions/showstream.php:331
 #: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
 #: lib/noticelist.php:87
 msgid "Notices"
-msgstr ""
+msgstr "Notices"
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
 #: actions/tag.php:81 actions/tag.php:41
 #, php-format
 msgid "Notices tagged with %s"
-msgstr ""
+msgstr "Notices tagged with %s"
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
 #: actions/passwordsettings.php:97
 msgid "Old password"
-msgstr ""
+msgstr "Old password"
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
 #: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
 #: lib/logingroupnav.php:81
 msgid "OpenID"
-msgstr ""
+msgstr "OpenID"
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
 #: actions/finishopenidlogin.php:73
 msgid "OpenID Account Setup"
-msgstr ""
+msgstr "OpenID Account Setup"
 
 #: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
 msgid "OpenID Auto-Submit"
-msgstr ""
+msgstr "OpenID Auto-Submit"
 
 #: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 #: actions/finishaddopenid.php:170 actions/openidlogin.php:80
 msgid "OpenID Login"
-msgstr "OpenID Log-in"
+msgstr "OpenID Login"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
 #: actions/openidlogin.php:102 actions/openidsettings.php:101
 msgid "OpenID URL"
-msgstr ""
+msgstr "OpenID URL"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 #: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 #: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
 msgid "OpenID authentication cancelled."
-msgstr ""
+msgstr "OpenID authentication cancelled."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
 #, php-format
 msgid "OpenID authentication failed: %s"
-msgstr ""
+msgstr "OpenID authentication failed: %s"
 
 #: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
 #, php-format
 msgid "OpenID failure: %s"
-msgstr ""
+msgstr "OpenID failure: %s"
 
 #: ../actions/openidsettings.php:144 actions/openidsettings.php:153
 #: actions/openidsettings.php:231
 msgid "OpenID removed."
-msgstr ""
+msgstr "OpenID removed."
 
 #: ../actions/openidsettings.php:37 actions/openidsettings.php:37
 #: actions/openidsettings.php:59
 msgid "OpenID settings"
-msgstr ""
+msgstr "OpenID settings"
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
 msgid "Optionally add a personal message to the invitation."
-msgstr ""
+msgstr "Optionally add a personal message to the invitation."
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
 #: lib/imagefile.php:75
 msgid "Partial upload."
-msgstr ""
+msgstr "Partial upload."
 
 #: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
 #: ../actions/register.php:153 ../lib/settingsaction.php:93
@@ -1711,45 +1739,45 @@ msgstr ""
 #: actions/login.php:231 actions/register.php:372
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
 msgid "Password"
-msgstr ""
+msgstr "Password"
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
 #: actions/recoverpassword.php:335
 msgid "Password and confirmation do not match."
-msgstr ""
+msgstr "Password and confirmation do not match."
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
 #: actions/recoverpassword.php:331
 msgid "Password must be 6 chars or more."
-msgstr ""
+msgstr "Password must be 6 chars or more."
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:301
 msgid "Password recovery requested"
-msgstr ""
+msgstr "Password recovery requested"
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 msgid "Password saved."
-msgstr ""
+msgstr "Password saved."
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
 #: actions/passwordsettings.php:145 actions/register.php:183
 msgid "Passwords don't match."
-msgstr "Passwords don’t match."
+msgstr "Passwords don't match."
 
 #: ../lib/searchaction.php:100 lib/searchaction.php:100
 #: lib/searchgroupnav.php:80
 msgid "People"
-msgstr ""
+msgstr "People"
 
 #: ../actions/opensearch.php:33 actions/opensearch.php:33
 #: actions/opensearch.php:64
 msgid "People Search"
-msgstr ""
+msgstr "People Search"
 
 #: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
 #: actions/peoplesearch.php:58
@@ -1758,15 +1786,15 @@ msgstr "People Search"
 
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
 msgid "Personal"
-msgstr ""
+msgstr "Personal"
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
 msgid "Personal message"
-msgstr ""
+msgstr "Personal message"
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
 msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
+msgstr "Phone number, no punctuation or spaces, with area code"
 
 #: ../actions/userauthorization.php:78
 msgid ""
@@ -1774,14 +1802,14 @@ msgid ""
 "user's notices. If you didn't just ask to subscribe to someone's notices, "
 "click \"Cancel\"."
 msgstr ""
-"Please verify the 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 ‘Cancel’."
+"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 \"Cancel\"."
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
 #: actions/imsettings.php:142
 msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr ""
+msgstr "Post a notice when my Jabber/GTalk status changes."
 
 #: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
 #: ../actions/smssettings.php:94 actions/emailsettings.php:86
@@ -1790,7 +1818,7 @@ msgstr ""
 #: actions/imsettings.php:133 actions/smssettings.php:157
 #: actions/twittersettings.php:134
 msgid "Preferences"
-msgstr ""
+msgstr "Preferences"
 
 #: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
 #: ../actions/smssettings.php:163 actions/emailsettings.php:180
@@ -1798,57 +1826,57 @@ msgstr ""
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
 msgid "Preferences saved."
-msgstr ""
+msgstr "Preferences saved."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
 #: actions/profilesettings.php:129
 msgid "Preferred language"
-msgstr ""
+msgstr "Preferred language"
 
 #: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
 msgid "Privacy"
-msgstr ""
+msgstr "Privacy"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
 msgid "Problem saving notice."
-msgstr ""
+msgstr "Problem saving notice."
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
 #: lib/personalgroupnav.php:108
 msgid "Profile"
-msgstr ""
+msgstr "Profile"
 
 #: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
 #: actions/remotesubscribe.php:109
 msgid "Profile URL"
-msgstr ""
+msgstr "Profile URL"
 
 #: ../actions/profilesettings.php:34 actions/profilesettings.php:32
 #: actions/profilesettings.php:58
 msgid "Profile settings"
-msgstr ""
+msgstr "Profile settings"
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
 #: actions/postnotice.php:52 actions/updateprofile.php:53
 #: actions/postnotice.php:55 actions/updateprofile.php:56
 msgid "Profile unknown"
-msgstr ""
+msgstr "Profile unknown"
 
 #: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
 msgid "Public Stream Feed"
-msgstr ""
+msgstr "Public Stream Feed"
 
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
 #: lib/publicgroupnav.php:77
 msgid "Public timeline"
-msgstr ""
+msgstr "Public timeline"
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
 #: actions/imsettings.php:153
 msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
+msgstr "Publish a MicroID for my Jabber/GTalk address."
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
 #: actions/emailsettings.php:178
@@ -1858,60 +1886,60 @@ msgstr "Publish a MicroID for my e-mail address."
 #: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
 #: actions/tag.php:76
 msgid "Recent Tags"
-msgstr ""
+msgstr "Recent Tags"
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
 #: actions/recoverpassword.php:190
 msgid "Recover"
-msgstr ""
+msgstr "Recover"
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
 #: actions/recoverpassword.php:198
 msgid "Recover password"
-msgstr ""
+msgstr "Recover password"
 
 #: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
 #: actions/recoverpassword.php:73
 msgid "Recovery code for unknown user."
-msgstr ""
+msgstr "Recovery code for unknown user."
 
 #: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
 #: actions/register.php:152 actions/register.php:207 lib/util.php:328
 #: actions/register.php:69 actions/register.php:436 lib/action.php:338
 #: lib/facebookaction.php:277 lib/logingroupnav.php:78
 msgid "Register"
-msgstr ""
+msgstr "Register"
 
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
 msgid "Registration not allowed."
-msgstr ""
+msgstr "Registration not allowed."
 
 #: ../actions/register.php:200 actions/register.php:214
 #: actions/register.php:67
 msgid "Registration successful"
-msgstr ""
+msgstr "Registration successful"
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
 #: actions/userauthorization.php:144
 msgid "Reject"
-msgstr ""
+msgstr "Reject"
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
 #: actions/register.php:414
 msgid "Remember me"
-msgstr ""
+msgstr "Remember me"
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
 #: actions/updateprofile.php:74
 msgid "Remote profile with no matching profile"
-msgstr ""
+msgstr "Remote profile with no matching profile"
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
 #: actions/remotesubscribe.php:88
 msgid "Remote subscribe"
-msgstr ""
+msgstr "Remote subscribe"
 
 #: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
@@ -1924,24 +1952,24 @@ msgstr ""
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
 msgid "Remove"
-msgstr ""
+msgstr "Remove"
 
 #: ../actions/openidsettings.php:68 actions/openidsettings.php:69
 #: actions/openidsettings.php:123
 msgid "Remove OpenID"
-msgstr ""
+msgstr "Remove OpenID"
 
 #: ../actions/openidsettings.php:73
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 msgstr ""
-"Removing your only OpenID would make it impossible to log-in! If you need to "
+"Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
 msgid "Replies"
-msgstr ""
+msgstr "Replies"
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
 #: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
@@ -1949,46 +1977,46 @@ msgstr ""
 #: lib/personalgroupnav.php:104
 #, php-format
 msgid "Replies to %s"
-msgstr ""
+msgstr "Replies to %s"
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
 #: actions/recoverpassword.php:223
 msgid "Reset"
-msgstr ""
+msgstr "Reset"
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
 #: actions/recoverpassword.php:197
 msgid "Reset password"
-msgstr ""
+msgstr "Reset password"
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
 msgid "SMS"
-msgstr ""
+msgstr "SMS"
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
 #: actions/smssettings.php:126
 msgid "SMS Phone number"
-msgstr ""
+msgstr "SMS Phone number"
 
 #: ../actions/smssettings.php:33 actions/smssettings.php:33
 #: actions/smssettings.php:58
 msgid "SMS Settings"
-msgstr ""
+msgstr "SMS Settings"
 
 #: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
 msgid "SMS confirmation"
-msgstr ""
+msgstr "SMS confirmation"
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
 #: actions/recoverpassword.php:222
 msgid "Same as password above"
-msgstr ""
+msgstr "Same as password above"
 
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377
 msgid "Same as password above. Required."
-msgstr ""
+msgstr "Same as password above. Required."
 
 #: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
 #: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
@@ -2001,17 +2029,17 @@ msgstr ""
 #: actions/tagother.php:152 actions/twittersettings.php:161
 #: lib/groupeditform.php:171
 msgid "Save"
-msgstr ""
+msgstr "Save"
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
 #: lib/util.php:316 lib/action.php:325
 msgid "Search"
-msgstr ""
+msgstr "Search"
 
 #: ../actions/noticesearch.php:80 actions/noticesearch.php:85
 #: actions/noticesearch.php:127
 msgid "Search Stream Feed"
-msgstr ""
+msgstr "Search Stream Feed"
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
 #: actions/noticesearch.php:57
@@ -2021,7 +2049,7 @@ msgid ""
 "by spaces; they must be 3 characters or more."
 msgstr ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces - they must be 3 characters or more."
+"by spaces; they must be 3 characters or more."
 
 #: ../actions/peoplesearch.php:28
 #, php-format
@@ -2030,18 +2058,20 @@ msgid ""
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 "Search for people on %%site.name%% by their name, location, or interests. "
-"Separate the terms by spaces - they must be 3 characters or more."
+"Separate the terms by spaces; they must be 3 characters or more."
 
+# Carrier?
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
 #: actions/smssettings.php:457
+#, fuzzy
 msgid "Select a carrier"
-msgstr ""
+msgstr "Select a carrier"
 
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
 #: lib/messageform.php:167 lib/noticeform.php:177
 msgid "Send"
-msgstr ""
+msgstr "Send"
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
 #: actions/emailsettings.php:74 actions/smssettings.php:82
@@ -2057,41 +2087,45 @@ msgstr "Send me notices of new subscriptions through e-mail."
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
 #: actions/imsettings.php:137
 msgid "Send me notices through Jabber/GTalk."
-msgstr ""
+msgstr "Send me notices through Jabber/GTalk."
 
+# Carrier
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
+#, fuzzy
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
 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."
+msgstr "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 
 #: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
 msgid "Settings"
-msgstr ""
+msgstr "Settings"
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
 #: actions/profilesettings.php:319
 msgid "Settings saved."
-msgstr ""
+msgstr "Settings saved."
 
 #: ../actions/tag.php:60 actions/tag.php:60
 msgid "Showing most popular tags from the last week"
-msgstr ""
+msgstr "Showing most popular tags from the last week"
 
 #: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 #: actions/finishaddopenid.php:114
 msgid "Someone else already has this OpenID."
-msgstr ""
+msgstr "Someone else already has this OpenID."
 
 #: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
 #: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
 #: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
 msgid "Something weird happened."
-msgstr ""
+msgstr "Something weird happened."
 
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
 #: scripts/maildaemon.php:61
@@ -2105,18 +2139,18 @@ msgstr "Sorry, that is not your incoming e-mail address."
 
 #: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
 msgid "Source"
-msgstr ""
+msgstr "Source"
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
 #: actions/showstream.php:476
 msgid "Statistics"
-msgstr ""
+msgstr "Statistics"
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 #: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
 msgid "Stored OpenID not found."
-msgstr ""
+msgstr "Stored OpenID not found."
 
 #: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
 #: ../actions/showstream.php:197 actions/remotesubscribe.php:84
@@ -2124,14 +2158,14 @@ msgstr ""
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139
 msgid "Subscribe"
-msgstr ""
+msgstr "Subscribe"
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
 #: actions/showstream.php:436 actions/showstream.php:498
 #: lib/subgroupnav.php:88
 msgid "Subscribers"
-msgstr ""
+msgstr "Subscribers"
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
 #: actions/userauthorization.php:338
@@ -2141,7 +2175,7 @@ msgstr "Subscription authorised"
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
 #: actions/userauthorization.php:349
 msgid "Subscription rejected"
-msgstr ""
+msgstr "Subscription rejected"
 
 #: ../actions/showstream.php:230 ../actions/showstream.php:307
 #: ../actions/subscriptions.php:27 actions/showstream.php:240
@@ -2149,43 +2183,43 @@ msgstr ""
 #: actions/showstream.php:407 actions/showstream.php:489
 #: lib/subgroupnav.php:80
 msgid "Subscriptions"
-msgstr ""
+msgstr "Subscriptions"
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
 #: lib/imagefile.php:78
 msgid "System error uploading file."
-msgstr ""
+msgstr "System error uploading file."
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
 #: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
 #: lib/profilelist.php:164
 msgid "Tags"
-msgstr ""
+msgstr "Tags"
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
 msgid "Text"
-msgstr ""
+msgstr "Text"
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
 #: actions/noticesearch.php:67
 msgid "Text search"
-msgstr ""
+msgstr "Text search"
 
 #: ../actions/openidsettings.php:140 actions/openidsettings.php:149
 #: actions/openidsettings.php:227
 msgid "That OpenID does not belong to you."
-msgstr ""
+msgstr "That OpenID does not belong to you."
 
 #: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
 #: actions/confirmaddress.php:94
 msgid "That address has already been confirmed."
-msgstr ""
+msgstr "That address has already been confirmed."
 
 #: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
 #: actions/confirmaddress.php:85
 msgid "That confirmation code is not for you!"
-msgstr ""
+msgstr "That confirmation code is not for you!"
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
 msgid "That email address already belongs to another user."
@@ -2194,12 +2228,12 @@ msgstr "That e-mail address already belongs to another user."
 #: ../actions/avatar.php:80 actions/profilesettings.php:317
 #: lib/imagefile.php:71
 msgid "That file is too big."
-msgstr ""
+msgstr "That file is too big."
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
 #: actions/imsettings.php:293
 msgid "That is already your Jabber ID."
-msgstr ""
+msgstr "That is already your Jabber ID."
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
 #: actions/emailsettings.php:318
@@ -2209,12 +2243,12 @@ msgstr "That is already your e-mail address."
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
 #: actions/smssettings.php:306
 msgid "That is already your phone number."
-msgstr ""
+msgstr "That is already your phone number."
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
 #: actions/imsettings.php:381
 msgid "That is not your Jabber ID."
-msgstr ""
+msgstr "That is not your Jabber ID."
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
 #: actions/emailsettings.php:397
@@ -2224,39 +2258,39 @@ msgstr "That is not your e-mail address."
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
 #: actions/smssettings.php:393
 msgid "That is not your phone number."
-msgstr ""
+msgstr "That is not your phone number."
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
 #: actions/emailsettings.php:367 actions/imsettings.php:349
 msgid "That is the wrong IM address."
-msgstr "That is the wrong I.M. address."
+msgstr "That is the wrong IM address."
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
 #: actions/smssettings.php:362
 msgid "That is the wrong confirmation number."
-msgstr ""
+msgstr "That is the wrong confirmation number."
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
 #: actions/smssettings.php:309
 msgid "That phone number already belongs to another user."
-msgstr ""
+msgstr "That phone number already belongs to another user."
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
 #: actions/facebookhome.php:243 actions/twitapistatuses.php:276
 msgid "That's too long. Max notice size is 140 chars."
-msgstr "That’s too long. Max notice size is 140 chars."
+msgstr "That's too long. Max notice size is 140 chars."
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
 #: actions/twitapiaccount.php:62
 msgid "That's too long. Max notice size is 255 chars."
-msgstr "That’s too long. Max notice size is 255 chars."
+msgstr "That's too long. Max notice size is 255 chars."
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
-msgstr "The address ‘%s’ has been confirmed for your account."
+msgstr "The address \"%s\" has been confirmed for your account."
 
 #: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
 #: ../actions/smssettings.php:274 actions/emailsettings.php:282
@@ -2264,7 +2298,7 @@ msgstr "The address ‘%s’ has been confirmed for your account."
 #: actions/emailsettings.php:416 actions/imsettings.php:402
 #: actions/smssettings.php:413
 msgid "The address was removed."
-msgstr ""
+msgstr "The address was removed."
 
 #: ../actions/userauthorization.php:312
 msgid ""
@@ -2272,8 +2306,8 @@ msgid ""
 "with the site's instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
-"The subscription has been authorised, but no callback URL was given. Check "
-"with the site’s instructions for details on how to authorise the "
+"The subscription has been authorised, but no callback URL was passed. Check "
+"with the site's instructions for details on how to authorise the "
 "subscription. Your subscription token is:"
 
 #: ../actions/userauthorization.php:322
@@ -2282,42 +2316,46 @@ msgid ""
 "with the site's instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
-"The subscription has been rejected, but no callback URL was given. Check "
-"with the site’s instructions for details on how to fully reject the "
+"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."
 
 #: ../actions/subscribers.php:35 actions/subscribers.php:35
 #, php-format
 msgid "These are the people who listen to %s's notices."
-msgstr "These are the people who listen to %s’s notices."
+msgstr "These are the people who listen to %s's notices."
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
 msgid "These are the people who listen to your notices."
-msgstr ""
+msgstr "These are the people who listen to your notices."
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
-msgstr ""
+msgstr "These are the people whose notices %s listens to."
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
 msgid "These are the people whose notices you listen to."
-msgstr ""
+msgstr "These are the people whose notices you listen to."
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
+"These people are already users and you were automatically subscribed to "
+"them:"
 
 #: ../actions/recoverpassword.php:88
 msgid "This confirmation code is too old. Please start again."
-msgstr ""
+msgstr "This confirmation code is too old. Please start again."
 
 #: ../lib/openid.php:195
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
 #: actions/finishopenidlogin.php:67
@@ -2327,7 +2365,7 @@ msgid ""
 "to a local account. You can either create a new account, or connect with "
 "your existing account, if you have one."
 msgstr ""
-"This is the first time you’ve logged into %s so we must connect your OpenID "
+"This is the first time you've logged into %s so we must connect your OpenID "
 "to a local account. You can either create a new account, or connect with "
 "your existing account, if you have one."
 
@@ -2336,7 +2374,7 @@ msgstr ""
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
 msgid "This method requires a POST or DELETE."
-msgstr ""
+msgstr "This method requires a POST or DELETE."
 
 #: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
 #: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
@@ -2345,21 +2383,21 @@ msgstr ""
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
 #: actions/twitapistatuses.php:244
 msgid "This method requires a POST."
-msgstr ""
+msgstr "This method requires a POST."
 
 #: ../lib/util.php:164 lib/util.php:246
 msgid "This page is not available in a media type you accept"
-msgstr ""
+msgstr "This page is not available in a media type you accept"
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
 #: actions/profilesettings.php:138
 msgid "Timezone"
-msgstr ""
+msgstr "Timezone"
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
 #: actions/profilesettings.php:211
 msgid "Timezone not selected."
-msgstr ""
+msgstr "Timezone not selected."
 
 # double space.
 #: ../actions/remotesubscribe.php:43
@@ -2369,26 +2407,26 @@ msgid ""
 "register%%) a new  account. If you already have an account  on a [compatible "
 "microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
-"To subscribe, you can [log-in](%%action.login%%), or "
+"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."
+"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
+"your profile URL below."
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132
 msgid "Two user ids or screen_names must be supplied."
-msgstr ""
+msgstr "Two user ids or screen_names must be supplied."
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
 #: actions/profilesettings.php:109
 msgid "URL of your homepage, blog, or profile on another site"
-msgstr ""
+msgstr "URL of your homepage, blog, or profile on another site"
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
 #: actions/remotesubscribe.php:110
 msgid "URL of your profile on another compatible microblogging service"
-msgstr ""
+msgstr "URL of your profile on another compatible microblogging service"
 
 #: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
 #: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
@@ -2399,27 +2437,29 @@ msgstr ""
 #: actions/imsettings.php:214 actions/recoverpassword.php:44
 #: actions/smssettings.php:236 actions/twittersettings.php:302
 msgid "Unexpected form submission."
-msgstr ""
+msgstr "Unexpected form submission."
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
 #: actions/recoverpassword.php:323
 msgid "Unexpected password reset."
-msgstr ""
+msgstr "Unexpected password reset."
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
 msgid "Unknown action"
-msgstr ""
+msgstr "Unknown action"
 
 #: ../actions/finishremotesubscribe.php:58
 #: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
 msgid "Unknown version of OMB protocol."
-msgstr ""
+msgstr "Unknown version of OMB protocol."
 
 #: ../lib/util.php:269 lib/util.php:285
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
 msgstr ""
+"Unless otherwise specified, contents of this site are copyright by the "
+"contributors and available under the "
 
 #: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
 #: actions/confirmaddress.php:90
@@ -2430,23 +2470,23 @@ msgstr "Unrecognised address type %s"
 #: ../actions/showstream.php:209 actions/showstream.php:219
 #: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
-msgstr ""
+msgstr "Unsubscribe"
 
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
 #: actions/postnotice.php:45 actions/updateprofile.php:46
 #: actions/postnotice.php:48 actions/updateprofile.php:49
 msgid "Unsupported OMB version"
-msgstr ""
+msgstr "Unsupported OMB version"
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
 #: lib/imagefile.php:102
 msgid "Unsupported image file format."
-msgstr ""
+msgstr "Unsupported image file format."
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
 #: lib/connectsettingsaction.php:108
 msgid "Updates by SMS"
-msgstr ""
+msgstr "Updates by SMS"
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
 #: lib/connectsettingsaction.php:105
@@ -2457,18 +2497,18 @@ msgstr "Updates by instant messenger (I.M.)"
 #: actions/twitapistatuses.php:129
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
+msgstr "Updates from %1$s and friends on %2$s!"
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
 #: actions/twitapistatuses.php:202
 #, php-format
 msgid "Updates from %1$s on %2$s!"
-msgstr ""
+msgstr "Updates from %1$s on %2$s!"
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
 msgid "Upload"
-msgstr ""
+msgstr "Upload"
 
 #: ../actions/avatar.php:27
 msgid ""
@@ -2477,29 +2517,30 @@ msgid ""
 "site license, also. Use a picture that belongs to you and that you want to "
 "share."
 msgstr ""
-"Upload a new ‘avatar’ (user image) here. You can’t edit the picture after "
-"you upload it, so make sure it’s more or less square. It must be under the "
+"Upload a new \"avatar\" (user image) here. You can't edit the picture after "
+"you upload it, so make sure it's more or less square. It must be under the "
 "site licence, also. Use a picture that belongs to you and that you want to "
 "share."
 
 #: ../lib/settingsaction.php:91
 msgid "Upload a new profile image"
-msgstr ""
+msgstr "Upload a new profile image"
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
+"Use this form to invite your friends and colleagues to use this service."
 
 #: ../actions/register.php:159 ../actions/register.php:162
 #: actions/register.php:173 actions/register.php:176
 msgid "Used only for updates, announcements, and password recovery"
-msgstr ""
+msgstr "Used only for updates, announcements, and password recovery"
 
 #: ../actions/finishremotesubscribe.php:86
 #: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
 msgid "User being listened to doesn't exist."
-msgstr "User being listened to doesn’t exist."
+msgstr "User being listened to doesn't exist."
 
 #: ../actions/all.php:41 ../actions/avatarbynickname.php:48
 #: ../actions/foaf.php:47 ../actions/replies.php:41
@@ -2517,16 +2558,16 @@ msgstr "User being listened to doesn’t exist."
 #: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
 #: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
 msgid "User has no profile."
-msgstr ""
+msgstr "User has no profile."
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
 #: actions/remotesubscribe.php:105
 msgid "User nickname"
-msgstr ""
+msgstr "User nickname"
 
 #: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
 msgid "User not found."
-msgstr ""
+msgstr "User not found."
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
 #: actions/profilesettings.php:139
@@ -2536,65 +2577,67 @@ msgstr "In which timezone are you?"
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
 #, php-format
 msgid "What's up, %s?"
-msgstr "What’s up, %s?"
+msgstr "What's up, %s?"
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
 #: actions/profilesettings.php:119
 msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Where you are, like ‘City, State (or Region), Country’"
+msgstr "Where you are, like \"City, State (or Region), Country\""
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
 #: actions/updateprofile.php:132
 #, php-format
 msgid "Wrong image type for '%s'"
-msgstr "Wrong image type for ‘%s’"
+msgstr "Wrong image type for '%s'"
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
 #: actions/updateprofile.php:127
 #, php-format
 msgid "Wrong size image at '%s'"
-msgstr "Wrong size image at ‘%s’"
+msgstr "Wrong size image at '%s'"
 
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
 #: actions/block.php:148 actions/deletenotice.php:122
 #: actions/deletenotice.php:141
 msgid "Yes"
-msgstr ""
+msgstr "Yes"
 
 #: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
 #: actions/finishaddopenid.php:112
 msgid "You already have this OpenID!"
-msgstr ""
+msgstr "You already have this OpenID!"
 
 #: ../actions/deletenotice.php:37 actions/deletenotice.php:37
 msgid ""
 "You are about to permanently delete a notice.  Once this is done, it cannot "
 "be undone."
 msgstr ""
+"You are about to permanently delete a notice.  Once this is done, it cannot "
+"be undone."
 
 #: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
 #: actions/recoverpassword.php:36
 msgid "You are already logged in!"
-msgstr ""
+msgstr "You are already logged in!"
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
 msgid "You are already subscribed to these users:"
-msgstr ""
+msgstr "You are already subscribed to these users:"
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
 #: actions/twitapifriendships.php:105
 msgid "You are not friends with the specified user."
-msgstr ""
+msgstr "You are not friends with the specified user."
 
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
-msgstr ""
+msgstr "You can change your password here. Choose a good one!"
 
 #: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
-msgstr ""
+msgstr "You can create a new account to start posting notices."
 
 #: ../actions/smssettings.php:28 actions/smssettings.php:28
 #: actions/smssettings.php:69
@@ -2608,7 +2651,7 @@ msgid ""
 "\"Remove\"."
 msgstr ""
 "You can remove an OpenID from your account by clicking the button marked "
-"‘Remove’."
+"\"Remove\"."
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
 #, php-format
@@ -2616,29 +2659,33 @@ msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 msgstr ""
+"You can send and receive notices through Jabber/GTalk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 
 #: ../actions/profilesettings.php:27
 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."
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
 #: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
 msgid "You can use the local subscription!"
-msgstr ""
+msgstr "You can use the local subscription!"
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
 #: actions/finishopenidlogin.php:43
 msgid "You can't register if you don't agree to the license."
-msgstr "You can’t register if you don’t agree to the licence."
+msgstr "You can't register if you don't agree to the licence."
 
 #: ../actions/updateprofile.php:63 actions/updateprofile.php:64
 #: actions/updateprofile.php:67
 msgid "You did not send us that profile"
-msgstr ""
+msgstr "You did not send us that profile"
 
 #: ../lib/mail.php:147
 #, php-format
@@ -2664,28 +2711,30 @@ msgstr ""
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
 #: actions/twitapistatuses.php:463
 msgid "You may not delete another user's status."
-msgstr "You may not delete another user’s status."
+msgstr "You may not delete another user's status."
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
-msgstr ""
+msgstr "You must be logged in to invite other users to use %s"
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
 msgstr ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
 
 # extra spaces.
 #: ../actions/recoverpassword.php:149
 msgid "You've been identified. Enter a  new password below. "
-msgstr "You’ve been identified. Enter a new password below."
+msgstr "You've been identified. Enter a  new password below. "
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
 #: actions/openidlogin.php:104
 msgid "Your OpenID URL"
-msgstr ""
+msgstr "Your OpenID URL"
 
 #: ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
@@ -2703,52 +2752,52 @@ msgstr ""
 
 #: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
 msgid "a few seconds ago"
-msgstr ""
+msgstr "a few seconds ago"
 
 #: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
 #, php-format
 msgid "about %d days ago"
-msgstr ""
+msgstr "about %d days ago"
 
 #: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
 #, php-format
 msgid "about %d hours ago"
-msgstr ""
+msgstr "about %d hours ago"
 
 #: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
 #, php-format
 msgid "about %d minutes ago"
-msgstr ""
+msgstr "about %d minutes ago"
 
 #: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
 #, php-format
 msgid "about %d months ago"
-msgstr ""
+msgstr "about %d months ago"
 
 #: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
 msgid "about a day ago"
-msgstr ""
+msgstr "about a day ago"
 
 #: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
 msgid "about a minute ago"
-msgstr ""
+msgstr "about a minute ago"
 
 #: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
 msgid "about a month ago"
-msgstr ""
+msgstr "about a month ago"
 
 #: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
 msgid "about a year ago"
-msgstr ""
+msgstr "about a year ago"
 
 #: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
 msgid "about an hour ago"
-msgstr ""
+msgstr "about an hour ago"
 
 #: ../actions/showstream.php:423 ../lib/stream.php:132
 #: actions/showstream.php:441 lib/stream.php:99
 msgid "delete"
-msgstr ""
+msgstr "delete"
 
 #: ../actions/noticesearch.php:130 ../actions/showstream.php:408
 #: ../lib/stream.php:117 actions/noticesearch.php:136
@@ -2760,17 +2809,17 @@ msgstr "in reply to…"
 #: ../lib/stream.php:124 actions/noticesearch.php:143
 #: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
 msgid "reply"
-msgstr ""
+msgstr "reply"
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
 #: actions/passwordsettings.php:106
 msgid "same as password above"
-msgstr ""
+msgstr "same as password above"
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
 #: actions/twitapistatuses.php:555
 msgid "unsupported file type"
-msgstr ""
+msgstr "unsupported file type"
 
 #  erm, not sure what to do here, « is recognised as a quotation mark.
 #: ../lib/util.php:1309 lib/util.php:1443
@@ -2791,7 +2840,7 @@ msgstr "← After"
 #: actions/openidlogin.php:37 actions/recoverpassword.php:316
 #: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
 msgid "There was a problem with your session token. Try again, please."
-msgstr ""
+msgstr "There was a problem with your session token. Try again, please."
 
 #: actions/disfavor.php:55 actions/disfavor.php:81
 msgid "This notice is not a favorite!"
@@ -2832,7 +2881,7 @@ msgstr "Disfavour"
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
 #, php-format
 msgid "%s favorite notices"
-msgstr "%s favourite notices"
+msgstr "%s's favorite notices"
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
 #, php-format
@@ -2842,16 +2891,16 @@ msgstr "Feed of favourite notices of %s"
 #: actions/inbox.php:28 actions/inbox.php:59
 #, php-format
 msgid "Inbox for %s - page %d"
-msgstr "In-box for %s - page %d"
+msgstr "Inbox for %s - page %d"
 
 #: actions/inbox.php:30 actions/inbox.php:62
 #, php-format
 msgid "Inbox for %s"
-msgstr "In-box for %s"
+msgstr "Inbox for %s"
 
 #: actions/inbox.php:53 actions/inbox.php:115
 msgid "This is your inbox, which lists your incoming private messages."
-msgstr "This is your in-box, which lists your incoming private messages."
+msgstr "This is your inbox, which lists your incoming private messages."
 
 #: actions/invite.php:178 actions/invite.php:213
 #, php-format
@@ -2859,35 +2908,37 @@ msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
 "\n"
 msgstr ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
 
 # extra space?
 #: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
 #: actions/register.php:416
 msgid "Automatically login in the future; "
-msgstr "Automatically log-in in the future - "
+msgstr "Automatically login in the future; "
 
 #: actions/login.php:122 actions/login.php:264
 msgid "For security reasons, please re-enter your "
-msgstr ""
+msgstr "For security reasons, please re-enter your "
 
 #: actions/login.php:126 actions/login.php:268
 msgid "Login with your username and password. "
-msgstr "Log-in with your username and password. "
+msgstr "Login with your username and password. "
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
 #: actions/twitapidirect_messages.php:141
 msgid "That's too long. Max message size is 140 chars."
-msgstr "That’s too long. Max message size is 140 chars."
+msgstr "That's too long. Max message size is 140 chars."
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
 msgid "No recipient specified."
-msgstr ""
+msgstr "No recipient specified."
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
 msgid "You can't send a message to this user."
-msgstr "You can’t send a message to this user."
+msgstr "You can't send a message to this user."
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
@@ -2895,61 +2946,62 @@ msgstr "You can’t send a message to this user."
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
-"Don’t send a message to yourself - just say it to yourself quietly instead."
+"Don't send a message to yourself; just say it to yourself quietly instead."
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
 #: actions/newmessage.php:163
 msgid "No such user"
-msgstr ""
+msgstr "No such user"
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
 msgid "New message"
-msgstr ""
+msgstr "New message"
 
 #: actions/noticesearch.php:95 actions/noticesearch.php:146
 msgid "Notice without matching profile"
-msgstr ""
+msgstr "Notice without matching profile"
 
 #: actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr "[OpenID](%%doc.openid%%) lets you log-in to many sites "
+msgstr "[OpenID](%%doc.openid%%) lets you log into many sites "
 
 #: actions/openidsettings.php:46 actions/openidsettings.php:96
 msgid "If you want to add an OpenID to your account, "
-msgstr ""
+msgstr "If you want to add an OpenID to your account, "
 
 #: actions/openidsettings.php:74
 msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr "Removing your only OpenID would make it impossible to log-in! "
+msgstr "Removing your only OpenID would make it impossible to log in! "
 
 #: actions/openidsettings.php:87 actions/openidsettings.php:143
 msgid "You can remove an OpenID from your account "
-msgstr ""
+msgstr "You can remove an OpenID from your account "
 
 #: actions/outbox.php:28 actions/outbox.php:58
 #, php-format
 msgid "Outbox for %s - page %d"
-msgstr ""
+msgstr "Outbox for %s - page %d"
 
 #: actions/outbox.php:30 actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
-msgstr ""
+msgstr "Outbox for %s"
 
 #: actions/outbox.php:53 actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
-msgstr ""
+msgstr "This is your outbox, which lists private messages you have sent."
 
 #: actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 msgstr ""
+"Search for people on %%site.name%% by their name, location, or interests. "
 
 #: actions/profilesettings.php:27 actions/profilesettings.php:69
 msgid "You can update your personal profile info here "
-msgstr ""
+msgstr "You can update your personal profile info here "
 
 #: actions/profilesettings.php:115 actions/remotesubscribe.php:320
 #: actions/userauthorization.php:159 actions/userrss.php:76
@@ -2957,35 +3009,35 @@ msgstr ""
 #: actions/grouplogo.php:177 actions/remotesubscribe.php:367
 #: actions/userauthorization.php:176 actions/userrss.php:82
 msgid "User without matching profile"
-msgstr ""
+msgstr "User without matching profile"
 
 #: actions/recoverpassword.php:91 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. "
-msgstr ""
+msgstr "This confirmation code is too old. "
 
 #: actions/recoverpassword.php:141 actions/recoverpassword.php:152
 msgid "If you've forgotten or lost your"
-msgstr "If you’ve forgotten or lost your"
+msgstr "If you've forgotten or lost your"
 
 #: actions/recoverpassword.php:154 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a "
-msgstr "You’ve been identified. Enter a "
+msgstr "You've been identified. Enter a "
 
 #: actions/recoverpassword.php:169 actions/recoverpassword.php:188
 msgid "Your nickname on this server, "
-msgstr ""
+msgstr "Your nickname on this server, "
 
 #: actions/recoverpassword.php:271 actions/recoverpassword.php:304
 msgid "Instructions for recovering your password "
-msgstr ""
+msgstr "Instructions for recovering your password "
 
 #: actions/recoverpassword.php:327 actions/recoverpassword.php:361
 msgid "New password successfully saved. "
-msgstr ""
+msgstr "New password successfully saved. "
 
 #: actions/register.php:95 actions/register.php:180
 msgid "Password must be 6 or more characters."
-msgstr ""
+msgstr "Password must be 6 or more characters."
 
 #: actions/register.php:216
 #, php-format
@@ -2998,12 +3050,12 @@ msgstr ""
 
 #: actions/register.php:227
 msgid "(You should receive a message by email momentarily, with "
-msgstr "(You should receive a message by e-mail in a moment, with "
+msgstr "(You should receive a message by e-mail momentarily, with "
 
 #: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
 #, php-format
 msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr "To subscribe, you can [log-in](%%action.login%%),"
+msgstr "To subscribe, you can [login](%%action.login%%),"
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
 #, php-format
@@ -3017,64 +3069,66 @@ msgstr "Could not retrieve favourite notices."
 
 #: actions/showmessage.php:33 actions/showmessage.php:81
 msgid "No such message."
-msgstr ""
+msgstr "No such message."
 
 #: actions/showmessage.php:42
 msgid "Only the sender and recipient may read this message."
-msgstr ""
+msgstr "Only the sender and recipient may read this message."
 
 #: actions/showmessage.php:61 actions/showmessage.php:108
 #, php-format
 msgid "Message to %1$s on %2$s"
-msgstr ""
+msgstr "Message to %1$s on %2$s"
 
 #: actions/showmessage.php:66 actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
-msgstr ""
+msgstr "Message from %1$s on %2$s"
 
 #: actions/showstream.php:154
 msgid "Send a message"
-msgstr ""
+msgstr "Send a message"
 
+# Carrier?
 #: actions/smssettings.php:312 actions/smssettings.php:464
 #, php-format
+#, fuzzy
 msgid "Mobile carrier for your phone. "
-msgstr ""
+msgstr "Mobile carrier for your phone. "
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
 #, php-format
 msgid "Direct messages to %s"
-msgstr ""
+msgstr "Direct messages to %s"
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
 #, php-format
 msgid "All the direct messages sent to %s"
-msgstr ""
+msgstr "All the direct messages sent to %s"
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
 msgid "Direct Messages You've Sent"
-msgstr "Direct Messages You’ve Sent"
+msgstr "Direct Messages You've Sent"
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
 #, php-format
 msgid "All the direct messages sent from %s"
-msgstr ""
+msgstr "All the direct messages sent from %s"
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
 msgid "No message text!"
-msgstr ""
+msgstr "No message text!"
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
 msgid "Recipient user not found."
-msgstr ""
+msgstr "Recipient user not found."
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
 msgid "Can't send direct messages to users who aren't your friend."
-msgstr "Can’t send direct messages to users who aren’t your friend."
+msgstr "Can't send direct messages to users who aren't your friend."
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
 #, php-format
@@ -3106,93 +3160,96 @@ msgstr ""
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
+"Add your Twitter account to automatically send your notices to Twitter, "
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
 msgid "Twitter settings"
-msgstr ""
+msgstr "Twitter settings"
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
 msgid "Twitter Account"
-msgstr ""
+msgstr "Twitter Account"
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
 msgid "Current verified Twitter account."
-msgstr ""
+msgstr "Current verified Twitter account."
 
 #: actions/twittersettings.php:63
 msgid "Twitter Username"
-msgstr ""
+msgstr "Twitter Username"
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
 msgid "No spaces, please."
-msgstr ""
+msgstr "No spaces, please."
 
 #: actions/twittersettings.php:67
 msgid "Twitter Password"
-msgstr ""
+msgstr "Twitter Password"
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
 msgid "Automatically send my notices to Twitter."
-msgstr ""
+msgstr "Automatically send my notices to Twitter."
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
 msgid "Send local \"@\" replies to Twitter."
-msgstr "Send local ‘@’ replies to Twitter."
+msgstr "Send local \"@\" replies to Twitter."
 
 #: actions/twittersettings.php:78 actions/twittersettings.php:153
 msgid "Subscribe to my Twitter friends here."
-msgstr ""
+msgstr "Subscribe to my Twitter friends here."
 
 #: actions/twittersettings.php:122
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
 msgid "Could not verify your Twitter credentials!"
-msgstr ""
+msgstr "Could not verify your Twitter credentials!"
 
 #: actions/twittersettings.php:137
 #, php-format
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr "Unable to retrieve account information for ‘%s’ from Twitter."
+msgstr "Unable to retrieve account information for \"%s\" from Twitter."
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
 msgid "Unable to save your Twitter settings!"
-msgstr ""
+msgstr "Unable to save your Twitter settings!"
 
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
 msgid "Twitter settings saved."
-msgstr ""
+msgstr "Twitter settings saved."
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
 msgid "That is not your Twitter account."
-msgstr ""
+msgstr "That is not your Twitter account."
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
 #: actions/twittersettings.php:403
 msgid "Couldn't remove Twitter user."
-msgstr "Couldn’t remove Twitter user."
+msgstr "Couldn't remove Twitter user."
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
 msgid "Twitter account removed."
-msgstr ""
+msgstr "Twitter account removed."
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
 #: actions/twittersettings.php:428 actions/twittersettings.php:439
 #: actions/twittersettings.php:453
 msgid "Couldn't save Twitter preferences."
-msgstr "Couldn’t save Twitter preferences."
+msgstr "Couldn't save Twitter preferences."
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
 msgid "Twitter preferences saved."
-msgstr ""
+msgstr "Twitter preferences saved."
 
 #: actions/userauthorization.php:84 actions/userauthorization.php:86
 msgid "Please check these details to make sure "
-msgstr ""
+msgstr "Please check these details to make sure "
 
 #: actions/userauthorization.php:324 actions/userauthorization.php:340
 msgid "The subscription has been authorized, but no "
@@ -3200,131 +3257,131 @@ msgstr "The subscription has been authorised, but no "
 
 #: actions/userauthorization.php:334 actions/userauthorization.php:351
 msgid "The subscription has been rejected, but no "
-msgstr ""
+msgstr "The subscription has been rejected, but no "
 
 #: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
 msgid "Command results"
-msgstr ""
+msgstr "Command results"
 
 #: classes/Channel.php:148 classes/Channel.php:204
 msgid "Command complete"
-msgstr ""
+msgstr "Command complete"
 
 #: classes/Channel.php:158 classes/Channel.php:215
 msgid "Command failed"
-msgstr ""
+msgstr "Command failed"
 
 #: classes/Command.php:39 classes/Command.php:44
 msgid "Sorry, this command is not yet implemented."
-msgstr ""
+msgstr "Sorry, this command is not yet implemented."
 
 #: classes/Command.php:96 classes/Command.php:113
 #, php-format
 msgid "Subscriptions: %1$s\n"
-msgstr ""
+msgstr "Subscriptions: %1$s\n"
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
 #: classes/Command.php:276
 msgid "User has no last notice"
-msgstr ""
+msgstr "User has no last notice"
 
 #: classes/Command.php:146 classes/Command.php:166
 msgid "Notice marked as fave."
-msgstr ""
+msgstr "Notice marked as fave."
 
 #: classes/Command.php:166 classes/Command.php:189
 #, php-format
 msgid "%1$s (%2$s)"
-msgstr ""
+msgstr "%1$s (%2$s)"
 
 #: classes/Command.php:169 classes/Command.php:192
 #, php-format
 msgid "Fullname: %s"
-msgstr "Full name: %s"
+msgstr "Fullname: %s"
 
 #: classes/Command.php:172 classes/Command.php:195
 #, php-format
 msgid "Location: %s"
-msgstr ""
+msgstr "Location: %s"
 
 #: classes/Command.php:175 classes/Command.php:198
 #, php-format
 msgid "Homepage: %s"
-msgstr ""
+msgstr "Homepage: %s"
 
 #: classes/Command.php:178 classes/Command.php:201
 #, php-format
 msgid "About: %s"
-msgstr ""
+msgstr "About: %s"
 
 #: classes/Command.php:200 classes/Command.php:228
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
-msgstr ""
+msgstr "Message too long - maximum is 140 characters, you sent %d"
 
 #: classes/Command.php:214 classes/Command.php:245
 #, php-format
 msgid "Direct message to %s sent"
-msgstr ""
+msgstr "Direct message to %s sent"
 
 #: classes/Command.php:216 classes/Command.php:247
 msgid "Error sending direct message."
-msgstr ""
+msgstr "Error sending direct message."
 
 #: classes/Command.php:263 classes/Command.php:300
 msgid "Specify the name of the user to subscribe to"
-msgstr ""
+msgstr "Specify the name of the user to subscribe to"
 
 #: classes/Command.php:270 classes/Command.php:307
 #, php-format
 msgid "Subscribed to %s"
-msgstr ""
+msgstr "Subscribed to %s"
 
 #: classes/Command.php:288 classes/Command.php:328
 msgid "Specify the name of the user to unsubscribe from"
-msgstr ""
+msgstr "Specify the name of the user to unsubscribe from"
 
 #: classes/Command.php:295 classes/Command.php:335
 #, php-format
 msgid "Unsubscribed from %s"
-msgstr ""
+msgstr "Unsubscribed from %s"
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
 #: classes/Command.php:376
 msgid "Command not yet implemented."
-msgstr ""
+msgstr "Command not yet implemented."
 
 #: classes/Command.php:313 classes/Command.php:356
 msgid "Notification off."
-msgstr ""
+msgstr "Notification off."
 
 #: classes/Command.php:315 classes/Command.php:358
 msgid "Can't turn off notification."
-msgstr "Can’t turn off notification."
+msgstr "Can't turn off notification."
 
 #: classes/Command.php:333 classes/Command.php:379
 msgid "Notification on."
-msgstr ""
+msgstr "Notification on."
 
 #: classes/Command.php:335 classes/Command.php:381
 msgid "Can't turn on notification."
-msgstr "Can’t turn on notification."
+msgstr "Can't turn on notification."
 
 #: classes/Command.php:344 classes/Command.php:392
 msgid "Commands:\n"
-msgstr ""
+msgstr "Commands:\n"
 
 #: classes/Message.php:53 classes/Message.php:56
 msgid "Could not insert message."
-msgstr ""
+msgstr "Could not insert message."
 
 #: classes/Message.php:63 classes/Message.php:66
 msgid "Could not update message with new URI."
-msgstr ""
+msgstr "Could not update message with new URI."
 
 #: lib/gallery.php:46
 msgid "User without matching profile in system."
-msgstr ""
+msgstr "User without matching profile in system."
 
 #: lib/mail.php:147 lib/mail.php:289
 #, php-format
@@ -3332,11 +3389,13 @@ msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgstr ""
+"You have a new posting address on %1$s.\n"
+"\n"
 
 #: lib/mail.php:249 lib/mail.php:508
 #, php-format
 msgid "New private message from %s"
-msgstr ""
+msgstr "New private message from %s"
 
 #: lib/mail.php:253 lib/mail.php:512
 #, php-format
@@ -3344,14 +3403,16 @@ msgid ""
 "%1$s (%2$s) sent you a private message:\n"
 "\n"
 msgstr ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
 
 #: lib/mailbox.php:43 lib/mailbox.php:89
 msgid "Only the user can read their own mailboxes."
-msgstr ""
+msgstr "Only the user can read their own mailboxes."
 
 #: lib/openid.php:195 lib/openid.php:203
 msgid "This form should automatically submit itself. "
-msgstr ""
+msgstr "This form should automatically submit itself. "
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
 msgid "Favorites"
@@ -3360,72 +3421,72 @@ msgstr "Favourites"
 #: lib/personal.php:66 lib/personalgroupnav.php:114
 #, php-format
 msgid "%s's favorite notices"
-msgstr "%s’s favourite notices"
+msgstr "%s's favourite notices"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
 msgid "User"
-msgstr ""
+msgstr "User"
 
 #: lib/personal.php:75 lib/personalgroupnav.php:123
 msgid "Inbox"
-msgstr "In-box"
+msgstr "Inbox"
 
 #: lib/personal.php:76 lib/personalgroupnav.php:124
 msgid "Your incoming messages"
-msgstr ""
+msgstr "Your incoming messages"
 
 #: lib/personal.php:80 lib/personalgroupnav.php:128
 msgid "Outbox"
-msgstr ""
+msgstr "Outbox"
 
 #: lib/personal.php:81 lib/personalgroupnav.php:129
 msgid "Your sent messages"
-msgstr ""
+msgstr "Your sent messages"
 
 #: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
 msgid "Twitter"
-msgstr ""
+msgstr "Twitter"
 
 #: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
 msgid "Twitter integration options"
-msgstr ""
+msgstr "Twitter integration options"
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
 msgid "To"
-msgstr ""
+msgstr "To"
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
 msgid "Could not parse message."
-msgstr ""
+msgstr "Could not parse message."
 
 #: actions/all.php:63 actions/facebookhome.php:162
 #, php-format
 msgid "%s and friends, page %d"
-msgstr ""
+msgstr "%s and friends, page %d"
 
 #: actions/avatarsettings.php:76
 msgid "You can upload your personal avatar."
-msgstr ""
+msgstr "You can upload your personal avatar."
 
 #  requires full stops?
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
 #: actions/grouplogo.php:250
 msgid "Avatar settings"
-msgstr ""
+msgstr "Avatar settings"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
 msgid "Original"
-msgstr ""
+msgstr "Original"
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
 msgid "Preview"
-msgstr ""
+msgstr "Preview"
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
 msgid "Crop"
-msgstr ""
+msgstr "Crop"
 
 #: actions/avatarsettings.php:248 actions/deletenotice.php:133
 #: actions/emailsettings.php:224 actions/grouplogo.php:307
@@ -3437,60 +3498,60 @@ msgstr ""
 #: actions/subedit.php:38 actions/twittersettings.php:290
 #: actions/userauthorization.php:39
 msgid "There was a problem with your session token. "
-msgstr ""
+msgstr "There was a problem with your session token. "
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
 msgid "Pick a square area of the image to be your avatar"
-msgstr ""
+msgstr "Pick a square area of the image to be your avatar"
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
 msgid "Lost our file data."
-msgstr ""
+msgstr "Lost our file data."
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
 #: classes/User_group.php:112
 msgid "Lost our file."
-msgstr ""
+msgstr "Lost our file."
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
 #: classes/User_group.php:129 classes/User_group.php:161
 msgid "Unknown file type"
-msgstr ""
+msgstr "Unknown file type"
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
 msgid "No profile specified."
-msgstr ""
+msgstr "No profile specified."
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
 #: actions/unblock.php:75
 msgid "No profile with that ID."
-msgstr ""
+msgstr "No profile with that ID."
 
 #: actions/block.php:111
 msgid "Block user"
-msgstr ""
+msgstr "Block user"
 
 #: actions/block.php:129
 msgid "Are you sure you want to block this user? "
-msgstr ""
+msgstr "Are you sure you want to block this user? "
 
 #: actions/block.php:162
 msgid "You have already blocked this user."
-msgstr ""
+msgstr "You have already blocked this user."
 
 #: actions/block.php:167
 msgid "Failed to save block information."
-msgstr ""
+msgstr "Failed to save block information."
 
 #: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been "
-msgstr "The address ‘%s’ has been "
+msgstr "The address \"%s\" has been "
 
 #: actions/deletenotice.php:73
 msgid "You are about to permanently delete a notice. "
-msgstr ""
+msgstr "You are about to permanently delete a notice. "
 
 #: actions/disfavor.php:94
 msgid "Add to favorites"
@@ -3499,62 +3560,62 @@ msgstr "Add to favourites"
 #: actions/editgroup.php:54
 #, php-format
 msgid "Edit %s group"
-msgstr ""
+msgstr "Edit %s group"
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
 msgid "Inboxes must be enabled for groups to work"
-msgstr "In-boxes must be enabled for groups to work"
+msgstr "Inboxes must be enabled for groups to work"
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
 msgid "You must be logged in to create a group."
-msgstr ""
+msgstr "You must be logged in to create a group."
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
 #: actions/showgroup.php:121
 msgid "No nickname"
-msgstr ""
+msgstr "No nickname"
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
 #: actions/showgroup.php:128
 msgid "No such group"
-msgstr ""
+msgstr "No such group"
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
 #: actions/grouplogo.php:107
 msgid "You must be an admin to edit the group"
-msgstr ""
+msgstr "You must be an admin to edit the group"
 
 #: actions/editgroup.php:157
 msgid "Use this form to edit the group."
-msgstr ""
+msgstr "Use this form to edit the group."
 
 #: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
 msgid "Nickname must have only lowercase letters "
-msgstr ""
+msgstr "Nickname must have only lowercase letters "
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
 msgid "description is too long (max 140 chars)."
-msgstr ""
+msgstr "description is too long (max 140 chars)."
 
 #: actions/editgroup.php:218
 msgid "Could not update group."
-msgstr ""
+msgstr "Could not update group."
 
 #: actions/editgroup.php:226
 msgid "Options saved."
-msgstr ""
+msgstr "Options saved."
 
 #: actions/emailsettings.php:107 actions/imsettings.php:108
 #, php-format
 msgid "Awaiting confirmation on this address. "
-msgstr ""
+msgstr "Awaiting confirmation on this address. "
 
 #: actions/emailsettings.php:139 actions/smssettings.php:150
 msgid "Make a new email address for posting to; "
-msgstr "Make a new e-mail address for posting to - "
+msgstr "Make a new e-mail address for posting to; "
 
 #: actions/emailsettings.php:157
 msgid "Send me email when someone "
@@ -3574,105 +3635,105 @@ msgstr "A confirmation code was sent to the e-mail address you added. "
 
 #: actions/facebookhome.php:110
 msgid "Server error - couldn't get user!"
-msgstr "Server error - couldn’t get user!"
+msgstr "Server error - couldn't get user!"
 
 #: actions/facebookhome.php:196
 #, php-format
 msgid "If you would like the %s app to automatically update "
-msgstr ""
+msgstr "If you would like the %s app to automatically update "
 
 #: actions/facebookhome.php:213 actions/facebooksettings.php:137
 #, php-format
 msgid "Allow %s to update my Facebook status"
-msgstr ""
+msgstr "Allow %s to update my Facebook status"
 
 #: actions/facebookhome.php:218
 msgid "Skip"
-msgstr ""
+msgstr "Skip"
 
 #: actions/facebookhome.php:235
 msgid "No notice content!"
-msgstr ""
+msgstr "No notice content!"
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
 msgid "Pagination"
-msgstr ""
+msgstr "Pagination"
 
 #  erm, not sure what to do here, « is recognised as a quotation mark.
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
 msgid "After"
-msgstr ""
+msgstr "After"
 
 #  erm, not sure what to do here, » is recognised as a quotation mark.
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
 msgid "Before"
-msgstr ""
+msgstr "Before"
 
 #: actions/facebookinvite.php:70
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
-msgstr ""
+msgstr "Thanks for inviting your friends to use %s"
 
 #: actions/facebookinvite.php:72
 msgid "Invitations have been sent to the following users:"
-msgstr ""
+msgstr "Invitations have been sent to the following users:"
 
 #: actions/facebookinvite.php:96
 #, php-format
 msgid "You have been invited to %s"
-msgstr ""
+msgstr "You have been invited to %s"
 
 #: actions/facebookinvite.php:105
 #, php-format
 msgid "Invite your friends to use %s"
-msgstr ""
+msgstr "Invite your friends to use %s"
 
 #: actions/facebookinvite.php:113
 #, php-format
 msgid "Friends already using %s:"
-msgstr ""
+msgstr "Friends already using %s:"
 
 #: actions/facebookinvite.php:130
 #, php-format
 msgid "Send invitations"
-msgstr ""
+msgstr "Send invitations"
 
 #: actions/facebookremove.php:56
 msgid "Couldn't remove Facebook user."
-msgstr "Couldn’t remove Facebook user."
+msgstr "Couldn't remove Facebook user."
 
 #: actions/facebooksettings.php:65
 msgid "There was a problem saving your sync preferences!"
-msgstr ""
+msgstr "There was a problem saving your sync preferences!"
 
 #: actions/facebooksettings.php:67
 msgid "Sync preferences saved."
-msgstr ""
+msgstr "Sync preferences saved."
 
 #: actions/facebooksettings.php:90
 msgid "Automatically update my Facebook status with my notices."
-msgstr ""
+msgstr "Automatically update my Facebook status with my notices."
 
 #: actions/facebooksettings.php:97
 msgid "Send \"@\" replies to Facebook."
-msgstr "Send ‘@’ replies to Facebook."
+msgstr "Send \"@\" replies to Facebook."
 
 #: actions/facebooksettings.php:106
 msgid "Prefix"
-msgstr ""
+msgstr "Prefix"
 
 #: actions/facebooksettings.php:108
 msgid "A string to prefix notices with."
-msgstr ""
+msgstr "A string to prefix notices with."
 
 #: actions/facebooksettings.php:124
 #, php-format
 msgid "If you would like %s to automatically update "
-msgstr ""
+msgstr "If you would like %s to automatically update "
 
 #: actions/facebooksettings.php:147
 msgid "Sync preferences"
-msgstr ""
+msgstr "Sync preferences"
 
 #: actions/favor.php:94 lib/disfavorform.php:140
 msgid "Disfavor favorite"
@@ -3681,310 +3742,313 @@ msgstr "Disfavor favourite"
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
 #: lib/publicgroupnav.php:91
 msgid "Popular notices"
-msgstr ""
+msgstr "Popular notices"
 
 #: actions/favorited.php:67
 #, php-format
 msgid "Popular notices, page %d"
-msgstr ""
+msgstr "Popular notices, page %d"
 
 #: actions/favorited.php:79
 msgid "The most popular notices on the site right now."
-msgstr ""
+msgstr "The most popular notices on the site right now."
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
 #: lib/publicgroupnav.php:87
 msgid "Featured users"
-msgstr ""
+msgstr "Featured users"
 
 #: actions/featured.php:71
 #, php-format
 msgid "Featured users, page %d"
-msgstr ""
+msgstr "Featured users, page %d"
 
 #: actions/featured.php:99
 #, php-format
 msgid "A selection of some of the great users on %s"
-msgstr ""
+msgstr "A selection of some of the great users on %s"
 
 #: actions/finishremotesubscribe.php:188
 msgid "That user has blocked you from subscribing."
-msgstr ""
+msgstr "That user has blocked you from subscribing."
 
 #: actions/groupbyid.php:79
 msgid "No ID"
-msgstr ""
+msgstr "No ID"
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
 msgid "Group logo"
-msgstr ""
+msgstr "Group logo"
 
 #: actions/grouplogo.php:149
 msgid "You can upload a logo image for your group."
-msgstr ""
+msgstr "You can upload a logo image for your group."
 
 #: actions/grouplogo.php:448
 msgid "Logo updated."
-msgstr ""
+msgstr "Logo updated."
 
 #: actions/grouplogo.php:450
 msgid "Failed updating logo."
-msgstr "Failed to update logo."
+msgstr "Failed updating logo."
 
 #: actions/groupmembers.php:93 lib/groupnav.php:91
 #, php-format
 msgid "%s group members"
-msgstr ""
+msgstr "%s group members"
 
 #: actions/groupmembers.php:96
 #, php-format
 msgid "%s group members, page %d"
-msgstr ""
+msgstr "%s group members, page %d"
 
 #: actions/groupmembers.php:111
 msgid "A list of the users in this group."
-msgstr ""
+msgstr "A list of the users in this group."
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
 #: lib/subgroupnav.php:96
 msgid "Groups"
-msgstr ""
+msgstr "Groups"
 
 #: actions/groups.php:64
 #, php-format
 msgid "Groups, page %d"
-msgstr ""
+msgstr "Groups, page %d"
 
 #: actions/groups.php:90
 #, php-format
 msgid "%%%%site.name%%%% groups let you find and talk with "
-msgstr ""
+msgstr "%%%%site.name%%%% groups let you find and talk with "
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
 msgid "Create a new group"
-msgstr ""
+msgstr "Create a new group"
 
 #: actions/groupsearch.php:57
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
 msgstr ""
+"Search for groups on %%site.name%% by their name, location, or description. "
 
 #: actions/groupsearch.php:63
 msgid "Group search"
-msgstr ""
+msgstr "Group search"
 
 #: actions/imsettings.php:70
 msgid "You can send and receive notices through "
-msgstr ""
+msgstr "You can send and receive notices through "
 
 #: actions/imsettings.php:120
 #, php-format
 msgid "Jabber or GTalk address, "
-msgstr ""
+msgstr "Jabber or GTalk address, "
 
 #: actions/imsettings.php:147
 msgid "Send me replies through Jabber/GTalk "
-msgstr ""
+msgstr "Send me replies through Jabber/GTalk "
 
 #: actions/imsettings.php:321
 #, php-format
 msgid "A confirmation code was sent "
-msgstr ""
+msgstr "A confirmation code was sent "
 
 #: actions/joingroup.php:65
 msgid "You must be logged in to join a group."
-msgstr ""
+msgstr "You must be logged in to join a group."
 
 #: actions/joingroup.php:95
 msgid "You are already a member of that group"
-msgstr ""
+msgstr "You are already a member of that group"
 
 #: actions/joingroup.php:128
 #, php-format
 msgid "Could not join user %s to group %s"
-msgstr ""
+msgstr "Could not join user %s to group %s"
 
 #: actions/joingroup.php:135
 #, php-format
 msgid "%s joined group %s"
-msgstr ""
+msgstr "%s joined group %s"
 
 #: actions/leavegroup.php:60
 msgid "Inboxes must be enabled for groups to work."
-msgstr "In-boxes must be enabled for groups to work."
+msgstr "Inboxes must be enabled for groups to work."
 
 #: actions/leavegroup.php:65
 msgid "You must be logged in to leave a group."
-msgstr ""
+msgstr "You must be logged in to leave a group."
 
 #: actions/leavegroup.php:88
 msgid "No such group."
-msgstr ""
+msgstr "No such group."
 
 #: actions/leavegroup.php:95
 msgid "You are not a member of that group."
-msgstr ""
+msgstr "You are not a member of that group."
 
 #: actions/leavegroup.php:100
 msgid "You may not leave a group while you are its administrator."
-msgstr ""
+msgstr "You may not leave a group while you are its administrator."
 
 #: actions/leavegroup.php:130
 msgid "Could not find membership record."
-msgstr ""
+msgstr "Could not find membership record."
 
 #  Thought form was incorrect
 #: actions/leavegroup.php:138
 #, php-format
 msgid "Could not remove user %s to group %s"
-msgstr ""
+msgstr "Could not remove user %s to group %s"
 
 #: actions/leavegroup.php:145
 #, php-format
 msgid "%s left group %s"
-msgstr ""
+msgstr "%s left group %s"
 
 #: actions/login.php:225 lib/facebookaction.php:304
 msgid "Login to site"
-msgstr "Log-in to site"
+msgstr "Login to site"
 
 #: actions/microsummary.php:69
 msgid "No current status"
-msgstr ""
+msgstr "No current status"
 
 #: actions/newgroup.php:53
 msgid "New group"
-msgstr ""
+msgstr "New group"
 
 #: actions/newgroup.php:115
 msgid "Use this form to create a new group."
-msgstr ""
+msgstr "Use this form to create a new group."
 
 #: actions/newgroup.php:177
 msgid "Could not create group."
-msgstr "Couldn’t create group."
+msgstr "Could not create group."
 
 #: actions/newgroup.php:191
 msgid "Could not set group membership."
-msgstr "Couldn’t set group membership."
+msgstr "Could not set group membership."
 
 #: actions/newmessage.php:119 actions/newnotice.php:132
 msgid "That's too long. "
-msgstr "That’s too long."
+msgstr "That's too long. "
 
 #: actions/newmessage.php:134
 msgid "Don't send a message to yourself; "
-msgstr "Don’t send a message to yourself - "
+msgstr "Don't send a message to yourself; "
 
 #: actions/newnotice.php:166
 msgid "Notice posted"
-msgstr ""
+msgstr "Notice posted"
 
 #: actions/newnotice.php:200 classes/Channel.php:163
 msgid "Ajax Error"
-msgstr ""
+msgstr "Ajax Error"
 
 #: actions/nudge.php:85
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
-"This user doesn’t allow nudges or hasn’t confirmed or set his e-mail yet."
+"This user doesn't allow nudges or hasn't confirmed or set his e-mail yet."
 
 #: actions/nudge.php:94
 msgid "Nudge sent"
-msgstr ""
+msgstr "Nudge sent"
 
 #: actions/nudge.php:97
 msgid "Nudge sent!"
-msgstr ""
+msgstr "Nudge sent!"
 
 #: actions/openidlogin.php:97
 msgid "OpenID login"
-msgstr "OpenID log-in"
+msgstr "OpenID login"
 
 #: actions/openidsettings.php:128
 msgid "Removing your only OpenID "
-msgstr ""
+msgstr "Removing your only OpenID "
 
 #  requires full stops?
 #: actions/othersettings.php:60
 msgid "Other Settings"
-msgstr ""
+msgstr "Other Settings"
 
 #: actions/othersettings.php:71
 msgid "Manage various other options."
-msgstr ""
+msgstr "Manage various other options."
 
 #: actions/othersettings.php:93
 msgid "URL Auto-shortening"
-msgstr ""
+msgstr "URL Auto-shortening"
 
 #: actions/othersettings.php:112
 msgid "Service"
-msgstr ""
+msgstr "Service"
 
 #: actions/othersettings.php:113
 msgid "Automatic shortening service to use."
-msgstr ""
+msgstr "Automatic shortening service to use."
 
 #: actions/othersettings.php:144
 msgid "URL shortening service is too long (max 50 chars)."
-msgstr ""
+msgstr "URL shortening service is too long (max 50 chars)."
 
 #: actions/passwordsettings.php:69
 msgid "Change your password."
-msgstr ""
+msgstr "Change your password."
 
 #: actions/passwordsettings.php:89
 msgid "Password change"
-msgstr ""
+msgstr "Password change"
 
 #: actions/peopletag.php:35
 #, php-format
 msgid "Not a valid people tag: %s"
-msgstr ""
+msgstr "Not a valid people tag: %s"
 
 #: actions/peopletag.php:47
 #, php-format
 msgid "Users self-tagged with %s - page %d"
-msgstr ""
+msgstr "Users self-tagged with %s - page %d"
 
 #: actions/peopletag.php:91
 #, php-format
 msgid "These are users who have tagged themselves \"%s\" "
-msgstr "These are users who have tagged themselves ‘%s’ "
+msgstr "These are users who have tagged themselves \"%s\" "
 
 #: actions/profilesettings.php:91
 msgid "Profile information"
-msgstr ""
+msgstr "Profile information"
 
 #: actions/profilesettings.php:124
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- "
+"separated"
 
 #: actions/profilesettings.php:144
 msgid "Automatically subscribe to whoever "
-msgstr ""
+msgstr "Automatically subscribe to whoever "
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
 #, php-format
 msgid "Invalid tag: \"%s\""
-msgstr ""
+msgstr "Invalid tag: \"%s\""
 
 #: actions/profilesettings.php:311
 msgid "Couldn't save tags."
-msgstr "Couldn’t save tags."
+msgstr "Couldn't save tags."
 
 #: actions/public.php:107
 #, php-format
 msgid "Public timeline, page %d"
-msgstr ""
+msgstr "Public timeline, page %d"
 
 #: actions/public.php:173
 msgid "Could not retrieve public stream."
-msgstr ""
+msgstr "Could not retrieve public stream."
 
 #: actions/public.php:220
 #, php-format
@@ -3992,60 +4056,62 @@ msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service "
 msgstr ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki"
+"/Micro-blogging) service "
 
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
-msgstr ""
+msgstr "Public tag cloud"
 
 #: actions/publictagcloud.php:63
 #, php-format
 msgid "These are most popular recent tags on %s "
-msgstr ""
+msgstr "These are most popular recent tags on %s "
 
 #: actions/publictagcloud.php:119
 msgid "Tag cloud"
-msgstr ""
+msgstr "Tag cloud"
 
 #: actions/register.php:139 actions/register.php:349
 msgid "Sorry, only invited people can register."
-msgstr ""
+msgstr "Sorry, only invited people can register."
 
 #: actions/register.php:149
 msgid "You can't register if you don't "
-msgstr "You can’t register if you don’t "
+msgstr "You can't register if you don't "
 
 #: actions/register.php:286
 msgid "With this form you can create "
-msgstr ""
+msgstr "With this form you can create "
 
 #: actions/register.php:368
 msgid "1-64 lowercase letters or numbers, "
-msgstr ""
+msgstr "1-64 lowercase letters or numbers, "
 
 #: actions/register.php:382 actions/register.php:386
 msgid "Used only for updates, announcements, "
-msgstr ""
+msgstr "Used only for updates, announcements, "
 
 #: actions/register.php:398
 msgid "URL of your homepage, blog, "
-msgstr ""
+msgstr "URL of your homepage, blog, "
 
 #: actions/register.php:404
 msgid "Describe yourself and your "
-msgstr ""
+msgstr "Describe yourself and your "
 
 #: actions/register.php:410
 msgid "Where you are, like \"City, "
-msgstr "Where you are, like ‘City, "
+msgstr "Where you are, like \"City, "
 
 #: actions/register.php:432
 msgid " except this private data: password, "
-msgstr ""
+msgstr " except this private data: password, "
 
 #: actions/register.php:471
 #, php-format
 msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
-msgstr ""
+msgstr "Congratulations, %s! And welcome to %%%%site.name%%%%. "
 
 #: actions/register.php:495
 msgid "(You should receive a message by email "
@@ -4053,12 +4119,12 @@ msgstr "(You should receive a message by e-mail "
 
 #: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
 msgid "That's a local profile! Login to subscribe."
-msgstr "That’s a local profile! Log-in to subscribe."
+msgstr "That's a local profile! Login to subscribe."
 
 #: actions/replies.php:118
 #, php-format
 msgid "Replies to %s, page %d"
-msgstr ""
+msgstr "Replies to %s, page %d"
 
 #: actions/showfavorites.php:79
 #, php-format
@@ -4068,49 +4134,49 @@ msgstr "%s favourite notices, page %d"
 #: actions/showgroup.php:77 lib/groupnav.php:85
 #, php-format
 msgid "%s group"
-msgstr ""
+msgstr "%s group"
 
 #: actions/showgroup.php:79
 #, php-format
 msgid "%s group, page %d"
-msgstr ""
+msgstr "%s group, page %d"
 
 #: actions/showgroup.php:206
 msgid "Group profile"
-msgstr ""
+msgstr "Group profile"
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
 msgid "Note"
-msgstr ""
+msgstr "Note"
 
 #: actions/showgroup.php:270
 msgid "Group actions"
-msgstr ""
+msgstr "Group actions"
 
 #: actions/showgroup.php:323
 #, php-format
 msgid "Notice feed for %s group"
-msgstr ""
+msgstr "Notice feed for %s group"
 
 #: actions/showgroup.php:357 lib/groupnav.php:90
 msgid "Members"
-msgstr ""
+msgstr "Members"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
 #: lib/tagcloudsection.php:71
 msgid "(None)"
-msgstr ""
+msgstr "(None)"
 
 #: actions/showgroup.php:370
 msgid "All members"
-msgstr ""
+msgstr "All members"
 
 #: actions/showgroup.php:378
 #, php-format
@@ -4118,47 +4184,49 @@ msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-"
+"blogging](http://en.wikipedia.org/wiki/Micro-blogging) service "
 
 #: actions/showmessage.php:98
 msgid "Only the sender and recipient "
-msgstr ""
+msgstr "Only the sender and recipient "
 
 #: actions/showstream.php:73
 #, php-format
 msgid "%s, page %d"
-msgstr ""
+msgstr "%s, page %d"
 
 #: actions/showstream.php:143
 msgid "'s profile"
-msgstr "’s profile"
+msgstr "'s profile"
 
 #: actions/showstream.php:236 actions/tagother.php:77
 msgid "User profile"
-msgstr ""
+msgstr "User profile"
 
 #: actions/showstream.php:240 actions/tagother.php:81
 msgid "Photo"
-msgstr ""
+msgstr "Photo"
 
 #: actions/showstream.php:317
 msgid "User actions"
-msgstr ""
+msgstr "User actions"
 
 #: actions/showstream.php:342
 msgid "Send a direct message to this user"
-msgstr ""
+msgstr "Send a direct message to this user"
 
 #: actions/showstream.php:343
 msgid "Message"
-msgstr ""
+msgstr "Message"
 
 #: actions/showstream.php:451
 msgid "All subscribers"
-msgstr ""
+msgstr "All subscribers"
 
 #: actions/showstream.php:533
 msgid "All groups"
-msgstr ""
+msgstr "All groups"
 
 #: actions/showstream.php:542
 #, php-format
@@ -4166,254 +4234,260 @@ msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-"
+"blogging](http://en.wikipedia.org/wiki/Micro-blogging) service "
 
 #: actions/smssettings.php:128
 msgid "Phone number, no punctuation or spaces, "
-msgstr ""
+msgstr "Phone number, no punctuation or spaces, "
 
 #: actions/smssettings.php:162
 msgid "Send me notices through SMS; "
-msgstr ""
+msgstr "Send me notices through SMS; "
 
 #: actions/smssettings.php:335
 msgid "A confirmation code was sent to the phone number you added. "
-msgstr ""
+msgstr "A confirmation code was sent to the phone number you added. "
 
+# Carrier?
 #: actions/smssettings.php:453
+#, fuzzy
 msgid "Mobile carrier"
-msgstr ""
+msgstr "Mobile carrier"
 
 #: actions/subedit.php:70
 msgid "You are not subscribed to that profile."
-msgstr ""
+msgstr "You are not subscribed to that profile."
 
 #: actions/subedit.php:83
 msgid "Could not save subscription."
-msgstr "Couldn’t save subscription."
+msgstr "Could not save subscription."
 
 #: actions/subscribe.php:55
 msgid "Not a local user."
-msgstr ""
+msgstr "Not a local user."
 
 #: actions/subscribe.php:69
 msgid "Subscribed"
-msgstr ""
+msgstr "Subscribed"
 
 #: actions/subscribers.php:50
 #, php-format
 msgid "%s subscribers"
-msgstr ""
+msgstr "%s subscribers"
 
 #: actions/subscribers.php:52
 #, php-format
 msgid "%s subscribers, page %d"
-msgstr ""
+msgstr "%s subscribers, page %d"
 
 #: actions/subscribers.php:63
 msgid "These are the people who listen to "
-msgstr ""
+msgstr "These are the people who listen to "
 
 #: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who "
-msgstr ""
+msgstr "These are the people who "
 
 #: actions/subscriptions.php:52
 #, php-format
 msgid "%s subscriptions"
-msgstr ""
+msgstr "%s subscriptions"
 
 #: actions/subscriptions.php:54
 #, php-format
 msgid "%s subscriptions, page %d"
-msgstr ""
+msgstr "%s subscriptions, page %d"
 
 #: actions/subscriptions.php:65
 msgid "These are the people whose notices "
-msgstr ""
+msgstr "These are the people whose notices "
 
 #: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose "
-msgstr ""
+msgstr "These are the people whose "
 
 #: actions/subscriptions.php:122
 msgid "Jabber"
-msgstr ""
+msgstr "Jabber"
 
 #: actions/tag.php:43
 #, php-format
 msgid "Notices tagged with %s, page %d"
-msgstr ""
+msgstr "Notices tagged with %s, page %d"
 
 #: actions/tag.php:66
 #, php-format
 msgid "Messages tagged \"%s\", most recent first"
-msgstr "Messages tagged ‘%s’, most recent first"
+msgstr "Messages tagged \"%s\", most recent first"
 
 #: actions/tagother.php:33
 msgid "Not logged in"
-msgstr ""
+msgstr "Not logged in"
 
 #: actions/tagother.php:39
 msgid "No id argument."
-msgstr ""
+msgstr "No id argument."
 
 #: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
-msgstr ""
+msgstr "Tag %s"
 
 #: actions/tagother.php:141
 msgid "Tag user"
-msgstr ""
+msgstr "Tag user"
 
 #: actions/tagother.php:149
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 msgstr ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
 
 #: actions/tagother.php:164
 msgid "There was a problem with your session token."
-msgstr ""
+msgstr "There was a problem with your session token."
 
 #: actions/tagother.php:191
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
+"You can only tag people you are subscribed to or who are subscribed to you."
 
 #: actions/tagother.php:198
 msgid "Could not save tags."
-msgstr ""
+msgstr "Could not save tags."
 
 #: actions/tagother.php:233
 msgid "Use this form to add tags to your subscribers or subscriptions."
-msgstr ""
+msgstr "Use this form to add tags to your subscribers or subscriptions."
 
 #: actions/tagrss.php:35
 msgid "No such tag."
-msgstr ""
+msgstr "No such tag."
 
 #: actions/tagrss.php:66
 #, php-format
 msgid "Microblog tagged with %s"
-msgstr ""
+msgstr "Microblog tagged with %s"
 
 #: actions/twitapiblocks.php:47
 msgid "Block user failed."
-msgstr ""
+msgstr "Block user failed."
 
 #: actions/twitapiblocks.php:69
 msgid "Unblock user failed."
-msgstr ""
+msgstr "Unblock user failed."
 
 #: actions/twitapiusers.php:48
 msgid "Not found."
-msgstr ""
+msgstr "Not found."
 
 #: actions/twittersettings.php:71
 msgid "Add your Twitter account to automatically send "
-msgstr ""
+msgstr "Add your Twitter account to automatically send "
 
 #: actions/twittersettings.php:119
 msgid "Twitter user name"
-msgstr ""
+msgstr "Twitter user name"
 
 #: actions/twittersettings.php:126
 msgid "Twitter password"
-msgstr ""
+msgstr "Twitter password"
 
 #: actions/twittersettings.php:228
 msgid "Twitter Friends"
-msgstr ""
+msgstr "Twitter Friends"
 
 #: actions/twittersettings.php:327
 msgid "Username must have only numbers, "
-msgstr ""
+msgstr "Username must have only numbers, "
 
 #: actions/twittersettings.php:341
 #, php-format
 msgid "Unable to retrieve account information "
-msgstr ""
+msgstr "Unable to retrieve account information "
 
 #: actions/unblock.php:108
 msgid "Error removing the block."
-msgstr ""
+msgstr "Error removing the block."
 
 #: actions/unsubscribe.php:50
 msgid "No profile id in request."
-msgstr ""
+msgstr "No profile id in request."
 
 #: actions/unsubscribe.php:57
 msgid "No profile with that id."
-msgstr ""
+msgstr "No profile with that id."
 
 #: actions/unsubscribe.php:71
 msgid "Unsubscribed"
-msgstr ""
+msgstr "Unsubscribed"
 
 #: actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
-msgstr ""
+msgstr "%s groups"
 
 #: actions/usergroups.php:65
 #, php-format
 msgid "%s groups, page %d"
-msgstr ""
+msgstr "%s groups, page %d"
 
 #: classes/Notice.php:104
 msgid "Problem saving notice. Unknown user."
-msgstr ""
+msgstr "Problem saving notice. Unknown user."
 
 #: classes/Notice.php:109
 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."
+"Too many notices too fast; take a breather and post again in a few minutes."
 
 #: classes/Notice.php:116
 msgid "You are banned from posting notices on this site."
-msgstr ""
+msgstr "You are banned from posting notices on this site."
 
 #: lib/accountsettingsaction.php:108
 msgid "Upload an avatar"
-msgstr ""
+msgstr "Upload an avatar"
 
 #: lib/accountsettingsaction.php:119
 msgid "Other"
-msgstr ""
+msgstr "Other"
 
 #: lib/accountsettingsaction.php:120
 msgid "Other options"
-msgstr ""
+msgstr "Other options"
 
 #: lib/action.php:130
 #, php-format
 msgid "%s - %s"
-msgstr ""
+msgstr "%s - %s"
 
 #: lib/action.php:145
 msgid "Untitled page"
-msgstr ""
+msgstr "Untitled page"
 
 #: lib/action.php:316
 msgid "Primary site navigation"
-msgstr ""
+msgstr "Primary site navigation"
 
 #: lib/action.php:322
 msgid "Personal profile and friends timeline"
-msgstr ""
+msgstr "Personal profile and friends timeline"
 
 #: lib/action.php:325
 msgid "Search for people or text"
-msgstr ""
+msgstr "Search for people or text"
 
 #: lib/action.php:328
 msgid "Account"
-msgstr ""
+msgstr "Account"
 
 #: lib/action.php:328
 msgid "Change your email, avatar, password, profile"
@@ -4421,43 +4495,43 @@ msgstr "Change your e-mail, avatar, password, profile"
 
 #: lib/action.php:330
 msgid "Connect to IM, SMS, Twitter"
-msgstr "Connect to I.M., SMS, Twitter"
+msgstr "Connect to IM, SMS, Twitter"
 
 #: lib/action.php:332
 msgid "Logout from the site"
-msgstr "Log out from the site"
+msgstr "Logout from the site"
 
 #: lib/action.php:335
 msgid "Login to the site"
-msgstr "Log-in to the site"
+msgstr "Login to the site"
 
 #: lib/action.php:338
 msgid "Create an account"
-msgstr ""
+msgstr "Create an account"
 
 #: lib/action.php:341
 msgid "Login with OpenID"
-msgstr ""
+msgstr "Login with OpenID"
 
 #: lib/action.php:344
 msgid "Help me!"
-msgstr ""
+msgstr "Help me!"
 
 #: lib/action.php:362
 msgid "Site notice"
-msgstr ""
+msgstr "Site notice"
 
 #: lib/action.php:417
 msgid "Local views"
-msgstr ""
+msgstr "Local views"
 
 #: lib/action.php:472
 msgid "Page notice"
-msgstr ""
+msgstr "Page notice"
 
 #: lib/action.php:562
 msgid "Secondary site navigation"
-msgstr ""
+msgstr "Secondary site navigation"
 
 #: lib/action.php:602 lib/action.php:623
 msgid "Laconica software license"
@@ -4465,7 +4539,7 @@ msgstr "Laconica software licence"
 
 #: lib/action.php:630
 msgid "All "
-msgstr ""
+msgstr "All "
 
 #: lib/action.php:635
 msgid "license."
@@ -4473,11 +4547,11 @@ msgstr "licence."
 
 #: lib/blockform.php:123 lib/blockform.php:153
 msgid "Block this user"
-msgstr ""
+msgstr "Block this user"
 
 #: lib/blockform.php:153
 msgid "Block"
-msgstr ""
+msgstr "Block"
 
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
 msgid "Disfavor this notice"
@@ -4486,15 +4560,15 @@ msgstr "Disfavour this notice"
 #: lib/facebookaction.php:268
 #, php-format
 msgid "To use the %s Facebook Application you need to login "
-msgstr "To use the %s Facebook Application you need to log-in "
+msgstr "To use the %s Facebook Application you need to login "
 
 #: lib/facebookaction.php:271
 msgid " a new account."
-msgstr ""
+msgstr " a new account."
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
 msgid "Published"
-msgstr ""
+msgstr "Published"
 
 #: lib/favorform.php:114 lib/favorform.php:140
 msgid "Favor this notice"
@@ -4502,103 +4576,103 @@ msgstr "Favour this notice"
 
 #: lib/feedlist.php:64
 msgid "Export data"
-msgstr ""
+msgstr "Export data"
 
 #: lib/galleryaction.php:121
 msgid "Filter tags"
-msgstr ""
+msgstr "Filter tags"
 
 #: lib/galleryaction.php:131
 msgid "All"
-msgstr ""
+msgstr "All"
 
 #: lib/galleryaction.php:137
 msgid "Tag"
-msgstr ""
+msgstr "Tag"
 
 #: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
-msgstr ""
+msgstr "Choose a tag to narrow list"
 
 #: lib/galleryaction.php:139
 msgid "Go"
-msgstr ""
+msgstr "Go"
 
 #: lib/groupeditform.php:148
 msgid "URL of the homepage or blog of the group or topic"
-msgstr ""
+msgstr "URL of the homepage or blog of the group or topic"
 
 #: lib/groupeditform.php:151
 msgid "Description"
-msgstr ""
+msgstr "Description"
 
 #: lib/groupeditform.php:153
 msgid "Describe the group or topic in 140 chars"
-msgstr ""
+msgstr "Describe the group or topic in 140 chars"
 
 #: lib/groupeditform.php:158
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr "Location for the group, if any, like ‘City, State (or Region), Country’"
+msgstr "Location for the group, if any, like \"City, State (or Region), Country\""
 
 #: lib/groupnav.php:84 lib/searchgroupnav.php:84
 msgid "Group"
-msgstr ""
+msgstr "Group"
 
 #: lib/groupnav.php:100
 msgid "Admin"
-msgstr ""
+msgstr "Admin"
 
 #: lib/groupnav.php:101
 #, php-format
 msgid "Edit %s group properties"
-msgstr ""
+msgstr "Edit %s group properties"
 
 #: lib/groupnav.php:106
 msgid "Logo"
-msgstr ""
+msgstr "Logo"
 
 #: lib/groupnav.php:107
 #, php-format
 msgid "Add or edit %s logo"
-msgstr ""
+msgstr "Add or edit %s logo"
 
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
-msgstr ""
+msgstr "Groups with most members"
 
 #: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
-msgstr ""
+msgstr "Groups with most posts"
 
 #: lib/grouptagcloudsection.php:56
 #, php-format
 msgid "Tags in %s group's notices"
-msgstr ""
+msgstr "Tags in %s group's notices"
 
 #: lib/htmloutputter.php:104
 msgid "This page is not available in a "
-msgstr ""
+msgstr "This page is not available in a "
 
 #: lib/joinform.php:114
 msgid "Join"
-msgstr ""
+msgstr "Join"
 
 #: lib/leaveform.php:114
 msgid "Leave"
-msgstr ""
+msgstr "Leave"
 
 #: lib/logingroupnav.php:76
 msgid "Login with a username and password"
-msgstr "Log-in with a username and password"
+msgstr "Login with a username and password"
 
 #: lib/logingroupnav.php:79
 msgid "Sign up for a new account"
-msgstr ""
+msgstr "Sign up for a new account"
 
 #: lib/logingroupnav.php:82
 msgid "Login or register with OpenID"
-msgstr "Log-in or register with OpenID"
+msgstr "Login or register with OpenID"
 
 #: lib/mail.php:175
 #, php-format
@@ -4606,21 +4680,23 @@ msgid ""
 "Hey, %s.\n"
 "\n"
 msgstr ""
+"Hey, %s.\n"
+"\n"
 
 #: lib/mail.php:236
 #, php-format
 msgid "%1$s is now listening to "
-msgstr ""
+msgstr "%1$s is now listening to "
 
 #: lib/mail.php:254
 #, php-format
 msgid "Location: %s\n"
-msgstr ""
+msgstr "Location: %s\n"
 
 #: lib/mail.php:256
 #, php-format
 msgid "Homepage: %s\n"
-msgstr ""
+msgstr "Homepage: %s\n"
 
 #: lib/mail.php:258
 #, php-format
@@ -4628,158 +4704,160 @@ msgid ""
 "Bio: %s\n"
 "\n"
 msgstr ""
+"Bio: %s\n"
+"\n"
 
 #: lib/mail.php:461
 #, php-format
 msgid "You've been nudged by %s"
-msgstr "You’ve been nudged by %s"
+msgstr "You've been nudged by %s"
 
 #: lib/mail.php:465
 #, php-format
 msgid "%1$s (%2$s) is wondering what you are up to "
-msgstr ""
+msgstr "%1$s (%2$s) is wondering what you are up to "
 
 #: lib/mail.php:555
 #, php-format
 msgid "%1$s just added your notice from %2$s"
-msgstr ""
+msgstr "%1$s just added your notice from %2$s"
 
 #: lib/mailbox.php:229 lib/noticelist.php:380
 msgid "From"
-msgstr ""
+msgstr "From"
 
 #: lib/messageform.php:110
 msgid "Send a direct notice"
-msgstr ""
+msgstr "Send a direct notice"
 
 #: lib/noticeform.php:125
 msgid "Send a notice"
-msgstr ""
+msgstr "Send a notice"
 
 #: lib/noticeform.php:152
 msgid "Available characters"
-msgstr ""
+msgstr "Available characters"
 
 #: lib/noticelist.php:426
 msgid "in reply to"
-msgstr ""
+msgstr "in reply to"
 
 #: lib/noticelist.php:447 lib/noticelist.php:450
 msgid "Reply to this notice"
-msgstr ""
+msgstr "Reply to this notice"
 
 #: lib/noticelist.php:451
 msgid "Reply"
-msgstr ""
+msgstr "Reply"
 
 #: lib/noticelist.php:471 lib/noticelist.php:474
 msgid "Delete this notice"
-msgstr ""
+msgstr "Delete this notice"
 
 #: lib/noticelist.php:474
 msgid "Delete"
-msgstr ""
+msgstr "Delete"
 
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
-msgstr ""
+msgstr "Nudge this user"
 
 #: lib/nudgeform.php:128
 msgid "Nudge"
-msgstr ""
+msgstr "Nudge"
 
 #: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
-msgstr ""
+msgstr "Send a nudge to this user"
 
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
-msgstr "Tags in %s’s notices"
+msgstr "Tags in %s's notices"
 
 #: lib/profilelist.php:182
 msgid "(none)"
-msgstr ""
+msgstr "(none)"
 
 #: lib/publicgroupnav.php:76
 msgid "Public"
-msgstr ""
+msgstr "Public"
 
 #: lib/publicgroupnav.php:80
 msgid "User groups"
-msgstr ""
+msgstr "User groups"
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
 msgid "Recent tags"
-msgstr ""
+msgstr "Recent tags"
 
 #: lib/publicgroupnav.php:86
 msgid "Featured"
-msgstr ""
+msgstr "Featured"
 
 #: lib/publicgroupnav.php:90
 msgid "Popular"
-msgstr ""
+msgstr "Popular"
 
 #: lib/searchgroupnav.php:82
 msgid "Notice"
-msgstr ""
+msgstr "Notice"
 
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
-msgstr ""
+msgstr "Find groups on this site"
 
 #: lib/section.php:89
 msgid "Untitled section"
-msgstr ""
+msgstr "Untitled section"
 
 #: lib/subgroupnav.php:81
 #, php-format
 msgid "People %s subscribes to"
-msgstr ""
+msgstr "People %s subscribes to"
 
 #: lib/subgroupnav.php:89
 #, php-format
 msgid "People subscribed to %s"
-msgstr ""
+msgstr "People subscribed to %s"
 
 #: lib/subgroupnav.php:97
 #, php-format
 msgid "Groups %s is a member of"
-msgstr ""
+msgstr "Groups %s is a member of"
 
 #: lib/subgroupnav.php:104
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
+msgstr "Invite friends and colleagues to join you on %s"
 
 #: lib/subs.php:53
 msgid "User has blocked you."
-msgstr ""
+msgstr "User has blocked you."
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
-msgstr ""
+msgstr "Subscribe to this user"
 
 #: lib/tagcloudsection.php:56
 msgid "None"
-msgstr ""
+msgstr "None"
 
 #: lib/topposterssection.php:74
 msgid "Top posters"
-msgstr ""
+msgstr "Top posters"
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
 msgid "Unblock this user"
-msgstr ""
+msgstr "Unblock this user"
 
 #: lib/unblockform.php:150
 msgid "Unblock"
-msgstr ""
+msgstr "Unblock"
 
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
-msgstr ""
+msgstr "Unsubscribe from this user"
 
 #, fuzzy
 #~ msgid "Delete my account"
diff --git a/locale/es/LC_MESSAGES/laconica.mo b/locale/es/LC_MESSAGES/laconica.mo
index 0cde057a0..ba764b52d 100644
--- a/locale/es/LC_MESSAGES/laconica.mo
+++ b/locale/es/LC_MESSAGES/laconica.mo
diff --git a/locale/es/LC_MESSAGES/laconica.po b/locale/es/LC_MESSAGES/laconica.po
index 1d1955dc5..20c0c0490 100644
--- a/locale/es/LC_MESSAGES/laconica.po
+++ b/locale/es/LC_MESSAGES/laconica.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-01-30 19:59+0000\n"
-"Last-Translator: Paula Salazar <psalazar@cmet.net>\n"
+"PO-Revision-Date: 2009-07-12 05:49+0000\n"
+"Last-Translator: Jorge <xchido@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,10 +45,11 @@ msgstr "%1$s / Actualizaciones en respuesta a %2$s"
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s te ha invitado a unirte a ellos en %2$s"
+msgstr "%1$s te ha invitado a que te unas con el/ellos en %2$s"
 
 #: ../actions/invite.php:170
 #, php-format
+#, fuzzy
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
 "\n"
@@ -94,12 +95,13 @@ msgstr ""
 "\n"
 "%5$s\n"
 "\n"
-"Si quieres probar el servicio, cliquea el enlace debajo para aceptar la "
-"invitación.\n"
+"Si quieres inscribirte y probar el servicio, haz click en enlace debajo para "
+"aceptar la invitación.\n"
 "\n"
 "%6$s\n"
 "\n"
-"Si no, puedes ignorar este mensaje. Gracias por tu paciencia y tiempo.\n"
+"Si no deseas inscribirte puedes ignorar este mensaje. Gracias por tu "
+"paciencia y tiempo.\n"
 "\n"
 "Sinceramente, %2$s\n"
 
@@ -147,7 +149,7 @@ msgstr "%s (%s)"
 #: actions/publicrss.php:90
 #, php-format
 msgid "%s Public Stream"
-msgstr "Corriente pública de %s"
+msgstr "Mensajes publicos de %s"
 
 #: ../actions/all.php:47 ../actions/allrss.php:60
 #: ../actions/twitapistatuses.php:238 ../lib/stream.php:51 actions/all.php:47
@@ -4348,19 +4350,19 @@ msgid "These are the people who listen to "
 msgstr "Estas son las personas que escuchan"
 
 #: actions/subscribers.php:67
-#, fuzzy, php-format
+#, php-format
 msgid "These are the people who "
 msgstr "Estas son las personas que "
 
 #: actions/subscriptions.php:52
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscriptions"
 msgstr "Suscripciones %s"
 
 #: actions/subscriptions.php:54
 #, fuzzy, php-format
 msgid "%s subscriptions, page %d"
-msgstr "Suscripciones, página %d"
+msgstr "%s suscripciones, página %d"
 
 #: actions/subscriptions.php:65
 #, fuzzy
@@ -4393,9 +4395,8 @@ msgid "Not logged in"
 msgstr "No conectado."
 
 #: actions/tagother.php:39
-#, fuzzy
 msgid "No id argument."
-msgstr "No existe argumento de Id."
+msgstr "No existe argumento de ID."
 
 #: actions/tagother.php:65
 #, php-format
@@ -4435,12 +4436,11 @@ msgstr ""
 "Usar este formulario para agregar tags a tus suscriptores o suscripciones."
 
 #: actions/tagrss.php:35
-#, fuzzy
 msgid "No such tag."
 msgstr "No existe ese tag."
 
 #: actions/tagrss.php:66
-#, fuzzy, php-format
+#, php-format
 msgid "Microblog tagged with %s"
 msgstr "Microblog marcado con %s"
 
@@ -4466,7 +4466,6 @@ msgid "Twitter user name"
 msgstr "Nombre de usuario de Twitter"
 
 #: actions/twittersettings.php:126
-#, fuzzy
 msgid "Twitter password"
 msgstr "Contraseña de Twitter"
 
@@ -4494,9 +4493,8 @@ msgid "No profile id in request."
 msgstr "Ningún perfil de Id en solicitud."
 
 #: actions/unsubscribe.php:57
-#, fuzzy
 msgid "No profile with that id."
-msgstr "Ninfún perfil con ese Id."
+msgstr "Ningún perfil con ese ID."
 
 #: actions/unsubscribe.php:71
 #, fuzzy
diff --git a/locale/fr_FR/LC_MESSAGES/laconica.mo b/locale/fr_FR/LC_MESSAGES/laconica.mo
index 8945fe44a..d7c7ded01 100644
--- a/locale/fr_FR/LC_MESSAGES/laconica.mo
+++ b/locale/fr_FR/LC_MESSAGES/laconica.mo
diff --git a/locale/fr_FR/LC_MESSAGES/laconica.po b/locale/fr_FR/LC_MESSAGES/laconica.po
index 756b49605..58fd29067 100644
--- a/locale/fr_FR/LC_MESSAGES/laconica.po
+++ b/locale/fr_FR/LC_MESSAGES/laconica.po
@@ -19,8 +19,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-03-07 19:21+0000\n"
-"Last-Translator: Anarcat <anarcat@anarcat.ath.cx>\n"
+"PO-Revision-Date: 2009-05-01 23:42+0000\n"
+"Last-Translator: Nicolas Ritoux <niko@vulusu.ca>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -64,7 +64,7 @@ msgstr "%1$s / Réponses à %2$s"
 #: actions/invite.php:211
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s vous invite à vous inscrire à %2$s"
+msgstr "%1$s vous invite à vous inscrire sur %2$s"
 
 #: ../actions/invite.php:170
 #, php-format
@@ -91,11 +91,16 @@ msgid ""
 "\n"
 "Sincerely, %2$s\n"
 msgstr ""
-"%1$s vous invite à vous inscrire à %2$s (%3$s).\n"
+"%1$s vous invite à vous inscrire sur %2$s (%3$s).\n"
 "\n"
-"%2$s est un service de micro-blogging qui vous laisse garder contact avec des personnes que vous connaissez et des personnes qui vous intéressent.\n"
+"%2$s est un service de micro-blogging qui vous permet de rester en contact "
+"avec des personnes que vous connaissez et des personnes qui vous "
+"intéressent.\n"
 "\n"
-"Vous pouvez aussi partager des nouvelles à propos de vous, vos pensées, ou votre vie en ligne avec les personnes qui vous connaissent. C'est également un outil utile pour rencontrer de nouvelles personnes qui partagent vos intérêts.\n"
+"Vous pouvez aussi partager des informations sur vous, vos idées, ou votre "
+"vie en ligne avec les personnes qui vous connaissent. C'est également un "
+"outil utile pour rencontrer de nouvelles personnes qui partagent vos "
+"intérêts.\n"
 "\n"
 "%1$s dit:\n"
 "\n"
@@ -105,11 +110,13 @@ msgstr ""
 "\n"
 "%5$s\n"
 "\n"
-"Si vous souhaitez essayez ce service, cliquez sur le lien si dessous pour accepter l'invitation\n"
+"Si vous souhaitez essayez ce service, cliquez sur le lien ci-dessous pour "
+"accepter l'invitation\n"
 "\n"
 "%6$s\n"
 "\n"
-"Sinon, vous pouvez ignorer ce message. Merci pour votre patience et votre temps.\n"
+"Sinon, vous pouvez ignorer ce message. Merci pour votre patience et votre "
+"temps.\n"
 "\n"
 "Cordialement, %2$s\n"
 
@@ -280,12 +287,17 @@ msgstr "Un code de confirmation a été envoyé à votre adresse de messagerie i
 #: ../actions/emailsettings.php:213
 #: actions/emailsettings.php:231
 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 "Un code de confirmation a été envoyé à l'adresse courriel indiquée. Vérifiez votre boite de réception pour récupérer le code et les instructions."
+msgstr ""
+"Un code de confirmation a été envoyé à l'adresse courriel indiquée. Vérifiez "
+"votre boîte de réception pour récupérer le code et les instructions."
 
 #: ../actions/smssettings.php:216
 #: actions/smssettings.php:224
 msgid "A confirmation code was sent to the phone number you added. Check your inbox (and spam box!) for the code and instructions on how to use it."
-msgstr "Un code de confirmation a été envoyé au numéro de téléphone indiqué. Vérifiez votre boite de réception pour récupérer le code et les instructions."
+msgstr ""
+"Un code de confirmation a été envoyé au numéro de téléphone indiqué. "
+"Vérifiez votre boîte de réception pour récupérer le code et les "
+"instructions."
 
 #: ../actions/twitapiaccount.php:49
 #: ../actions/twitapihelp.php:45
@@ -2749,7 +2761,7 @@ msgstr ""
 #: lib/util.php:346
 #: lib/action.php:574
 msgid "Source"
-msgstr "Provenance"
+msgstr "Source"
 
 #: ../actions/showstream.php:296
 #: actions/showstream.php:311
diff --git a/locale/it_IT/LC_MESSAGES/laconica.mo b/locale/it_IT/LC_MESSAGES/laconica.mo
index d52a72284..3b17f71d0 100644
--- a/locale/it_IT/LC_MESSAGES/laconica.mo
+++ b/locale/it_IT/LC_MESSAGES/laconica.mo
diff --git a/locale/it_IT/LC_MESSAGES/laconica.po b/locale/it_IT/LC_MESSAGES/laconica.po
index 86ab6b255..13a629b69 100644
--- a/locale/it_IT/LC_MESSAGES/laconica.po
+++ b/locale/it_IT/LC_MESSAGES/laconica.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: laconica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-02-18 12:57+0000\n"
+"PO-Revision-Date: 2009-06-04 14:09+0000\n"
 "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
@@ -3555,7 +3555,7 @@ msgid "Failed to save block information."
 msgstr "Salvataggio delle informazioni per il blocco non riuscito."
 
 #: actions/confirmaddress.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "The address \"%s\" has been "
 msgstr "L'indirizzo \"%s\" è stato "
 
@@ -3624,12 +3624,10 @@ msgid "Awaiting confirmation on this address. "
 msgstr "Attesa la conferma per questo indirizzo. "
 
 #: actions/emailsettings.php:139 actions/smssettings.php:150
-#, fuzzy
 msgid "Make a new email address for posting to; "
 msgstr "Crea un nuovo indirizzo email per inviare messaggi; "
 
 #: actions/emailsettings.php:157
-#, fuzzy
 msgid "Send me email when someone "
 msgstr "Inviami un'email quando qualcuno "
 
@@ -4134,7 +4132,7 @@ msgstr "URL della tua pagina web, blog "
 #: actions/register.php:404
 #, fuzzy
 msgid "Describe yourself and your "
-msgstr "Descriviti assieme ai tuoi "
+msgstr "Descrivi te e i tuoi "
 
 #: actions/register.php:410
 #, fuzzy
@@ -4607,7 +4605,7 @@ msgstr "Blocca"
 # è un suggerimento
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
 msgid "Disfavor this notice"
-msgstr "Togli questa nota dai preferiti"
+msgstr "Togli questo messaggio dai preferiti"
 
 #: lib/facebookaction.php:268
 #, php-format
diff --git a/locale/ja_JP/LC_MESSAGES/laconica.mo b/locale/ja_JP/LC_MESSAGES/laconica.mo
index 136a73c49..d2f6ae8f5 100644
--- a/locale/ja_JP/LC_MESSAGES/laconica.mo
+++ b/locale/ja_JP/LC_MESSAGES/laconica.mo
diff --git a/locale/ja_JP/LC_MESSAGES/laconica.po b/locale/ja_JP/LC_MESSAGES/laconica.po
index 98fe89ac0..e260e585e 100644
--- a/locale/ja_JP/LC_MESSAGES/laconica.po
+++ b/locale/ja_JP/LC_MESSAGES/laconica.po
@@ -15,8 +15,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-01-26 15:04+0000\n"
-"Last-Translator: JaeHo Choi <sayhi2choi@gmail.com>\n"
+"PO-Revision-Date: 2009-05-19 00:01+0000\n"
+"Last-Translator: Roberto A Tsuchiya <beto.tsuchiya@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,7 +39,7 @@ msgstr "個人情報を除く:パスワード、メールアドレス、IMアド
 #: ../actions/showstream.php:400 ../lib/stream.php:109
 #: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
 msgid " from "
-msgstr ""
+msgstr "から"
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
 #: actions/twitapistatuses.php:347
@@ -142,18 +142,18 @@ msgstr "%s & ともだち"
 #: actions/twitapistatuses.php:33
 #, php-format
 msgid "%s public timeline"
-msgstr ""
+msgstr "%s パブリックタイムライン"
 
 #: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
 #, php-format
 msgid "%s status"
-msgstr ""
+msgstr "%s ステータス"
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
 #: actions/twitapistatuses.php:199
 #, php-format
 msgid "%s timeline"
-msgstr ""
+msgstr "%s タイムライン"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
 #: actions/twitapistatuses.php:36
@@ -194,7 +194,7 @@ msgstr "1～64字以内で、小文字アルファベット、数字、スペー
 
 #: ../actions/register.php:152 actions/register.php:166
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
+msgstr "1～64字以内で、小文字アルファベット、数字、スペース（句読点を除く）が必須です"
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
 #: actions/passwordsettings.php:102
@@ -209,7 +209,7 @@ msgstr "6文字以上。お忘れなく！"
 #: ../actions/register.php:154 actions/register.php:168
 #: actions/register.php:373
 msgid "6 or more characters. Required."
-msgstr ""
+msgstr "6文字以上が必須です。"
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, php-format
@@ -304,7 +304,7 @@ msgstr "OpenIDを追加"
 #: ../lib/settingsaction.php:97 lib/settingsaction.php:91
 #: lib/accountsettingsaction.php:117
 msgid "Add or remove OpenIDs"
-msgstr ""
+msgstr "OpenIDを追加または削除"
 
 #: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
@@ -420,7 +420,7 @@ msgstr "バイオグラフィが長すぎます。（最長140字）"
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
 msgid "Can't delete this notice."
-msgstr ""
+msgstr "この通知を削除できません。"
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #: actions/updateprofile.php:123
@@ -454,7 +454,7 @@ msgstr "その Jabbar ID を正規化できません"
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
 #: actions/emailsettings.php:311
 msgid "Cannot normalize that email address"
-msgstr ""
+msgstr "そのメールアドレスを正規化できません"
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
 #: actions/passwordsettings.php:110
@@ -464,7 +464,7 @@ msgstr "変更"
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
 #: lib/accountsettingsaction.php:114
 msgid "Change email handling"
-msgstr ""
+msgstr "メールの扱いを変更"
 
 #: ../actions/password.php:32 actions/profilesettings.php:36
 #: actions/passwordsettings.php:58
@@ -473,12 +473,12 @@ msgstr "パスワードの変更"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
 msgid "Change your password"
-msgstr ""
+msgstr "パスワードの変更"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
 #: lib/accountsettingsaction.php:105
 msgid "Change your profile settings"
-msgstr ""
+msgstr "プロファイル設定の変更"
 
 #: ../actions/password.php:43 ../actions/recoverpassword.php:181
 #: ../actions/register.php:155 ../actions/smssettings.php:65
@@ -505,7 +505,7 @@ msgstr "確認作業がキャンセルされました。"
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
 #: actions/smssettings.php:118
 msgid "Confirmation code"
-msgstr ""
+msgstr "確認コード"
 
 #: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 #: actions/confirmaddress.php:80
@@ -739,7 +739,7 @@ msgstr ""
 #: ../actions/emailsettings.php:32 actions/emailsettings.php:32
 #: actions/emailsettings.php:60
 msgid "Email Settings"
-msgstr ""
+msgstr "メール設定"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
 msgid "Email address already exists."
@@ -756,7 +756,7 @@ msgstr ""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
 msgid "Email addresses"
-msgstr ""
+msgstr "メールアドレス"
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 #: actions/recoverpassword.php:231
@@ -1011,7 +1011,7 @@ msgstr "不正なアバターURL '%s'"
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
 #, php-format
 msgid "Invalid email address: %s"
-msgstr ""
+msgstr "不正なメールアドレス：%s'"
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #: actions/updateprofile.php:102
@@ -4306,16 +4306,15 @@ msgstr "マイクロブログ by %s"
 
 #: actions/twitapiblocks.php:47
 msgid "Block user failed."
-msgstr ""
+msgstr "ユーザのブロックに失敗しました。"
 
 #: actions/twitapiblocks.php:69
 msgid "Unblock user failed."
-msgstr ""
+msgstr "ユーザのアンブロックに失敗しました。"
 
 #: actions/twitapiusers.php:48
-#, fuzzy
 msgid "Not found."
-msgstr "リクエストがありません！"
+msgstr "見つかりません。"
 
 #: actions/twittersettings.php:71
 msgid "Add your Twitter account to automatically send "
@@ -4326,52 +4325,47 @@ msgid "Twitter user name"
 msgstr ""
 
 #: actions/twittersettings.php:126
-#, fuzzy
 msgid "Twitter password"
-msgstr "新しいパスワード"
+msgstr "Twitterパスワード"
 
 #: actions/twittersettings.php:228
 msgid "Twitter Friends"
-msgstr ""
+msgstr "Twitterフレンド"
 
 #: actions/twittersettings.php:327
 msgid "Username must have only numbers, "
 msgstr ""
 
 #: actions/twittersettings.php:341
-#, fuzzy, php-format
+#, php-format
 msgid "Unable to retrieve account information "
-msgstr "メール承認を削除できません"
+msgstr "アカウント情報を取得できません"
 
 #: actions/unblock.php:108
-#, fuzzy
 msgid "Error removing the block."
-msgstr "ユーザ保存エラー"
+msgstr "ブロックの削除エラー"
 
 #: actions/unsubscribe.php:50
-#, fuzzy
 msgid "No profile id in request."
-msgstr "サーバから提供されるプロファイルURLはありません。"
+msgstr "リクエスト内にプロファイルIDがありません。"
 
 #: actions/unsubscribe.php:57
-#, fuzzy
 msgid "No profile with that id."
-msgstr "リモートプロファイルと一致するものがありません"
+msgstr "そのIDはプロファイルではありません。"
 
 #: actions/unsubscribe.php:71
-#, fuzzy
 msgid "Unsubscribed"
-msgstr "サブスクライブ中止"
+msgstr "サブスクライブ解除済み"
 
 #: actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
-msgstr ""
+msgstr "%s グループ"
 
 #: actions/usergroups.php:65
 #, php-format
 msgid "%s groups, page %d"
-msgstr ""
+msgstr "%s グループ, %d ページ"
 
 #: classes/Notice.php:104
 #, fuzzy
@@ -4388,17 +4382,16 @@ msgid "You are banned from posting notices on this site."
 msgstr ""
 
 #: lib/accountsettingsaction.php:108
-#, fuzzy
 msgid "Upload an avatar"
-msgstr "アバターの更新に失敗しました。"
+msgstr "アバターのアップロード"
 
 #: lib/accountsettingsaction.php:119
 msgid "Other"
-msgstr ""
+msgstr "その他"
 
 #: lib/accountsettingsaction.php:120
 msgid "Other options"
-msgstr ""
+msgstr "その他のオプション"
 
 #: lib/action.php:130
 #, php-format
@@ -4407,7 +4400,7 @@ msgstr ""
 
 #: lib/action.php:145
 msgid "Untitled page"
-msgstr ""
+msgstr "名称未設定ページ"
 
 #: lib/action.php:316
 msgid "Primary site navigation"
@@ -4419,43 +4412,39 @@ msgstr ""
 
 #: lib/action.php:325
 msgid "Search for people or text"
-msgstr ""
+msgstr "人々かテキストを検索"
 
 #: lib/action.php:328
-#, fuzzy
 msgid "Account"
-msgstr "About"
+msgstr "アカウント"
 
 #: lib/action.php:328
 msgid "Change your email, avatar, password, profile"
-msgstr ""
+msgstr "メールアドレス、アバター、パスワード、プロパティの変更"
 
 #: lib/action.php:330
 msgid "Connect to IM, SMS, Twitter"
-msgstr ""
+msgstr "IM、SMS、Twitterに接続"
 
 #: lib/action.php:332
 msgid "Logout from the site"
-msgstr ""
+msgstr "サイトからログアウト"
 
 #: lib/action.php:335
 msgid "Login to the site"
-msgstr ""
+msgstr "サイトへログイン"
 
 #: lib/action.php:338
-#, fuzzy
 msgid "Create an account"
 msgstr "アカウントを作成"
 
 #: lib/action.php:341
-#, fuzzy
 msgid "Login with OpenID"
-msgstr "そのようなOpenIDはありません。"
+msgstr "OpenIDでログイン"
 
 #: lib/action.php:344
-#, fuzzy
 msgid "Help me!"
-msgstr "ヘルプ"
+msgstr "助けて！"
 
 #: lib/action.php:362
 #, fuzzy
@@ -4486,16 +4475,15 @@ msgstr ""
 
 #: lib/action.php:635
 msgid "license."
-msgstr ""
+msgstr "ライセンス。"
 
 #: lib/blockform.php:123 lib/blockform.php:153
-#, fuzzy
 msgid "Block this user"
-msgstr "そのようなユーザはいません。"
+msgstr "このユーザをブロックする"
 
 #: lib/blockform.php:153
 msgid "Block"
-msgstr ""
+msgstr "ブロック"
 
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
 msgid "Disfavor this notice"
@@ -4507,27 +4495,24 @@ msgid "To use the %s Facebook Application you need to login "
 msgstr ""
 
 #: lib/facebookaction.php:271
-#, fuzzy
 msgid " a new account."
-msgstr "アカウントを作成"
+msgstr "新しいアカウント"
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-#, fuzzy
 msgid "Published"
-msgstr "パブリック"
+msgstr "発行済"
 
 #: lib/favorform.php:114 lib/favorform.php:140
-#, fuzzy
 msgid "Favor this notice"
-msgstr "そのような通知はありません。"
+msgstr "この通知をお気に入りにする"
 
 #: lib/feedlist.php:64
 msgid "Export data"
-msgstr ""
+msgstr "データのエクスポート"
 
 #: lib/galleryaction.php:121
 msgid "Filter tags"
-msgstr ""
+msgstr "タグのフィルター"
 
 #: lib/galleryaction.php:131
 msgid "All"
@@ -4535,7 +4520,7 @@ msgstr ""
 
 #: lib/galleryaction.php:137
 msgid "Tag"
-msgstr ""
+msgstr "タグ"
 
 #: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
@@ -4543,22 +4528,19 @@ msgstr ""
 
 #: lib/galleryaction.php:139
 msgid "Go"
-msgstr ""
+msgstr "移動"
 
 #: lib/groupeditform.php:148
-#, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
-msgstr "ホームページ、ブログ、プロファイル、その他サイトの URL"
+msgstr "グループやトピックのホームページやブログの URL"
 
 #: lib/groupeditform.php:151
-#, fuzzy
 msgid "Description"
-msgstr "サブスクリプション"
+msgstr "概要"
 
 #: lib/groupeditform.php:153
-#, fuzzy
 msgid "Describe the group or topic in 140 chars"
-msgstr "140字以内で自己紹介"
+msgstr "グループやトピックを140字以内記述"
 
 #: lib/groupeditform.php:158
 #, fuzzy
@@ -4568,39 +4550,38 @@ msgstr "いる場所, 例えば \"City, State (or Region), Country\""
 
 #: lib/groupnav.php:84 lib/searchgroupnav.php:84
 msgid "Group"
-msgstr ""
+msgstr "グループ"
 
 #: lib/groupnav.php:100
 msgid "Admin"
-msgstr ""
+msgstr "管理者"
 
 #: lib/groupnav.php:101
 #, php-format
 msgid "Edit %s group properties"
-msgstr ""
+msgstr "%s グループプロパティを編集"
 
 #: lib/groupnav.php:106
-#, fuzzy
 msgid "Logo"
-msgstr "ログアウト"
+msgstr "ロゴ"
 
 #: lib/groupnav.php:107
 #, php-format
 msgid "Add or edit %s logo"
-msgstr ""
+msgstr "%s ロゴの追加や編集"
 
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
-msgstr ""
+msgstr "メンバー数が多いグループ"
 
 #: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
-msgstr ""
+msgstr "投稿が多いグループ"
 
 #: lib/grouptagcloudsection.php:56
 #, php-format
 msgid "Tags in %s group's notices"
-msgstr ""
+msgstr "%s グループの通知にあるタグ"
 
 #: lib/htmloutputter.php:104
 #, fuzzy
@@ -4608,28 +4589,24 @@ msgid "This page is not available in a "
 msgstr "このページはあなたが承認したメディアタイプでは利用できません。"
 
 #: lib/joinform.php:114
-#, fuzzy
 msgid "Join"
-msgstr "ログイン"
+msgstr "参加"
 
 #: lib/leaveform.php:114
-#, fuzzy
 msgid "Leave"
-msgstr "保存"
+msgstr "離れる"
 
 #: lib/logingroupnav.php:76
-#, fuzzy
 msgid "Login with a username and password"
-msgstr "不正なユーザ名またはパスワード。"
+msgstr "ユーザ名とパスワードでログイン"
 
 #: lib/logingroupnav.php:79
-#, fuzzy
 msgid "Sign up for a new account"
-msgstr "アカウントを作成"
+msgstr "新しいアカウントでサインアップ"
 
 #: lib/logingroupnav.php:82
 msgid "Login or register with OpenID"
-msgstr ""
+msgstr "OpenIDでログインまたは登録"
 
 #: lib/mail.php:175
 #, php-format
@@ -4644,14 +4621,14 @@ msgid "%1$s is now listening to "
 msgstr "%1$s は %2$s であなたの通知を聞いています。"
 
 #: lib/mail.php:254
-#, fuzzy, php-format
+#, php-format
 msgid "Location: %s\n"
-msgstr "場所"
+msgstr "場所: %s\n"
 
 #: lib/mail.php:256
-#, fuzzy, php-format
+#, php-format
 msgid "Homepage: %s\n"
-msgstr "ホームページ"
+msgstr "ホームページ: %s\n"
 
 #: lib/mail.php:258
 #, php-format
@@ -4663,7 +4640,7 @@ msgstr ""
 #: lib/mail.php:461
 #, php-format
 msgid "You've been nudged by %s"
-msgstr ""
+msgstr "あなたは %s に突かれています"
 
 #: lib/mail.php:465
 #, php-format
@@ -4681,17 +4658,15 @@ msgstr ""
 
 #: lib/messageform.php:110
 msgid "Send a direct notice"
-msgstr ""
+msgstr "直接通知を送る"
 
 #: lib/noticeform.php:125
-#, fuzzy
 msgid "Send a notice"
-msgstr "新しい通知"
+msgstr "通知を送る"
 
 #: lib/noticeform.php:152
-#, fuzzy
 msgid "Available characters"
-msgstr "6文字以上"
+msgstr "利用可能な文字"
 
 #: lib/noticelist.php:426
 #, fuzzy
@@ -4700,32 +4675,31 @@ msgstr "...に対しての返信"
 
 #: lib/noticelist.php:447 lib/noticelist.php:450
 msgid "Reply to this notice"
-msgstr ""
+msgstr "この通知へ返信"
 
 #: lib/noticelist.php:451
-#, fuzzy
 msgid "Reply"
 msgstr "返信"
 
 #: lib/noticelist.php:471 lib/noticelist.php:474
 msgid "Delete this notice"
-msgstr ""
+msgstr "この通知を削除"
 
 #: lib/noticelist.php:474
 msgid "Delete"
-msgstr ""
+msgstr "削除"
 
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
-msgstr ""
+msgstr "このユーザを突く"
 
 #: lib/nudgeform.php:128
 msgid "Nudge"
-msgstr ""
+msgstr "突く"
 
 #: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
-msgstr ""
+msgstr "このユーザへ突きを送る"
 
 #: lib/personaltagcloudsection.php:56
 #, php-format
@@ -4734,7 +4708,7 @@ msgstr ""
 
 #: lib/profilelist.php:182
 msgid "(none)"
-msgstr ""
+msgstr "(なし)"
 
 #: lib/publicgroupnav.php:76
 msgid "Public"
@@ -4742,33 +4716,31 @@ msgstr "パブリック"
 
 #: lib/publicgroupnav.php:80
 msgid "User groups"
-msgstr ""
+msgstr "ユーザグループ"
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
 msgid "Recent tags"
-msgstr ""
+msgstr "最近のタグ"
 
 #: lib/publicgroupnav.php:86
 msgid "Featured"
 msgstr ""
 
 #: lib/publicgroupnav.php:90
-#, fuzzy
 msgid "Popular"
-msgstr "ピープルサーチ"
+msgstr "人気"
 
 #: lib/searchgroupnav.php:82
-#, fuzzy
 msgid "Notice"
 msgstr "通知"
 
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
-msgstr ""
+msgstr "このサイト上のグループを検索する"
 
 #: lib/section.php:89
 msgid "Untitled section"
-msgstr ""
+msgstr "名称未設定のセクション"
 
 #: lib/subgroupnav.php:81
 #, fuzzy, php-format
@@ -4806,20 +4778,19 @@ msgstr ""
 
 #: lib/topposterssection.php:74
 msgid "Top posters"
-msgstr ""
+msgstr "上位投稿者"
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
-#, fuzzy
 msgid "Unblock this user"
-msgstr "そのようなユーザはいません。"
+msgstr "このユーザをアンブロックする"
 
 #: lib/unblockform.php:150
 msgid "Unblock"
-msgstr ""
+msgstr "アンブロック"
 
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
-msgstr ""
+msgstr "このユーザからのサブスクライブを解除する"
 
 #, fuzzy
 #~ msgid "Delete my account"
diff --git a/locale/ko_KR/LC_MESSAGES/laconica.mo b/locale/ko_KR/LC_MESSAGES/laconica.mo
index 6040e6006..7d50135ab 100644
--- a/locale/ko_KR/LC_MESSAGES/laconica.mo
+++ b/locale/ko_KR/LC_MESSAGES/laconica.mo
diff --git a/locale/ko_KR/LC_MESSAGES/laconica.po b/locale/ko_KR/LC_MESSAGES/laconica.po
index 5d71b4773..6dcb6f5c5 100644
--- a/locale/ko_KR/LC_MESSAGES/laconica.po
+++ b/locale/ko_KR/LC_MESSAGES/laconica.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-03-12 16:17+0000\n"
-"Last-Translator: Evan Prodromou <evan@controlyourself.ca>\n"
+"PO-Revision-Date: 2009-06-23 04:01+0000\n"
+"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -84,7 +84,7 @@ msgstr ""
 "%1$s님이 말하기를:\n"
 "%4$s\n"
 "\n"
-"%1$s님의 %2$s 프로필을 보실 수 있습니다:\n"
+"%1$s님의 %2$s 프로파일을 보실 수 있습니다:\n"
 "\n"
 "%5$s\n"
 "\n"
@@ -92,7 +92,7 @@ msgstr ""
 "\n"
 "%6$s\n"
 "\n"
-"아니면 이 메세지를 무시하시면 됩니다. 여기까지 읽어 주셔서 감사합니다.\n"
+"아니면 이 메시지를 무시하시면 됩니다. 여기까지 읽어 주셔서 감사합니다.\n"
 "\n"
 "%2$s 보냄\n"
 
@@ -194,18 +194,18 @@ msgstr "**%%site.name%%** 는 마이크로블로깅서비스입니다."
 
 #: ../lib/util.php:274 lib/util.php:290
 msgid ". Contributors should be attributed by full name or nickname."
-msgstr ". 가입자들은 이름이나 별명으로 기재되어야 합니다."
+msgstr ". 가입자는 이름이나 별명으로 기재되어야 합니다."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
 #: lib/groupeditform.php:139
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64자 이내에서, 영소문자, 숫자로 이루어져야 합니다."
+msgstr "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다."
 
 #: ../actions/register.php:152 actions/register.php:166
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64자 이내에서, 영소문자, 숫자로 이루어져야 합니다.필수사항."
+msgstr "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다. 필수 입력."
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
 #: actions/passwordsettings.php:102
@@ -325,7 +325,7 @@ msgstr "주소"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
 msgid "Addresses of friends to invite (one per line)"
-msgstr "초청 할 친구들의 주소들 (한줄에 한명씩)"
+msgstr "초청할 친구들의 주소 (한 줄에 한 명씩)"
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
 #: actions/showstream.php:422
@@ -336,7 +336,7 @@ msgstr "모든 예약 구독"
 #: actions/publicrss.php:92
 #, php-format
 msgid "All updates for %s"
-msgstr "%s 를 위한 모든 업데이트"
+msgstr "%s의 모든 업데이트"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
 #: actions/noticesearchrss.php:90
@@ -370,7 +370,7 @@ msgstr "구독을 허가"
 #: ../actions/login.php:104 ../actions/register.php:178
 #: actions/register.php:192
 msgid "Automatically login in the future; not for shared computers!"
-msgstr "자동 로그인; 공용 컴퓨터에서는 불가"
+msgstr "앞으로는 자동으로 로그인합니다. 공용 컴퓨터에서는 이용하지 마십시오!"
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
 msgid ""
@@ -393,7 +393,7 @@ msgstr "아바타가 업데이트 되었습니다."
 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 를 추가하셨습니까?)"
+msgstr "이 주소는 인증 대기 중입니다. Jabber/Gtalk로 메시지를 확인해 주십시오.(%s 항목을 추가하셨습니까?)"
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
 msgid ""
@@ -426,13 +426,13 @@ msgstr "자기소개가 너무 깁니다. (최대 140글자)"
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
 msgid "Can't delete this notice."
-msgstr "이 통지를 지울 수 가 없습니다."
+msgstr "이 통지를 지울 수 없습니다."
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #: actions/updateprofile.php:123
 #, php-format
 msgid "Can't read avatar URL '%s'"
-msgstr "아바타(Avatar) URL '%s' 를 읽어낼 수 없습니다."
+msgstr "아바타 URL '%s'을(를) 읽어낼 수 없습니다."
 
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
@@ -450,12 +450,12 @@ msgstr "취소"
 
 #: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
 msgid "Cannot instantiate OpenID consumer object."
-msgstr "OpenID consumer object 를 생성할 수 없습니다."
+msgstr "OpenID consumer object를 생성할 수 없습니다."
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
 #: actions/imsettings.php:286
 msgid "Cannot normalize that Jabber ID"
-msgstr "그 Jabbar ID 를 정규화 할 수 없습니다."
+msgstr "그 Jabbar ID를 정규화 할 수 없습니다."
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
 #: actions/emailsettings.php:311
@@ -470,7 +470,7 @@ msgstr "변환"
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
 #: lib/accountsettingsaction.php:114
 msgid "Change email handling"
-msgstr "이메일 헨들링을 바꾸기"
+msgstr "이메일 처리 변경"
 
 #: ../actions/password.php:32 actions/profilesettings.php:36
 #: actions/passwordsettings.php:58
@@ -536,20 +536,20 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
-"%s 님 축하드립니다! %%%%site.name%%%% 에 가입하신것을 환영합니다!. 이제 부터 아래에 것들을 하실 수 있습니다...\n"
+"%s님 축하드립니다! %%%%site.name%%%%에 가입하신 것을 환영합니다!. 이제부터 아래의 일을 할 수 있습니다...\n"
 "\n"
-"* [나의 프로필](%s) 로 가셔서 첫 메시지를 포스트 해보세요.\n"
-"* [Jabber 또는 GTalk계정](%%%%action.imsettings%%%%) 을 추가하셔서 메신저로 통보를 받아 보세요.\n"
-"* [친구 찾기](%%%%action.peoplesearch%%%%) 알거나 같은 관심사를 가지고 계신분들을 찾아 보세요. \n"
-"* [프로필 셋팅](%%%%action.profilesettings%%%%) 을 업데이트 하셔서 다른분들에게 자신을 알려보세요. \n"
-"* [온라인 도움말](%%%%doc.help%%%%) 을 읽으면서 더 많은 기능들을 확인해 보세요. \n"
+"* [나의 프로필](%s) 로 가셔서 첫 메시지를 포스트 해보십시오.\n"
+"* [Jabber 또는 GTalk계정](%%%%action.imsettings%%%%)을 추가하셔서 메신저로 통보를 받아 보십시오.\n"
+"* [친구 찾기](%%%%action.peoplesearch%%%%) 알거나 같은 관심사를 가지고 있는 분들을 찾아 보십시오. \n"
+"* [프로필 셋팅](%%%%action.profilesettings%%%%)을 업데이트 하셔서 다른분들에게 자신을 알려보십시오. \n"
+"* [온라인 도움말](%%%%doc.help%%%%)을 읽으면서 더 많은 기능을 확인해 보십시오. \n"
 "\n"
-"다시 한번 가입하신것을 환영하면서 즐거운 서비스가 되셨으면 합니다."
+"다시 한번 가입하신 것을 환영하면서 즐거운 서비스가 되셨으면 합니다."
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
 #: actions/finishopenidlogin.php:119 lib/action.php:330
 msgid "Connect"
-msgstr "접속"
+msgstr "연결"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
 #: actions/finishopenidlogin.php:114
@@ -558,7 +558,7 @@ msgstr "기존의 계정으로 접속"
 
 #: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
 msgid "Contact"
-msgstr "컨텍트"
+msgstr "연락하기"
 
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
 #, php-format
@@ -776,12 +776,12 @@ msgstr "이메일 주소"
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 #: actions/recoverpassword.php:231
 msgid "Enter a nickname or email address."
-msgstr "별명이나 이메일 계정을 입력하세요."
+msgstr "별명이나 이메일 계정을 입력하십시오."
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
 #: actions/smssettings.php:119
 msgid "Enter the code you received on your phone."
-msgstr "휴대폰으로 받으신 인증번호를 입력하세요."
+msgstr "휴대폰으로 받으신 인증번호를 입력하십시오."
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 #: actions/userauthorization.php:161
@@ -866,7 +866,7 @@ msgstr "존재하는 별명"
 
 #: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
 msgid "FAQ"
-msgstr "자주 있는 질문"
+msgstr "자주 묻는 질문"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397
@@ -877,19 +877,19 @@ msgstr "아바타 업데이트 실패"
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
 #, php-format
 msgid "Feed for friends of %s"
-msgstr "%s 의 친구들을 위한 피드"
+msgstr "%s의 친구들을 위한 피드"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
 #: actions/repliesrss.php:71
 #, php-format
 msgid "Feed for replies to %s"
-msgstr "%s 의 답신들의 피드"
+msgstr "%s의 답신 피드"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
 #, php-format
 msgid "Feed for tag %s"
-msgstr "%s 테그들의 피드"
+msgstr "%s 태그의 피드"
 
 #: ../lib/searchaction.php:105 lib/searchaction.php:105
 #: lib/searchgroupnav.php:83
@@ -905,7 +905,7 @@ msgstr "이 사이트에 있는 사람 찾기"
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
-msgstr "보안을 위해 세팅을 저장하기 전에 계정과 비밀 번호를 다시 입력 해 주세요."
+msgstr "보안을 위해 세팅을 저장하기 전에 계정과 비밀 번호를 다시 입력 해 주십시오."
 
 #: ../actions/profilesettings.php:44 ../actions/register.php:164
 #: actions/profilesettings.php:77 actions/register.php:178
@@ -978,7 +978,7 @@ msgstr "만일 계정을 이미 가지고 계신다면, 계정과 비밀 번호�
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
-msgstr "만일 새 OpenID를 추가하실려면, 밑의 박스에 입력하신 후 \"추가\" 를 클릭해 주세요."
+msgstr "만일 새 OpenID를 추가하시려면, 밑의 박스에 입력하신 후 \"추가\"를 누르십시오."
 
 #: ../actions/recoverpassword.php:137
 msgid ""
@@ -1082,11 +1082,11 @@ msgstr "사용자 이름이나 비밀 번호가 틀렸습니다."
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
 msgid "Invitation(s) sent"
-msgstr "초대권(들)이 보내짐"
+msgstr "초대권을 보냈습니다"
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
 msgid "Invitation(s) sent to the following people:"
-msgstr "다음의 사람들에게 초대권(들)이 보내짐:"
+msgstr "다음 사람들에게 초대권을 보냈습니다:"
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
 #: lib/subgroupnav.php:103
@@ -1095,7 +1095,7 @@ msgstr "초대"
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
 msgid "Invite new users"
-msgstr "새 사용자들을 초대"
+msgstr "새 사용자를 초대"
 
 #: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
 #, php-format
@@ -1104,9 +1104,10 @@ msgid ""
 "s, available under the [GNU Affero General Public License](http://www.fsf."
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
-" [Laconica](http://laconi.ca/) 에 의하여 제공되는 마이크로블로깅 소프트웨어, 버전 %s, 다음의 라이선스 "
+"이 사이트는 [Laconica](http://laconi.ca/) 마이크로블로깅 소프트웨어 %s 버전을 사용합니다. Laconica는 "
 "[GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html) 를 가지고 있습니다."
+"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html) 라이선스에 따라 사용할 수 "
+"있습니다."
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
 #: actions/imsettings.php:296
@@ -1120,7 +1121,7 @@ msgid ""
 "add %s to your buddy list in your IM client or on GTalk."
 msgstr ""
 "\"UserName@example.org\" 와 같은 Jabber 또는 GTalk 계정은 귀하의 메신저나 GTalk 친구목록에 반드시 %s "
-"를 추가하여 주시기 바랍니다."
+"주소를 추가하여 주십시오."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
 #: actions/profilesettings.php:128
@@ -1174,7 +1175,7 @@ msgid ""
 "%). "
 msgstr ""
 "귀하의 계정과 비밀 번호로 로그인 하세요. 계정이 아직 없으세요? [가입](%%action.register%%) 새 계정을 생성 또는 "
-"[OpenID](%%action.openidlogin%%) 를 사용해 보세요."
+"[OpenID](%%action.openidlogin%%)를 사용해 보세요."
 
 #: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
 msgid "Logout"
@@ -1188,7 +1189,7 @@ msgstr "더욱 긴 이름을 요구합니다."
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
 #: lib/facebookaction.php:320
 msgid "Lost or forgotten password?"
-msgstr "비밀 번호를 잃으셨나요?"
+msgstr "비밀 번호를 잊으셨나요?"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
@@ -1199,17 +1200,17 @@ msgstr "포스팅을 위한 새 이메일 계정의 생성; 전 이메일 계정
 #: actions/emailsettings.php:71
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
-msgstr "%%site.name%% 으로 부터 어떻게 이메일을 받을 건지 정하세요."
+msgstr "%%site.name%%에서 어떻게 이메일을 받을지 정하십시오."
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
 #: actions/showstream.php:480
 msgid "Member since"
-msgstr "이 때 부터 멤버"
+msgstr "가입한 때"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
 #, php-format
 msgid "Microblog by %s"
-msgstr "%s 의 마이크로블로그"
+msgstr "%s의 마이크로블로그"
 
 #: ../actions/smssettings.php:304
 #, php-format
@@ -1222,7 +1223,7 @@ msgstr "귀하의 휴대폰의 통신회사는 무엇입니까?"
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
 msgid "My text and files are available under "
-msgstr "나의 글들과 파일들은 다음의 라이선스를 가지고 있습니다."
+msgstr "나의 글과 파일의 라이선스는 다음과 같습니다 "
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
@@ -1233,7 +1234,7 @@ msgstr "새로운"
 #: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
 #, php-format
 msgid "New email address for posting to %s"
-msgstr "%s 로 포스팅 할 새로운 이메일 주소"
+msgstr "%s에 포스팅 할 새로운 이메일 주소"
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
 #: actions/emailsettings.php:465
@@ -1311,7 +1312,7 @@ msgstr "아니오"
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
 #: actions/imsettings.php:279
 msgid "No Jabber ID."
-msgstr "Jabber ID 가 아닙니다."
+msgstr "Jabber ID가 아닙니다."
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
 #: actions/userauthorization.php:153
@@ -1537,7 +1538,7 @@ msgstr "유효한 프로필 URL이 아닙니다. (YADIS 문서가 없습니다)"
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
 #: lib/imagefile.php:87
 msgid "Not an image or corrupt file."
-msgstr "이미지가 아니거나 손상된 파일 입니다."
+msgstr "그림 파일이 아니거나 손상된 파일 입니다."
 
 #: ../actions/finishremotesubscribe.php:51
 #: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
@@ -1584,7 +1585,7 @@ msgstr "통지 검색"
 #: actions/showstream.php:192
 #, php-format
 msgid "Notice feed for %s"
-msgstr "%s 을(를) 위한 통지 피드"
+msgstr "%s의 통지 피드"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
 #: actions/shownotice.php:94
@@ -1601,7 +1602,7 @@ msgstr "통지"
 #: actions/tag.php:81 actions/tag.php:41
 #, php-format
 msgid "Notices tagged with %s"
-msgstr "%s 로 태그된 통지들"
+msgstr "%s 태그된 통지"
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
 #: actions/passwordsettings.php:97
@@ -1773,7 +1774,7 @@ msgstr "언어 설정"
 
 #: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
 msgid "Privacy"
-msgstr "개인정보보호"
+msgstr "개인정보 취급방침"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
@@ -1824,7 +1825,7 @@ msgstr "이메일 주소를 위한 MicroID의 생성"
 #: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
 #: actions/tag.php:76
 msgid "Recent Tags"
-msgstr "최신 태그들"
+msgstr "최근 태그"
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
 #: actions/recoverpassword.php:190
@@ -1901,7 +1902,7 @@ msgstr "OpenID 삭제"
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
-msgstr "마지막 OpenID 를 삭제하면, 로그인 할 수 없게 됩니다! 삭제하기 전에, 다른 OpenID 를 추가해 주세요."
+msgstr "마지막 OpenID를 삭제하면, 로그인 할 수 없게 됩니다! 삭제하기 전에, 다른 OpenID를 추가해 주십시오."
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
 msgid "Replies"
@@ -1913,7 +1914,7 @@ msgstr "답신"
 #: lib/personalgroupnav.php:104
 #, php-format
 msgid "Replies to %s"
-msgstr "%s 로 답신"
+msgstr "%s에 답신"
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
 #: actions/recoverpassword.php:223
@@ -2007,7 +2008,7 @@ msgstr "보내기"
 #: actions/emailsettings.php:74 actions/smssettings.php:82
 #: actions/emailsettings.php:132 actions/smssettings.php:145
 msgid "Send email to this address to post new notices."
-msgstr "새로운 통지를 포스트 하기 위해서 이 주소로 이메일을 보내주세요."
+msgstr "새로운 통지를 올리려면 이 주소로 메일을 보내십시오/"
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
 #: actions/emailsettings.php:152
@@ -2040,12 +2041,12 @@ msgstr "설정 저장"
 
 #: ../actions/tag.php:60 actions/tag.php:60
 msgid "Showing most popular tags from the last week"
-msgstr "지난 주에 가장 인기 있었던 태그들을 보여줌"
+msgstr "지난 주에 가장 인기 있었던 태그를 표시합니다"
 
 #: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 #: actions/finishaddopenid.php:114
 msgid "Someone else already has this OpenID."
-msgstr "이미 다른 사람이 이 OpenID 를 사용하고 있습니다."
+msgstr "이미 다른 사람이 이 OpenID를 사용하고 있습니다."
 
 #: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
 #: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
@@ -2076,7 +2077,7 @@ msgstr "통계"
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 #: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
 msgid "Stored OpenID not found."
-msgstr "저장된 OpenID 를 찾을 수 없습니다."
+msgstr "저장된 OpenID를 찾을 수 없습니다."
 
 #: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
 #: ../actions/showstream.php:197 actions/remotesubscribe.php:84
@@ -2091,7 +2092,7 @@ msgstr "구독"
 #: actions/showstream.php:436 actions/showstream.php:498
 #: lib/subgroupnav.php:88
 msgid "Subscribers"
-msgstr "구독자들"
+msgstr "구독자"
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
 #: actions/userauthorization.php:338
@@ -2121,7 +2122,7 @@ msgstr "파일을 올리는데 시스템 오류 발생"
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
 #: lib/profilelist.php:164
 msgid "Tags"
-msgstr "태그들"
+msgstr "태그"
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
 msgid "Text"
@@ -2246,16 +2247,16 @@ msgstr ""
 #: ../actions/subscribers.php:35 actions/subscribers.php:35
 #, php-format
 msgid "These are the people who listen to %s's notices."
-msgstr "%s 의 통지를 받고 있는 사람"
+msgstr "%s의 통지를 받고 있는 사람"
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
 msgid "These are the people who listen to your notices."
-msgstr "귀하의 통지를 받고 있는 사람들"
+msgstr "귀하의 통지를 받고 있는 사람"
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
-msgstr "%s 가 받고 있는 통지들의 사람들"
+msgstr "%s님이 받고 있는 통지의 사람"
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
 msgid "These are the people whose notices you listen to."
@@ -2264,11 +2265,11 @@ msgstr "귀하의 통지를 받고 있는 사람"
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
-msgstr "자동 구독 신청이 된 사용자들 :"
+msgstr "자동 구독 신청이 된 사용자:"
 
 #: ../actions/recoverpassword.php:88
 msgid "This confirmation code is too old. Please start again."
-msgstr "이 인증 코드는 오래됬습니다. 재발급 받아 주세요."
+msgstr "이 인증 코드는 오래됐습니다. 다시 발급 받아 주십시오."
 
 #: ../lib/openid.php:195
 msgid ""
@@ -2284,7 +2285,7 @@ msgid ""
 "to a local account. You can either create a new account, or connect with "
 "your existing account, if you have one."
 msgstr ""
-"%s 로의 최초 로그인입니다. OpenID와의 연결이 필요합니다. 계정을 새로 생성하거나 기존의 계정으로 연결 하실 수 있습니다."
+"%s 계정으로 최초 로그인입니다. OpenID와의 연결이 필요합니다. 계정을 새로 생성하거나 기존의 계정으로 연결 하실 수 있습니다."
 
 #: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
@@ -2323,22 +2324,24 @@ msgid ""
 "register%%) a new  account. If you already have an account  on a [compatible "
 "microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
+"구독하려면, [로그인](%%action.login%%)하거나, 새 계정을 [등록](%%action.register%%)하십시오. 이미 "
+"계정이 [호환되는 마이크로블로깅 사이트]((%%doc.openmublog%%)에 계정이 있으면, 아래에 프로파일 URL을 입력하십시오."
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132
 msgid "Two user ids or screen_names must be supplied."
-msgstr ""
+msgstr "두 개의 사용자 ID나 대화명을 입력해야 합니다."
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
 #: actions/profilesettings.php:109
 msgid "URL of your homepage, blog, or profile on another site"
-msgstr "당신의 홈페이지, 블로그 혹은 다른사이트의 프로파일 페이지 URL"
+msgstr "귀하의 홈페이지, 블로그 혹은 다른 사이트의 프로필 페이지 URL"
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
 #: actions/remotesubscribe.php:110
 msgid "URL of your profile on another compatible microblogging service"
-msgstr "다른 마이크로블로깅 서비스의 당신의 프로파일 URL"
+msgstr "다른 마이크로블로깅 서비스의 귀하의 프로필 URL"
 
 #: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
 #: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
@@ -2363,13 +2366,13 @@ msgstr "알려지지 않은 행동"
 #: ../actions/finishremotesubscribe.php:58
 #: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
 msgid "Unknown version of OMB protocol."
-msgstr "OMB프로토콜의 알려지지 않은 버젼"
+msgstr "OMB 프로토콜의 알려지지 않은 버전"
 
 #: ../lib/util.php:269 lib/util.php:285
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
-msgstr ""
+msgstr "따로 지정하지 않는다면, 이 사이트의 내용의 저작권은 작성한 사람에게 있으며 다음 라이선스로 이용할 수 있습니다: "
 
 #: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
 #: actions/confirmaddress.php:90
@@ -2380,18 +2383,18 @@ msgstr "인식되지않은 주소유형 %s"
 #: ../actions/showstream.php:209 actions/showstream.php:219
 #: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
-msgstr "비구독"
+msgstr "구독 해제"
 
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
 #: actions/postnotice.php:45 actions/updateprofile.php:46
 #: actions/postnotice.php:48 actions/updateprofile.php:49
 msgid "Unsupported OMB version"
-msgstr "지원되지 않는 OMB 버젼"
+msgstr "지원되지 않는 OMB 버전"
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
 #: lib/imagefile.php:102
 msgid "Unsupported image file format."
-msgstr "지원되지 않는 이미지파일 포맷"
+msgstr "지원하지 않는 그림 파일 형식입니다."
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
 #: lib/connectsettingsaction.php:108
@@ -2407,18 +2410,18 @@ msgstr "인스턴트 메신저에 의한 업데이트"
 #: actions/twitapistatuses.php:129
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
+msgstr "%1$s 및 %2$s에 있는 친구들의 업데이트!"
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
 #: actions/twitapistatuses.php:202
 #, php-format
 msgid "Updates from %1$s on %2$s!"
-msgstr ""
+msgstr "%2$s에 있는 %1$s의 업데이트!"
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
 msgid "Upload"
-msgstr "이미지 올리기"
+msgstr "올리기"
 
 #: ../actions/avatar.php:27
 msgid ""
@@ -2432,12 +2435,12 @@ msgstr ""
 
 #: ../lib/settingsaction.php:91
 msgid "Upload a new profile image"
-msgstr "새 프로필 이미지 올리기"
+msgstr "새 프로필 사진 올리기"
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
-msgstr "이 서비스를 사용하는데 당신의 친구와 동료들을 초대하기 위해 이 양식을 사용하세요."
+msgstr "다음 양식을 이용해 친구와 동료를 이 서비스에 초대하십시오."
 
 #: ../actions/register.php:159 ../actions/register.php:162
 #: actions/register.php:173 actions/register.php:176
@@ -2447,7 +2450,7 @@ msgstr "업데이트나 공지, 비밀번호 찾기에 사용하세요."
 #: ../actions/finishremotesubscribe.php:86
 #: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
 msgid "User being listened to doesn't exist."
-msgstr ""
+msgstr "살펴 보고 있는 사용자가 없습니다."
 
 #: ../actions/all.php:41 ../actions/avatarbynickname.php:48
 #: ../actions/foaf.php:47 ../actions/replies.php:41
@@ -2496,13 +2499,13 @@ msgstr "당신은 어디에 삽니까? \"시, 도 (or 군,구), 나라"
 #: actions/updateprofile.php:132
 #, php-format
 msgid "Wrong image type for '%s'"
-msgstr "%S 잘못된 이미지 타입입니다. "
+msgstr "%S 잘못된 그림 파일 타입입니다. "
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
 #: actions/updateprofile.php:127
 #, php-format
 msgid "Wrong size image at '%s'"
-msgstr "%S 잘못된 이미지 사이즈입니다."
+msgstr "%S 잘못된 그림 파일 사이즈입니다."
 
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
@@ -2529,12 +2532,12 @@ msgstr "당신은 이미 로그인되어 있습니다."
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
 msgid "You are already subscribed to these users:"
-msgstr "당신은 이 사용자들을 이미 구독하고 있습니다."
+msgstr "당신은 다음 사용자를 이미 구독하고 있습니다."
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
 #: actions/twitapifriendships.php:105
 msgid "You are not friends with the specified user."
-msgstr "당신은 이 특정 회원과 친구가 아닙니다."
+msgstr "당신은 지정한 회원과 친구가 아닙니다."
 
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
@@ -2542,7 +2545,7 @@ msgstr "여기서 비밀번호를 변경할 수 있습니다. 좋은 번호를 �
 
 #: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
-msgstr "당신은 새로운 게시글 작성을 시작하기 위해 새 계정을 만드실 수 있습니다."
+msgstr "계정을 새로 만들면 새로운 게시글을 작성할 수 있습니다."
 
 #: ../actions/smssettings.php:28 actions/smssettings.php:28
 #: actions/smssettings.php:69
@@ -2567,7 +2570,7 @@ msgstr ""
 #: ../actions/profilesettings.php:27
 msgid ""
 "You can update your personal profile info here so people know more about you."
-msgstr "사람들이 당신에 대해 좀 더 잘 알 수 있도록 여기 당신의 개인프로파일을 업데이트 할 수 있습니다. "
+msgstr "사람들이 당신에 대해 좀 더 잘 알 수 있도록 여기 당신의 개인 프로필을 업데이트 할 수 있습니다. "
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
@@ -2599,6 +2602,8 @@ msgid ""
 "Faithfully yours,\n"
 "%4$s"
 msgstr ""
+"포스팅 주소는 %1$s입니다.새 메시지를 등록하려면 %2$ 주소로 이메일을 보내십시오.이메일 사용법은 %3$s 페이지를 "
+"보십시오.안녕히,%4$s"
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
 #: actions/twitapistatuses.php:463
@@ -2608,13 +2613,14 @@ msgstr "당신은 다른 사용자의 상태를 삭제하지 않아도 된다."
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
-msgstr "당신은 %s 사용에 다른 사용자를 초대하기 위해 로긴이 필요합니다."
+msgstr "로그인을 해야 다른 사용자를 %s에 초대할 수 있습니다."
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
-msgstr "당신의 초대를 받은사람들이 수락하고, 사이트에 등록할때 공지를 받을 수 있습니다. 커뮤니티를 키워주셔서 대단히 감사합니다. ^^"
+msgstr ""
+"당신의 초대를 받은 사람들이 수락하고, 사이트에 등록할때 공지를 받을 수 있습니다. 커뮤니티를 키워주셔서 대단히 감사합니다. ^^"
 
 #: ../actions/recoverpassword.php:149
 msgid "You've been identified. Enter a  new password below. "
@@ -2636,51 +2642,51 @@ msgid ""
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
 "[오픈ID](%%doc.openid%%)는 당신을 동일한 계정으로 많은 사이트에 로그인할 수 있게 해줍니다. 여기에서 당신의 관련된 "
-"오픈ID들을 관리하세요."
+"오픈ID를 관리하세요."
 
 #: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
 msgid "a few seconds ago"
-msgstr "몇 초전"
+msgstr "몇 초 전"
 
 #: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
 #, php-format
 msgid "about %d days ago"
-msgstr "%d일전"
+msgstr "%d일 전"
 
 #: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
 #, php-format
 msgid "about %d hours ago"
-msgstr "%d시간전"
+msgstr "%d시간 전"
 
 #: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
 #, php-format
 msgid "about %d minutes ago"
-msgstr "%d분전"
+msgstr "%d분 전"
 
 #: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
 #, php-format
 msgid "about %d months ago"
-msgstr "%d달전"
+msgstr "%d달 전"
 
 #: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
 msgid "about a day ago"
-msgstr "하루전"
+msgstr "하루 전"
 
 #: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
 msgid "about a minute ago"
-msgstr "일분전"
+msgstr "1분 전"
 
 #: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
 msgid "about a month ago"
-msgstr "한달전"
+msgstr "1달 전"
 
 #: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
 msgid "about a year ago"
-msgstr "일년전"
+msgstr "1년 전"
 
 #: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
 msgid "about an hour ago"
-msgstr "한시간전"
+msgstr "1시간 전"
 
 #: ../actions/showstream.php:423 ../lib/stream.php:132
 #: actions/showstream.php:441 lib/stream.php:99
@@ -2707,7 +2713,7 @@ msgstr "위 비밀번호와 동일하게"
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
 #: actions/twitapistatuses.php:555
 msgid "unsupported file type"
-msgstr "지원되지 않는 파일유형입니다."
+msgstr "지원하지 않는 종류의 파일입니다"
 
 #: ../lib/util.php:1309 lib/util.php:1443
 msgid "« After"
@@ -2768,12 +2774,12 @@ msgstr "좋아하는 게시글 취소"
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
 #, php-format
 msgid "%s favorite notices"
-msgstr "%s 좋아하는 게시글들"
+msgstr "%s 좋아하는 게시글"
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
 #, php-format
 msgid "Feed of favorite notices of %s"
-msgstr "%s 의 좋아하는 게시글의 피드"
+msgstr "%s의 좋아하는 게시글의 피드"
 
 #: actions/inbox.php:28 actions/inbox.php:59
 #, php-format
@@ -2787,7 +2793,7 @@ msgstr "%s의 받은쪽지함"
 
 #: actions/inbox.php:53 actions/inbox.php:115
 msgid "This is your inbox, which lists your incoming private messages."
-msgstr "이것은 당신의 받은쪽지함입니다. 당신이 받은 비밀메시지들이 있습니다."
+msgstr "당신의 받은 쪽지함입니다. 당신이 받은 비밀 메시지가 있습니다."
 
 #: actions/invite.php:178 actions/invite.php:213
 #, php-format
@@ -2795,6 +2801,8 @@ msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
 "\n"
 msgstr ""
+"%1$s 사용자가 %2$s에 (%3$s) 초대했습니다.\n"
+"\n"
 
 #: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
 #: actions/register.php:416
@@ -2873,13 +2881,13 @@ msgstr "%s의 보낸쪽지함"
 
 #: actions/outbox.php:53 actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
-msgstr "이것은 당신의 보낸쪽지함입니다. 이곳엔 당신이 보냈던 비밀쪽지들이 있습니다."
+msgstr "당신의 보낸 쪽지함입니다. 이곳엔 당신이 보냈던 비밀 쪽지가 있습니다."
 
 #: actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
-msgstr "이름, 장소, 흥미들로 %%site.name%% 에서 사람들을 찾아보세요."
+msgstr "이름, 장소, 흥미로 %%site.name%%에서 사람들을 찾아보세요."
 
 #: actions/profilesettings.php:27 actions/profilesettings.php:69
 msgid "You can update your personal profile info here "
@@ -2911,11 +2919,11 @@ msgstr "이 서버에서 당신의 닉네임"
 
 #: actions/recoverpassword.php:271 actions/recoverpassword.php:304
 msgid "Instructions for recovering your password "
-msgstr "당신의 비빌먼호 복구를 위한 안내"
+msgstr "비빌번호 복구 방법 안내"
 
 #: actions/recoverpassword.php:327 actions/recoverpassword.php:361
 msgid "New password successfully saved. "
-msgstr "새 비밀번호가 성공적으로 저장되었습니다."
+msgstr "새 비밀번호를 성공적으로 저장했습니다."
 
 #: actions/register.php:95 actions/register.php:180
 msgid "Password must be 6 or more characters."
@@ -2926,7 +2934,7 @@ msgstr "비밀번호는 6자리 이상이어야 합니다."
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
-msgstr "축하합니다!! %s, 그리고 %%%%site.name%%%%에 오신걸 환영해요~ 여기서 당신은 원할지도 모르겠네요.."
+msgstr "축하합니다 %s님!! %%%%site.name%%%%에 오신걸 환영합니다. 다음과 같은 일을 하실 수 있습니다..."
 
 #: actions/register.php:227
 msgid "(You should receive a message by email momentarily, with "
@@ -2982,21 +2990,21 @@ msgstr "%s에게 직접 메시지"
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
 #, php-format
 msgid "All the direct messages sent to %s"
-msgstr "%s 에게 모든 직접 메시지들"
+msgstr "%s에게 모든 직접 메시지"
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
 msgid "Direct Messages You've Sent"
-msgstr "당신이 보낸 다이렉트 메시지들"
+msgstr "당신이 보낸 직접 메시지"
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
 #, php-format
 msgid "All the direct messages sent from %s"
-msgstr "%s 로부터 보낸 모든 다이렉트 메시지들"
+msgstr "%s에서 보낸 모든 직접 메시지"
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
 msgid "No message text!"
-msgstr "text 메시지가 없습니다."
+msgstr "메시지 내용이 없습니다!"
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
@@ -3006,12 +3014,12 @@ msgstr "받는 사용자가 없습니다."
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
 msgid "Can't send direct messages to users who aren't your friend."
-msgstr "당신의 친구가 아닌 사용자에게 다이렉트 메시지를 보낼 수 없습니다."
+msgstr "당신의 친구가 아닌 사용자에게 직접 메시지를 보낼 수 없습니다."
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
 #, php-format
 msgid "%s / Favorites from %s"
-msgstr "%s / %s 로부터 좋아하는 글들"
+msgstr "%s / %s의 좋아하는 글들"
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
 #, php-format
@@ -3022,7 +3030,7 @@ msgstr "%s 좋아하는 글이 업데이트 됐습니다. %S에 의해 / %s."
 #: actions/twitapifavorites.php:164 lib/mail.php:553
 #, php-format
 msgid "%s added your notice as a favorite"
-msgstr "%s 가 너의 게시글을 좋아하는 글로 추가했습니다."
+msgstr "%s님이 당신의 게시글을 좋아하는 글로 추가했습니다."
 
 #: actions/twitapifavorites.php:188 lib/mail.php:276
 #: actions/twitapifavorites.php:165
@@ -3031,7 +3039,7 @@ msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
 "\n"
 msgstr ""
-"%1$s 그들의 좋아하는 글중 하나로 %2$s로부터 지금 막 당신의 글을 추가했습니다. \n"
+"%1$s 사용자가 %2$s의 귀하의 글을 좋아하는 글로 추가했습니다.\n"
 "\n"
 
 #: actions/twittersettings.php:27
@@ -3126,10 +3134,12 @@ msgstr "트위터 환경설정이 저장되었습니다."
 msgid "Please check these details to make sure "
 msgstr "이 상세설정들을 체크해주세요."
 
+# FIXME: 잘못 추출된 문자열, 번역할 필요 없음.
 #: actions/userauthorization.php:324 actions/userauthorization.php:340
 msgid "The subscription has been authorized, but no "
-msgstr ""
+msgstr "가입이 승인되었습니다."
 
+# FIXME: 잘못 추출된 문자열, 번역할 필요 없음.
 #: actions/userauthorization.php:334 actions/userauthorization.php:351
 msgid "The subscription has been rejected, but no "
 msgstr "이 구독이 거절되었습니다."
@@ -3197,15 +3207,15 @@ msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지�
 #: classes/Command.php:214 classes/Command.php:245
 #, php-format
 msgid "Direct message to %s sent"
-msgstr "%s에게 보낸 다이렉트 메시지"
+msgstr "%s에게 보낸 직접 메시지"
 
 #: classes/Command.php:216 classes/Command.php:247
 msgid "Error sending direct message."
-msgstr "다이렉트 메시지 보내기 에러"
+msgstr "직접 메시지 보내기 오류."
 
 #: classes/Command.php:263 classes/Command.php:300
 msgid "Specify the name of the user to subscribe to"
-msgstr "구독을 하기 위해서는 사용자의 이름을 명확히해야 합니다."
+msgstr "구독하려는 사용자의 이름을 지정하십시오."
 
 #: classes/Command.php:270 classes/Command.php:307
 #, php-format
@@ -3214,12 +3224,12 @@ msgstr "%s에게 구독되었습니다."
 
 #: classes/Command.php:288 classes/Command.php:328
 msgid "Specify the name of the user to unsubscribe from"
-msgstr "비구독 폼에 사용자의 이름을 명확히 써주세요."
+msgstr "구독을 해제하려는 사용자의 이름을 지정하십시오."
 
 #: classes/Command.php:295 classes/Command.php:335
 #, php-format
 msgid "Unsubscribed from %s"
-msgstr "%s 로부터 비구독되었습니다."
+msgstr "%s에서 구독을 해제했습니다."
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
 #: classes/Command.php:376
@@ -3278,7 +3288,7 @@ msgid ""
 "%1$s (%2$s) sent you a private message:\n"
 "\n"
 msgstr ""
-"%1$s (%2$s) 가 당신에게 비밀메시지를 보냈습니다 : \n"
+"%1$s(%2$s)님이 당신에게 비밀 메시지를 보냈습니다 : \n"
 " \n"
 
 #: lib/mailbox.php:43 lib/mailbox.php:89
@@ -3380,22 +3390,22 @@ msgstr "당신의 아바타가 될 이미지영역을 지정하세요."
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
 msgid "Lost our file data."
-msgstr "우리의 파일 데이터를 잃어버렸습니다."
+msgstr "파일 데이터를 잃어버렸습니다."
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
 #: classes/User_group.php:112
 msgid "Lost our file."
-msgstr "우리의 파일을 잃어버렸습니다."
+msgstr "파일을 잃어버렸습니다."
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
 #: classes/User_group.php:129 classes/User_group.php:161
 msgid "Unknown file type"
-msgstr "알려지지 않은 파일유형입니다."
+msgstr "알 수 없는 종류의 파일입니다"
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
 msgid "No profile specified."
-msgstr "프로필이 구체적이지 않습니다."
+msgstr "프로필을 지정하지 않았습니다."
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
 #: actions/unblock.php:75
@@ -3418,10 +3428,11 @@ msgstr "당신은 이미 이 사용자를 차단하고 있습니다."
 msgid "Failed to save block information."
 msgstr "정보차단을 저장하는데 실패했습니다."
 
+# FIXME: 잘못 추출된 문자열, 번역할 필요 없음.
 #: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been "
-msgstr ""
+msgstr "\\\"%s\\\" 는 귀하의 계정으로 승인되었습니다."
 
 #: actions/deletenotice.php:73
 msgid "You are about to permanently delete a notice. "
@@ -3434,7 +3445,7 @@ msgstr "좋아하는 게시글로 추가하기"
 #: actions/editgroup.php:54
 #, php-format
 msgid "Edit %s group"
-msgstr "%s 그룹 수정하기"
+msgstr "%s 그룹 편집"
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
@@ -3460,11 +3471,11 @@ msgstr "그러한 그룹이 없습니다."
 #: actions/editgroup.php:106 actions/editgroup.php:165
 #: actions/grouplogo.php:107
 msgid "You must be an admin to edit the group"
-msgstr "당신은 그룹을 수정하기 위해 관리자이어야 합니다."
+msgstr "관리자만 그룹을 편집할 수 있습니다."
 
 #: actions/editgroup.php:157
 msgid "Use this form to edit the group."
-msgstr "그룹을 수정하기 위해 이 양식을 사용하세요."
+msgstr "다음 양식을 이용해 그룹을 편집하십시오."
 
 #: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
 msgid "Nickname must have only lowercase letters "
@@ -3596,7 +3607,7 @@ msgstr "미리 고치기"
 
 #: actions/facebooksettings.php:108
 msgid "A string to prefix notices with."
-msgstr ""
+msgstr "공지 사항 앞에 붙일 문자열."
 
 #: actions/facebooksettings.php:124
 #, php-format
@@ -3628,17 +3639,17 @@ msgstr "사이트에서 지금 가장 인기있는 게시글"
 #: actions/featured.php:69 lib/featureduserssection.php:82
 #: lib/publicgroupnav.php:87
 msgid "Featured users"
-msgstr "인기있는 회원들"
+msgstr "인기있는 회원"
 
 #: actions/featured.php:71
 #, php-format
 msgid "Featured users, page %d"
-msgstr "인기있는 회원들, %d 페이지"
+msgstr "인기있는 회원, %d페이지"
 
 #: actions/featured.php:99
 #, php-format
 msgid "A selection of some of the great users on %s"
-msgstr "%s의 훌륭한 회원들의 일부선택"
+msgstr "%s의 훌륭한 회원의 일부 선택"
 
 #: actions/finishremotesubscribe.php:188
 msgid "That user has blocked you from subscribing."
@@ -3650,11 +3661,11 @@ msgstr "ID가 없습니다."
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
 msgid "Group logo"
-msgstr "그룹로고"
+msgstr "그룹 로고"
 
 #: actions/grouplogo.php:149
 msgid "You can upload a logo image for your group."
-msgstr "당신그룹의 로고이미지를 업로드할 수 있습니다."
+msgstr "당신그룹의 로고 이미지를 업로드할 수 있습니다."
 
 #: actions/grouplogo.php:448
 msgid "Logo updated."
@@ -3667,12 +3678,12 @@ msgstr "로고 업데이트에 실패했습니다."
 #: actions/groupmembers.php:93 lib/groupnav.php:91
 #, php-format
 msgid "%s group members"
-msgstr "%s 그룹 회원들"
+msgstr "%s 그룹 회원"
 
 #: actions/groupmembers.php:96
 #, php-format
 msgid "%s group members, page %d"
-msgstr "%s 그룹 회원들, %d 페이지"
+msgstr "%s 그룹 회원, %d페이지"
 
 #: actions/groupmembers.php:111
 msgid "A list of the users in this group."
@@ -3718,7 +3729,7 @@ msgstr "Jabber 혹은 GTalk(구글토크) 주소"
 
 #: actions/imsettings.php:147
 msgid "Send me replies through Jabber/GTalk "
-msgstr "Jabber/GTalk(구글토크) 을 통해 내게 답장을 보냅니다."
+msgstr "Jabber/GTalk(구글토크)를 통해 내게 답장을 보냅니다."
 
 #: actions/imsettings.php:321
 #, php-format
@@ -3824,20 +3835,19 @@ msgstr "이 사용자는 nudge를 허용하지 않았고, 아직 그의 이메�
 
 #: actions/nudge.php:94
 msgid "Nudge sent"
-msgstr "Nudge 가 보내졌습니다."
+msgstr "찔러 보기를 보냈습니다."
 
 #: actions/nudge.php:97
 msgid "Nudge sent!"
-msgstr "Nudge가 보내졌습니다!"
+msgstr "찔러 보기를 보냈습니다!"
 
 #: actions/openidlogin.php:97
 msgid "OpenID login"
 msgstr "OpenID 로그인"
 
 #: actions/openidsettings.php:128
-#, fuzzy
 msgid "Removing your only OpenID "
-msgstr "OpenID 삭제"
+msgstr "유일한 OpenID를 삭제합니다 "
 
 #: actions/othersettings.php:60
 msgid "Other Settings"
@@ -3857,7 +3867,7 @@ msgstr "서비스"
 
 #: actions/othersettings.php:113
 msgid "Automatic shortening service to use."
-msgstr "사용할 서비스 자동 줄이기 "
+msgstr "사용할 URL 자동 줄이기 서비스"
 
 #: actions/othersettings.php:144
 msgid "URL shortening service is too long (max 50 chars)."
@@ -3893,7 +3903,7 @@ msgstr "프로필 정보"
 #: actions/profilesettings.php:124
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
-msgstr "당신을 위한 태그들 → (문자,숫자,-, ., 그리고_) 콤마- 혹은 공백으로 분리하세요."
+msgstr "당신을 위한 태그, (문자,숫자,-, ., _로 구성) 콤마 혹은 공백으로 구분."
 
 #: actions/profilesettings.php:144
 msgid "Automatically subscribe to whoever "
@@ -3906,7 +3916,7 @@ msgstr "유효하지 않은태그: \"%s\""
 
 #: actions/profilesettings.php:311
 msgid "Couldn't save tags."
-msgstr "태그들을 저장할 수 없습니다."
+msgstr "태그를 저장할 수 없습니다."
 
 #: actions/public.php:107
 #, php-format
@@ -3933,7 +3943,7 @@ msgstr "공개 태그 클라우드"
 #: actions/publictagcloud.php:63
 #, php-format
 msgid "These are most popular recent tags on %s "
-msgstr "이것은 %에서 가장 인기있는 최근 태그들입니다."
+msgstr "다음은 %에서 가장 인기 있는 최근 태그입니다."
 
 #: actions/publictagcloud.php:119
 msgid "Tag cloud"
@@ -3986,7 +3996,7 @@ msgstr "(당신은 이메일로 메시지를 받아야 합니다."
 
 #: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
 msgid "That's a local profile! Login to subscribe."
-msgstr "그것은 로컬프로필입니다. 구독을 위해서는 로긴하세요."
+msgstr "그것은 로컬프로필입니다. 구독을 위해서는 로그인하십시오."
 
 #: actions/replies.php:118
 #, php-format
@@ -4033,7 +4043,7 @@ msgstr "%s 그룹을 위한 공지피드"
 
 #: actions/showgroup.php:357 lib/groupnav.php:90
 msgid "Members"
-msgstr "회원들"
+msgstr "회원"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
@@ -4043,7 +4053,7 @@ msgstr "(없습니다.)"
 
 #: actions/showgroup.php:370
 msgid "All members"
-msgstr "모든 회원들"
+msgstr "모든 회원"
 
 #: actions/showgroup.php:378
 #, php-format
@@ -4081,7 +4091,7 @@ msgstr "사용자 동작"
 
 #: actions/showstream.php:342
 msgid "Send a direct message to this user"
-msgstr "이 회원에게 다이렉트 메시지를 보냅니다."
+msgstr "이 회원에게 직접 메시지를 보냅니다."
 
 #: actions/showstream.php:343
 msgid "Message"
@@ -4118,7 +4128,7 @@ msgstr "추가한 전화 번호로 인증 코드를 보냈습니다."
 
 #: actions/smssettings.php:453
 msgid "Mobile carrier"
-msgstr ""
+msgstr "휴대전화 사업자"
 
 #: actions/subedit.php:70
 msgid "You are not subscribed to that profile."
@@ -4218,7 +4228,7 @@ msgstr "당신의 세션토큰관련 문제가 있습니다."
 #: actions/tagother.php:191
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
-msgstr "당신은 당신이 구독하거나 당신을 구독하는 사람들에 대해 오직 태깅할 수 있다. "
+msgstr "당신이 구독하거나 당신을 구독하는 사람들에 대해서만 태그를 붙일 수 있습니다."
 
 #: actions/tagother.php:198
 msgid "Could not save tags."
@@ -4319,7 +4329,7 @@ msgstr "아바타를 업로드하세요."
 
 #: lib/accountsettingsaction.php:119
 msgid "Other"
-msgstr "그 밖의 다른것"
+msgstr "기타"
 
 #: lib/accountsettingsaction.php:120
 msgid "Other options"
@@ -4375,9 +4385,8 @@ msgid "Login with OpenID"
 msgstr "오픈ID로 로그인하기"
 
 #: lib/action.php:344
-#, fuzzy
 msgid "Help me!"
-msgstr "도움말"
+msgstr "도움이 필요해!"
 
 #: lib/action.php:362
 msgid "Site notice"
@@ -4438,7 +4447,7 @@ msgstr "이 게시글을 좋아합니다."
 
 #: lib/feedlist.php:64
 msgid "Export data"
-msgstr "데이터 반출하기"
+msgstr "데이터 내보내기"
 
 #: lib/galleryaction.php:121
 msgid "Filter tags"
@@ -4488,7 +4497,7 @@ msgstr "관리자"
 #: lib/groupnav.php:101
 #, php-format
 msgid "Edit %s group properties"
-msgstr "%s 그룹 환경설정 수정하기"
+msgstr "%s 그룹 속성 편집"
 
 #: lib/groupnav.php:106
 msgid "Logo"
@@ -4512,10 +4521,10 @@ msgstr "가장 많은 게시글이 있는 그룹들"
 msgid "Tags in %s group's notices"
 msgstr "%s 그룹 게시글의 태그"
 
+# FIXME: 잘못 추출된 문자열, 번역할 필요 없음.
 #: lib/htmloutputter.php:104
-#, fuzzy
 msgid "This page is not available in a "
-msgstr "홈페이지 주소형식이 올바르지 않습니다."
+msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다."
 
 #: lib/joinform.php:114
 msgid "Join"
@@ -4557,7 +4566,7 @@ msgid "Location: %s\n"
 msgstr "위치: %s\n"
 
 #: lib/mail.php:256
-#, fuzzy, php-format
+#, php-format
 msgid "Homepage: %s\n"
 msgstr "홈페이지: %s\n"
 
@@ -4573,17 +4582,19 @@ msgstr ""
 #: lib/mail.php:461
 #, php-format
 msgid "You've been nudged by %s"
-msgstr ""
+msgstr "%s 사용자가 찔러 봤습니다."
 
+# FIXME: 잘못 추출된 문자열, 번역할 필요 없음.
 #: lib/mail.php:465
 #, php-format
 msgid "%1$s (%2$s) is wondering what you are up to "
-msgstr ""
+msgstr "%1$s (%2$s) 사용자가 요즘에 무엇을 하는지 궁금해 하고, "
 
+# FIXME: 잘못 추출된 문자열, 번역할 필요 없음.
 #: lib/mail.php:555
 #, php-format
 msgid "%1$s just added your notice from %2$s"
-msgstr ""
+msgstr "%1$s 사용자가 %2$s의 귀하의 글을 추가했습니다."
 
 #: lib/mailbox.php:229 lib/noticelist.php:380
 msgid "From"
@@ -4591,16 +4602,15 @@ msgstr "로 부터"
 
 #: lib/messageform.php:110
 msgid "Send a direct notice"
-msgstr "다이렉트 메시지를 보내다."
+msgstr "직접 메시지 보내기"
 
 #: lib/noticeform.php:125
 msgid "Send a notice"
-msgstr "게시글을 보내다."
+msgstr "게시글 보내기"
 
 #: lib/noticeform.php:152
-#, fuzzy
 msgid "Available characters"
-msgstr "가능한 글자"
+msgstr "사용 가능한 글자"
 
 #: lib/noticelist.php:426
 msgid "in reply to"
@@ -4624,20 +4634,20 @@ msgstr "삭제"
 
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
-msgstr ""
+msgstr "이 사용자 찔러 보기"
 
 #: lib/nudgeform.php:128
 msgid "Nudge"
-msgstr ""
+msgstr "찔러 보기"
 
 #: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
-msgstr ""
+msgstr "이 사용자에게 찔러 보기 메시지 보내기"
 
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
-msgstr "%s의 게시글의 태그들"
+msgstr "%s의 게시글의 태그"
 
 #: lib/profilelist.php:182
 msgid "(none)"
@@ -4653,7 +4663,7 @@ msgstr "사용자 그룹"
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
 msgid "Recent tags"
-msgstr "최근 태그들"
+msgstr "최근 태그"
 
 #: lib/publicgroupnav.php:86
 msgid "Featured"
@@ -4688,7 +4698,7 @@ msgstr "%s에 의해 구독되는 사람들"
 #: lib/subgroupnav.php:97
 #, php-format
 msgid "Groups %s is a member of"
-msgstr "%s 그릅들은  의 멤버입니다."
+msgstr "%s 그룹들은  의 멤버입니다."
 
 #: lib/subgroupnav.php:104
 #, php-format
@@ -4705,11 +4715,11 @@ msgstr "이 회원을 구독합니다."
 
 #: lib/tagcloudsection.php:56
 msgid "None"
-msgstr "없습니다."
+msgstr "없음"
 
 #: lib/topposterssection.php:74
 msgid "Top posters"
-msgstr "상위 게시글등록자"
+msgstr "상위 게시글 등록자"
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
 msgid "Unblock this user"
diff --git a/locale/laconica.po b/locale/laconica.po
index 85b949a08..ab8e7458e 100644
--- a/locale/laconica.po
+++ b/locale/laconica.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-11 09:33+0000\n"
+"POT-Creation-Date: 2009-07-14 10:32-0700\n"
 "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,14 +17,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
+#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
 msgid ""
 " except this private data: password, email address, IM address, phone number."
 msgstr ""
@@ -41,12 +41,12 @@ msgid "%1$s / Updates replying to %2$s"
 msgstr ""
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
-#: actions/invite.php:218
+#: actions/invite.php:218 actions/invite.php:220
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
 
-#: ../actions/invite.php:170 actions/invite.php:220
+#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -78,7 +78,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
-#: lib/mail.php:236
+#: lib/mail.php:236 lib/mail.php:235
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr ""
@@ -96,24 +96,26 @@ msgstr ""
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
 #: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:328
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
+#: actions/shownotice.php:161 actions/shownotice.php:174
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr ""
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
+#: actions/invite.php:125 actions/invite.php:133
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/publicrss.php:90 actions/publicrss.php:89
 #, php-format
 msgid "%s Public Stream"
 msgstr ""
@@ -125,12 +127,16 @@ msgstr ""
 #: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
 #: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
 #: actions/facebookhome.php:163 actions/twitapistatuses.php:130
+#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
+#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
+#: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
 #: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:37
 #, php-format
 msgid "%s public timeline"
 msgstr ""
@@ -142,23 +148,27 @@ msgstr ""
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
 #: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
 #, php-format
 msgid "%s timeline"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
 #: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:41
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
 #: ../actions/register.php:213 actions/register.php:497
+#: actions/register.php:545
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr ""
 
 #: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: lib/action.php:752
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -166,6 +176,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: lib/action.php:754
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr ""
@@ -177,12 +188,13 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
+#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
+#: lib/groupeditform.php:154
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 
 #: ../actions/register.php:152 actions/register.php:166
-#: actions/register.php:368
+#: actions/register.php:368 actions/register.php:414
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 
@@ -192,12 +204,12 @@ msgid "6 or more characters"
 msgstr ""
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
+#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
 msgid "6 or more characters, and don't forget it!"
 msgstr ""
 
 #: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
+#: actions/register.php:373 actions/register.php:419
 msgid "6 or more characters. Required."
 msgstr ""
 
@@ -245,7 +257,15 @@ msgstr ""
 #: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
 #: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
 #: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
-#: actions/twitapistatuses.php:453
+#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
+#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
+#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
+#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
+#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
+#: actions/twitapiusers.php:34
 msgid "API method not found!"
 msgstr ""
 
@@ -272,15 +292,18 @@ msgstr ""
 #: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
 #: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
 #: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
+#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
 msgid "API method under construction."
 msgstr ""
 
 #: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: lib/action.php:706
 msgid "About"
 msgstr ""
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
+#: actions/userauthorization.php:143 actions/userauthorization.php:178
 msgid "Accept"
 msgstr ""
 
@@ -291,7 +314,7 @@ msgstr ""
 #: actions/twittersettings.php:85 actions/emailsettings.php:120
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
-#: actions/twittersettings.php:166
+#: actions/twittersettings.php:166 actions/twittersettings.php:182
 msgid "Add"
 msgstr ""
 
@@ -314,23 +337,23 @@ msgid "Address"
 msgstr ""
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-#: actions/invite.php:181
+#: actions/invite.php:181 actions/invite.php:183
 msgid "Addresses of friends to invite (one per line)"
 msgstr ""
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
+#: actions/showstream.php:422 lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr ""
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/publicrss.php:92 actions/publicrss.php:91
 #, php-format
 msgid "All updates for %s"
 msgstr ""
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr ""
@@ -340,11 +363,11 @@ msgstr ""
 #: actions/finishopenidlogin.php:29 actions/login.php:31
 #: actions/openidlogin.php:29 actions/register.php:30
 #: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
+#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
 msgid "Already logged in."
 msgstr ""
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
 msgid "Already subscribed!."
 msgstr ""
 
@@ -354,18 +377,18 @@ msgid "Are you sure you want to delete this notice?"
 msgstr ""
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
+#: actions/userauthorization.php:81 actions/userauthorization.php:76
 msgid "Authorize subscription"
 msgstr ""
 
 #: ../actions/login.php:104 ../actions/register.php:178
 #: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
-#: actions/register.php:416
+#: actions/register.php:416 actions/register.php:463
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-#: actions/profilesettings.php:144
+#: actions/profilesettings.php:144 actions/profilesettings.php:145
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -374,6 +397,7 @@ msgstr ""
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
 #: actions/avatarsettings.php:67 actions/showgroup.php:211
+#: actions/showgroup.php:216
 msgid "Avatar"
 msgstr ""
 
@@ -409,6 +433,7 @@ msgstr ""
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
+#: actions/register.php:448
 msgid "Bio"
 msgstr ""
 
@@ -417,6 +442,7 @@ msgstr ""
 #: actions/register.php:89 actions/updateprofile.php:104
 #: actions/profilesettings.php:205 actions/register.php:174
 #: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/profilesettings.php:206 actions/register.php:211
 msgid "Bio is too long (max 140 chars)."
 msgstr ""
 
@@ -433,7 +459,7 @@ msgstr ""
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-#: actions/passwordsettings.php:174
+#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
 msgid "Can't save new password."
 msgstr ""
 
@@ -490,6 +516,7 @@ msgstr ""
 #: actions/register.php:169 actions/smssettings.php:65
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
+#: actions/recoverpassword.php:236 actions/register.php:422
 msgid "Confirm"
 msgstr ""
 
@@ -517,6 +544,7 @@ msgid "Confirmation code not found."
 msgstr ""
 
 #: ../actions/register.php:202 actions/register.php:473
+#: actions/register.php:521
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -537,16 +565,18 @@ msgstr ""
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
 #: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
-#: lib/action.php:406
+#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
+#: lib/action.php:425
 msgid "Connect"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
+#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
 msgid "Connect existing account"
 msgstr ""
 
 #: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: lib/action.php:719
 msgid "Contact"
 msgstr ""
 
@@ -559,12 +589,13 @@ msgstr ""
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr ""
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
+#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
 msgid "Could not follow user: User not found."
 msgstr ""
 
@@ -584,11 +615,11 @@ msgstr ""
 msgid "Could not save new profile info"
 msgstr ""
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
 msgid "Could not subscribe other to you."
 msgstr ""
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
 msgid "Could not subscribe."
 msgstr ""
 
@@ -612,7 +643,7 @@ msgstr ""
 msgid "Couldn't delete email confirmation."
 msgstr ""
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
 msgid "Couldn't delete subscription."
 msgstr ""
 
@@ -656,6 +687,7 @@ msgstr ""
 #: actions/emailsettings.php:440 actions/emailsettings.php:462
 #: actions/emailsettings.php:447 actions/emailsettings.php:469
 #: actions/smssettings.php:515 actions/smssettings.php:539
+#: actions/smssettings.php:516 actions/smssettings.php:540
 msgid "Couldn't update user record."
 msgstr ""
 
@@ -672,27 +704,28 @@ msgstr ""
 #: actions/imsettings.php:395 actions/othersettings.php:162
 #: actions/profilesettings.php:259 actions/smssettings.php:266
 #: actions/smssettings.php:408 actions/emailsettings.php:287
-#: actions/emailsettings.php:418
+#: actions/emailsettings.php:418 actions/othersettings.php:167
+#: actions/profilesettings.php:260
 msgid "Couldn't update user."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
+#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
 msgid "Create"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
+#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
 msgid "Create a new user with this nickname."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
+#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
 msgid "Create new account"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
+#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
 msgid "Creating new account for OpenID that already has a user."
 msgstr ""
 
@@ -716,13 +749,13 @@ msgid "Currently"
 msgstr ""
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
-#: classes/Notice.php:114
+#: classes/Notice.php:114 classes/Notice.php:124
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
-#: classes/Notice.php:757
+#: classes/Notice.php:757 classes/Notice.php:1042
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr ""
@@ -735,6 +768,7 @@ msgstr ""
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
 #: actions/profilesettings.php:114 actions/register.php:404
+#: actions/register.php:450
 msgid "Describe yourself and your interests in 140 chars"
 msgstr ""
 
@@ -742,6 +776,7 @@ msgstr ""
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
+#: actions/register.php:427 actions/register.php:431
 msgid "Email"
 msgstr ""
 
@@ -756,10 +791,11 @@ msgid "Email Settings"
 msgstr ""
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+#: actions/register.php:200
 msgid "Email address already exists."
 msgstr ""
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
 msgid "Email address confirmation"
 msgstr ""
 
@@ -769,12 +805,12 @@ msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-#: actions/invite.php:179
+#: actions/invite.php:179 actions/invite.php:181
 msgid "Email addresses"
 msgstr ""
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
+#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
 msgid "Enter a nickname or email address."
 msgstr ""
 
@@ -784,12 +820,13 @@ msgid "Enter the code you received on your phone."
 msgstr ""
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
+#: actions/userauthorization.php:161 actions/userauthorization.php:200
 msgid "Error authorizing token"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
 #: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
+#: actions/finishopenidlogin.php:325
 msgid "Error connecting user to OpenID."
 msgstr ""
 
@@ -814,12 +851,12 @@ msgid "Error inserting remote profile"
 msgstr ""
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
+#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
 msgid "Error saving address confirmation."
 msgstr ""
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
+#: actions/userauthorization.php:164 actions/userauthorization.php:203
 msgid "Error saving remote profile"
 msgstr ""
 
@@ -843,7 +880,8 @@ msgstr ""
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
-#: actions/login.php:120
+#: actions/login.php:120 actions/recoverpassword.php:372
+#: actions/register.php:235
 msgid "Error setting user."
 msgstr ""
 
@@ -863,11 +901,12 @@ msgid "Error with confirmation code."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
+#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
 msgid "Existing nickname"
 msgstr ""
 
 #: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: lib/action.php:708
 msgid "FAQ"
 msgstr ""
 
@@ -878,14 +917,14 @@ msgstr ""
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
-#: actions/allrss.php:110
+#: actions/allrss.php:110 actions/allrss.php:118
 #, php-format
 msgid "Feed for friends of %s"
 msgstr ""
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71 actions/replies.php:136
+#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
 #, php-format
 msgid "Feed for replies to %s"
 msgstr ""
@@ -918,7 +957,8 @@ msgstr ""
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
 #: actions/showgroup.php:237 actions/showstream.php:255
-#: actions/tagother.php:104
+#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
+#: actions/showstream.php:220 lib/groupeditform.php:157
 msgid "Full name"
 msgstr ""
 
@@ -928,23 +968,27 @@ msgstr ""
 #: actions/editgroup.php:195 actions/newgroup.php:146
 #: actions/profilesettings.php:202 actions/register.php:171
 #: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/editgroup.php:197 actions/newgroup.php:147
+#: actions/profilesettings.php:203 actions/register.php:208
 msgid "Full name is too long (max 255 chars)."
 msgstr ""
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
-#: lib/action.php:421 lib/action.php:659
+#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
 msgid "Help"
 msgstr ""
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
 #: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/action.php:417
 msgid "Home"
 msgstr ""
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
 #: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
+#: lib/groupeditform.php:146 actions/register.php:442
+#: lib/groupeditform.php:161
 msgid "Homepage"
 msgstr ""
 
@@ -952,6 +996,8 @@ msgstr ""
 #: actions/profilesettings.php:210 actions/register.php:83
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
+#: actions/editgroup.php:194 actions/newgroup.php:144
+#: actions/profilesettings.php:200 actions/register.php:205
 msgid "Homepage is not a valid URL."
 msgstr ""
 
@@ -976,7 +1022,7 @@ msgid "IM Settings"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -1002,7 +1048,7 @@ msgstr ""
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
 #: actions/emailsettings.php:443 actions/emailsettings.php:450
-#: actions/smssettings.php:518
+#: actions/smssettings.php:518 actions/smssettings.php:519
 msgid "Incoming email address removed."
 msgstr ""
 
@@ -1013,10 +1059,12 @@ msgstr ""
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
 #: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/facebookhome.php:129
 msgid "Incorrect username or password."
 msgstr ""
 
 #: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: actions/recoverpassword.php:322
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -1029,6 +1077,7 @@ msgid "Invalid avatar URL '%s'"
 msgstr ""
 
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
 msgstr ""
@@ -1086,27 +1135,34 @@ msgstr ""
 #: actions/register.php:103 actions/register.php:121
 #: actions/finishopenidlogin.php:279 actions/register.php:193
 #: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/finishopenidlogin.php:307 actions/register.php:230
+#: actions/register.php:251
 msgid "Invalid username or password."
 msgstr ""
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+#: actions/invite.php:104
 msgid "Invitation(s) sent"
 msgstr ""
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+#: actions/invite.php:138
 msgid "Invitation(s) sent to the following people:"
 msgstr ""
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103 lib/facebookaction.php:220
+#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105
 msgid "Invite"
 msgstr ""
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+#: actions/invite.php:106
 msgid "Invite new users"
 msgstr ""
 
 #: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
+#: lib/action.php:756
 #, php-format
 msgid ""
 "It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
@@ -1128,12 +1184,12 @@ msgid ""
 msgstr ""
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
+#: actions/profilesettings.php:128 actions/profilesettings.php:129
 msgid "Language"
 msgstr ""
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
+#: actions/profilesettings.php:217 actions/profilesettings.php:218
 msgid "Language is too long (max 50 chars)."
 msgstr ""
 
@@ -1144,6 +1200,9 @@ msgstr ""
 #: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
 #: lib/profilelist.php:125 actions/showgroup.php:246
 #: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
+#: actions/register.php:454 actions/showgroup.php:251
+#: actions/showstream.php:229 actions/userauthorization.php:128
+#: lib/groupeditform.php:171 lib/profilelist.php:185
 msgid "Location"
 msgstr ""
 
@@ -1153,6 +1212,8 @@ msgstr ""
 #: actions/editgroup.php:201 actions/newgroup.php:152
 #: actions/profilesettings.php:208 actions/register.php:177
 #: actions/updateprofile.php:112 actions/updateprofile.php:114
+#: actions/editgroup.php:203 actions/newgroup.php:153
+#: actions/profilesettings.php:209 actions/register.php:214
 msgid "Location is too long (max 255 chars)."
 msgstr ""
 
@@ -1163,7 +1224,8 @@ msgstr ""
 #: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
 #: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
 #: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
-#: lib/facebookaction.php:293 lib/facebookaction.php:319
+#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
+#: lib/facebookaction.php:295 lib/facebookaction.php:321
 #, php-format
 msgid "Login"
 msgstr ""
@@ -1183,16 +1245,18 @@ msgid ""
 msgstr ""
 
 #: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: lib/action.php:435
 msgid "Logout"
 msgstr ""
 
 #: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
+#: actions/register.php:393 actions/register.php:439
 msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
 #: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:327
 msgid "Lost or forgotten password?"
 msgstr ""
 
@@ -1209,11 +1273,12 @@ msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
+#: actions/showstream.php:480 lib/profileaction.php:182
 msgid "Member since"
 msgstr ""
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/userrss.php:93
 #, php-format
 msgid "Microblog by %s"
 msgstr ""
@@ -1228,7 +1293,8 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
-#: actions/register.php:430
+#: actions/register.php:430 actions/finishopenidlogin.php:106
+#: actions/register.php:477
 msgid "My text and files are available under "
 msgstr ""
 
@@ -1238,19 +1304,19 @@ msgstr ""
 msgid "New"
 msgstr ""
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
 #: actions/emailsettings.php:465 actions/emailsettings.php:472
-#: actions/smssettings.php:542
+#: actions/smssettings.php:542 actions/smssettings.php:543
 msgid "New incoming email address added."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
+#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
 msgid "New nickname"
 msgstr ""
 
@@ -1262,10 +1328,12 @@ msgstr ""
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
 #: actions/passwordsettings.php:101 actions/recoverpassword.php:219
+#: actions/recoverpassword.php:232
 msgid "New password"
 msgstr ""
 
 #: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
+#: actions/recoverpassword.php:379
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
@@ -1277,7 +1345,9 @@ msgstr ""
 #: actions/showstream.php:251 actions/tagother.php:95
 #: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
 #: actions/showgroup.php:226 actions/showstream.php:244
-#: actions/tagother.php:94 lib/facebookaction.php:312
+#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
+#: actions/showgroup.php:231 actions/showstream.php:209
+#: lib/facebookaction.php:314 lib/groupeditform.php:152
 msgid "Nickname"
 msgstr ""
 
@@ -1286,7 +1356,9 @@ msgstr ""
 #: actions/profilesettings.php:225 actions/register.php:76
 #: actions/editgroup.php:183 actions/finishopenidlogin.php:215
 #: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
+#: actions/register.php:159 actions/editgroup.php:185
+#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
+#: actions/profilesettings.php:215 actions/register.php:196
 msgid "Nickname already in use. Try another one."
 msgstr ""
 
@@ -1297,12 +1369,14 @@ msgstr ""
 #: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
 #: actions/updateprofile.php:81 actions/editgroup.php:179
 #: actions/newgroup.php:130 actions/register.php:156
-#: actions/updateprofile.php:83
+#: actions/updateprofile.php:83 actions/editgroup.php:181
+#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
+#: actions/profilesettings.php:193 actions/register.php:193
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
+#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
 msgid "Nickname not allowed."
 msgstr ""
 
@@ -1312,13 +1386,14 @@ msgid "Nickname of the user you want to follow"
 msgstr ""
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
+#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
 msgid "Nickname or email"
 msgstr ""
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
-#: actions/deletenotice.php:116
+#: actions/deletenotice.php:116 actions/block.php:149
+#: actions/deletenotice.php:115 actions/groupblock.php:176
 msgid "No"
 msgstr ""
 
@@ -1328,7 +1403,7 @@ msgid "No Jabber ID."
 msgstr ""
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
+#: actions/userauthorization.php:153 actions/userauthorization.php:192
 msgid "No authorization request!"
 msgstr ""
 
@@ -1351,6 +1426,7 @@ msgstr ""
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
 #: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
+#: actions/newnotice.php:162 lib/command.php:216
 msgid "No content!"
 msgstr ""
 
@@ -1365,7 +1441,7 @@ msgstr ""
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
 #: actions/emailsettings.php:430 actions/emailsettings.php:437
-#: actions/smssettings.php:505
+#: actions/smssettings.php:505 actions/smssettings.php:506
 msgid "No incoming email address."
 msgstr ""
 
@@ -1398,7 +1474,7 @@ msgid "No profile URL returned by server."
 msgstr ""
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
+#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
 msgid "No registered email address for that user."
 msgstr ""
 
@@ -1422,12 +1498,14 @@ msgstr ""
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
 #: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
-#: actions/twitapistatuses.php:470
+#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
+#: actions/twitapistatuses.php:426
 msgid "No status found with that ID."
 msgstr ""
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
 #: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
+#: actions/twitapistatuses.php:399
 msgid "No status with that ID found."
 msgstr ""
 
@@ -1484,11 +1562,15 @@ msgstr ""
 #: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
 #: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
 #: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
+#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
+#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
+#: lib/command.php:178 lib/command.php:227 lib/command.php:264
+#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
 msgid "No such user."
 msgstr ""
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
+#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
 msgid "No user with that email address or username."
 msgstr ""
 
@@ -1502,7 +1584,7 @@ msgid "Not a recovery code."
 msgstr ""
 
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
+#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
 msgid "Not a registered user."
 msgstr ""
 
@@ -1510,7 +1592,8 @@ msgstr ""
 #: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
 #: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
-#: lib/twitterapi.php:601
+#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
+#: lib/twitterapi.php:741
 msgid "Not a supported data format."
 msgstr ""
 
@@ -1530,6 +1613,7 @@ msgid "Not a valid email address"
 msgstr ""
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+#: actions/register.php:189
 msgid "Not a valid email address."
 msgstr ""
 
@@ -1537,6 +1621,8 @@ msgstr ""
 #: actions/profilesettings.php:206 actions/register.php:78
 #: actions/editgroup.php:186 actions/newgroup.php:137
 #: actions/profilesettings.php:195 actions/register.php:161
+#: actions/editgroup.php:188 actions/newgroup.php:138
+#: actions/profilesettings.php:196 actions/register.php:198
 msgid "Not a valid nickname."
 msgstr ""
 
@@ -1556,7 +1642,7 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr ""
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87 lib/imagefile.php:90
+#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
 msgid "Not an image or corrupt file."
 msgstr ""
 
@@ -1572,6 +1658,7 @@ msgstr ""
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
+#: actions/twitapistatuses.php:284
 msgid "Not found"
 msgstr ""
 
@@ -1587,11 +1674,13 @@ msgstr ""
 #: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
 #: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
 #: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72 actions/newmessage.php:87
+#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/makeadmin.php:61 actions/newnotice.php:88
 msgid "Not logged in."
 msgstr ""
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
 msgid "Not subscribed!."
 msgstr ""
 
@@ -1615,11 +1704,14 @@ msgstr ""
 #: ../actions/showstream.php:316 actions/showstream.php:331
 #: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
 #: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
+#: actions/conversation.php:149 lib/facebookaction.php:572
+#: lib/profileaction.php:206
 msgid "Notices"
 msgstr ""
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49
+#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
+#: actions/twitapitags.php:69
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
@@ -1636,7 +1728,7 @@ msgid "OpenID"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
+#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
 msgid "OpenID Account Setup"
 msgstr ""
 
@@ -1663,12 +1755,14 @@ msgstr ""
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 #: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 #: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
+#: actions/finishopenidlogin.php:129
 msgid "OpenID authentication cancelled."
 msgstr ""
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
+#: actions/finishopenidlogin.php:133
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr ""
@@ -1690,12 +1784,12 @@ msgid "OpenID settings"
 msgstr ""
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-#: actions/invite.php:186
+#: actions/invite.php:186 actions/invite.php:188
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75 lib/imagefile.php:79
+#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
 msgid "Partial upload."
 msgstr ""
 
@@ -1706,36 +1800,39 @@ msgstr ""
 #: actions/login.php:231 actions/register.php:372
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
 #: actions/login.php:214 lib/facebookaction.php:315
+#: actions/finishopenidlogin.php:117 actions/register.php:418
+#: lib/facebookaction.php:317
 msgid "Password"
 msgstr ""
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
+#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
 msgid "Password and confirmation do not match."
 msgstr ""
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
+#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
 msgid "Password must be 6 chars or more."
 msgstr ""
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
 msgid "Password recovery requested"
 msgstr ""
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-#: actions/passwordsettings.php:178
+#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
 msgid "Password saved."
 msgstr ""
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
 #: actions/passwordsettings.php:145 actions/register.php:183
-#: actions/passwordsettings.php:150
+#: actions/passwordsettings.php:150 actions/register.php:220
 msgid "Passwords don't match."
 msgstr ""
 
@@ -1755,11 +1852,12 @@ msgid "People search"
 msgstr ""
 
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+#: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr ""
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-#: actions/invite.php:184
+#: actions/invite.php:184 actions/invite.php:186
 msgid "Personal message"
 msgstr ""
 
@@ -1794,28 +1892,30 @@ msgstr ""
 #: actions/imsettings.php:152 actions/smssettings.php:171
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
-#: actions/emailsettings.php:293
+#: actions/emailsettings.php:293 actions/othersettings.php:173
 msgid "Preferences saved."
 msgstr ""
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
+#: actions/profilesettings.php:129 actions/profilesettings.php:130
 msgid "Preferred language"
 msgstr ""
 
 #: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
+#: lib/action.php:715
 msgid "Privacy"
 msgstr ""
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-#: classes/Notice.php:178 classes/Notice.php:188
+#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
+#: classes/Notice.php:216 classes/Notice.php:232
 msgid "Problem saving notice."
 msgstr ""
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
+#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr ""
 
@@ -1842,6 +1942,7 @@ msgstr ""
 
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
 #: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
+#: actions/public.php:120
 msgid "Public timeline"
 msgstr ""
 
@@ -1861,12 +1962,12 @@ msgid "Recent Tags"
 msgstr ""
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
+#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
 msgid "Recover"
 msgstr ""
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
+#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
 msgid "Recover password"
 msgstr ""
 
@@ -1880,27 +1981,32 @@ msgstr ""
 #: actions/register.php:69 actions/register.php:436 lib/action.php:338
 #: lib/facebookaction.php:277 lib/logingroupnav.php:78
 #: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
+#: actions/register.php:108 actions/register.php:486 lib/action.php:440
+#: lib/facebookaction.php:281
 msgid "Register"
 msgstr ""
 
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
+#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
+#: actions/register.php:129
 msgid "Registration not allowed."
 msgstr ""
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
+#: actions/register.php:67 actions/register.php:106
 msgid "Registration successful"
 msgstr ""
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
+#: actions/userauthorization.php:144 actions/userauthorization.php:179
 msgid "Reject"
 msgstr ""
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
 #: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:461
 msgid "Remember me"
 msgstr ""
 
@@ -1940,6 +2046,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:104
 msgid "Replies"
 msgstr ""
 
@@ -1947,23 +2054,24 @@ msgstr ""
 #: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #: actions/replies.php:116 actions/repliesrss.php:67
 #: lib/personalgroupnav.php:104 actions/replies.php:118
+#: actions/replies.php:117 lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 msgstr ""
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
+#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
 msgid "Reset"
 msgstr ""
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
+#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
 msgid "Reset password"
 msgstr ""
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-#: actions/subscriptions.php:125
+#: actions/subscriptions.php:125 actions/subscriptions.php:184
 msgid "SMS"
 msgstr ""
 
@@ -1982,12 +2090,12 @@ msgid "SMS confirmation"
 msgstr ""
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
+#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
 msgid "Same as password above"
 msgstr ""
 
 #: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
+#: actions/register.php:377 actions/register.php:423
 msgid "Same as password above. Required."
 msgstr ""
 
@@ -2002,12 +2110,15 @@ msgstr ""
 #: actions/tagother.php:152 actions/twittersettings.php:161
 #: lib/groupeditform.php:171 actions/emailsettings.php:187
 #: actions/subscriptions.php:126 actions/tagother.php:154
-#: actions/twittersettings.php:164
+#: actions/twittersettings.php:164 actions/othersettings.php:119
+#: actions/profilesettings.php:152 actions/subscriptions.php:185
+#: actions/twittersettings.php:180 lib/designsettings.php:256
+#: lib/groupeditform.php:196
 msgid "Save"
 msgstr ""
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325 lib/action.php:396
+#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
 msgid "Search"
 msgstr ""
 
@@ -2039,7 +2150,8 @@ msgstr ""
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
 #: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
-#: lib/messageform.php:165
+#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
+#: lib/noticeform.php:179
 msgid "Send"
 msgstr ""
 
@@ -2072,12 +2184,12 @@ msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
 #: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
-#: lib/facebookaction.php:228
+#: lib/facebookaction.php:228 lib/facebookaction.php:230
 msgid "Settings"
 msgstr ""
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
+#: actions/profilesettings.php:319 actions/profilesettings.php:318
 msgid "Settings saved."
 msgstr ""
 
@@ -2097,28 +2209,31 @@ msgid "Something weird happened."
 msgstr ""
 
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
+#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
 msgid "Sorry, no incoming email allowed."
 msgstr ""
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
+#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
 msgid "Sorry, that is not your incoming email address."
 msgstr ""
 
 #: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: lib/action.php:717
 msgid "Source"
 msgstr ""
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
 #: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showgroup.php:421 lib/profileaction.php:173
 msgid "Statistics"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 #: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-#: actions/finishopenidlogin.php:295
+#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
+#: actions/finishopenidlogin.php:318
 msgid "Stored OpenID not found."
 msgstr ""
 
@@ -2126,24 +2241,27 @@ msgstr ""
 #: ../actions/showstream.php:197 actions/remotesubscribe.php:84
 #: actions/showstream.php:197 actions/showstream.php:206
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
+#: lib/subscribeform.php:139 actions/showstream.php:345
 msgid "Subscribe"
 msgstr ""
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
 #: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
+#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
+#: lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr ""
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
 #: actions/userauthorization.php:338 actions/userauthorization.php:344
+#: actions/userauthorization.php:378
 msgid "Subscription authorized"
 msgstr ""
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
 #: actions/userauthorization.php:349 actions/userauthorization.php:355
+#: actions/userauthorization.php:389
 msgid "Subscription rejected"
 msgstr ""
 
@@ -2151,12 +2269,13 @@ msgstr ""
 #: ../actions/subscriptions.php:27 actions/showstream.php:240
 #: actions/showstream.php:322 actions/subscriptions.php:27
 #: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
+#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
+#: lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr ""
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78 lib/imagefile.php:82
+#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
 msgid "System error uploading file."
 msgstr ""
 
@@ -2165,10 +2284,13 @@ msgstr ""
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
 #: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
 #: actions/tagother.php:209 lib/profilelist.php:160
+#: actions/profilesettings.php:123 actions/showstream.php:255
+#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
 msgid "Tags"
 msgstr ""
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
+#: lib/designsettings.php:217
 msgid "Text"
 msgstr ""
 
@@ -2253,12 +2375,15 @@ msgstr ""
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
 #: actions/facebookhome.php:243 actions/twitapistatuses.php:276
 #: actions/newnotice.php:136 actions/twitapistatuses.php:294
-#: lib/facebookaction.php:485
+#: lib/facebookaction.php:485 actions/newnotice.php:166
+#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
+#: scripts/maildaemon.php:70
 msgid "That's too long. Max notice size is 140 chars."
 msgstr ""
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
 #: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
+#: actions/twitapiaccount.php:66
 msgid "That's too long. Max notice size is 255 chars."
 msgstr ""
 
@@ -2277,6 +2402,7 @@ msgid "The address was removed."
 msgstr ""
 
 #: ../actions/userauthorization.php:312 actions/userauthorization.php:346
+#: actions/userauthorization.php:380
 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 "
@@ -2284,6 +2410,7 @@ msgid ""
 msgstr ""
 
 #: ../actions/userauthorization.php:322 actions/userauthorization.php:357
+#: actions/userauthorization.php:391
 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 "
@@ -2313,6 +2440,7 @@ msgid "These are the people whose notices you listen to."
 msgstr ""
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:130
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
@@ -2328,7 +2456,7 @@ msgid ""
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -2341,6 +2469,8 @@ msgstr ""
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
 #: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
+#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
+#: actions/twitapistatuses.php:416
 msgid "This method requires a POST or DELETE."
 msgstr ""
 
@@ -2351,6 +2481,8 @@ msgstr ""
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
 #: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
 #: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
+#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
+#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
 msgid "This method requires a POST."
 msgstr ""
 
@@ -2359,12 +2491,12 @@ msgid "This page is not available in a media type you accept"
 msgstr ""
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
+#: actions/profilesettings.php:138 actions/profilesettings.php:139
 msgid "Timezone"
 msgstr ""
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
+#: actions/profilesettings.php:211 actions/profilesettings.php:212
 msgid "Timezone not selected."
 msgstr ""
 
@@ -2377,13 +2509,14 @@ msgid ""
 msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
+#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
 msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
 #: actions/profilesettings.php:109 actions/register.php:398
+#: actions/register.php:444
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
@@ -2402,15 +2535,17 @@ msgstr ""
 #: actions/smssettings.php:236 actions/twittersettings.php:302
 #: actions/avatarsettings.php:263 actions/emailsettings.php:247
 #: actions/grouplogo.php:324 actions/twittersettings.php:306
+#: actions/twittersettings.php:322 lib/designsettings.php:301
 msgid "Unexpected form submission."
 msgstr ""
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
+#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
 msgid "Unexpected password reset."
 msgstr ""
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+#: actions/recoverpassword.php:210
 msgid "Unknown action"
 msgstr ""
 
@@ -2444,7 +2579,7 @@ msgid "Unsupported OMB version"
 msgstr ""
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102 lib/imagefile.php:99
+#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
 msgid "Unsupported image file format."
 msgstr ""
 
@@ -2460,12 +2595,14 @@ msgstr ""
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
 #: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:94
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
 #: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
+#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
@@ -2489,13 +2626,14 @@ msgid "Upload a new profile image"
 msgstr ""
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/invite.php:156
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
 #: ../actions/register.php:159 ../actions/register.php:162
 #: actions/register.php:173 actions/register.php:176 actions/register.php:382
-#: actions/register.php:386
+#: actions/register.php:386 actions/register.php:428 actions/register.php:432
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
@@ -2521,6 +2659,8 @@ msgstr ""
 #: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
 #: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
 #: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
+#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
 msgid "User has no profile."
 msgstr ""
 
@@ -2534,7 +2674,7 @@ msgid "User not found."
 msgstr ""
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
+#: actions/profilesettings.php:139 actions/profilesettings.php:140
 msgid "What timezone are you normally in?"
 msgstr ""
 
@@ -2546,6 +2686,7 @@ msgstr ""
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
 #: actions/profilesettings.php:119 actions/register.php:410
+#: actions/register.php:456
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
@@ -2565,6 +2706,8 @@ msgstr ""
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
 #: actions/block.php:148 actions/deletenotice.php:122
 #: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/block.php:150 actions/deletenotice.php:116
+#: actions/groupblock.php:177
 msgid "Yes"
 msgstr ""
 
@@ -2585,11 +2728,12 @@ msgid "You are already logged in!"
 msgstr ""
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+#: actions/invite.php:122
 msgid "You are already subscribed to these users:"
 msgstr ""
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
+#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
 msgid "You are not friends with the specified user."
 msgstr ""
 
@@ -2636,6 +2780,7 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
 #: actions/finishopenidlogin.php:43 actions/register.php:149
+#: actions/register.php:186
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 
@@ -2644,7 +2789,7 @@ msgstr ""
 msgid "You did not send us that profile"
 msgstr ""
 
-#: ../lib/mail.php:147 lib/mail.php:289
+#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -2659,15 +2804,18 @@ msgstr ""
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
 #: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
+#: actions/twitapistatuses.php:443
 msgid "You may not delete another user's status."
 msgstr ""
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr ""
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/invite.php:144
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
@@ -2683,6 +2831,7 @@ msgid "Your OpenID URL"
 msgstr ""
 
 #: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 
@@ -2694,46 +2843,56 @@ msgid ""
 msgstr ""
 
 #: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: lib/util.php:770
 msgid "a few seconds ago"
 msgstr ""
 
 #: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: lib/util.php:782
 #, php-format
 msgid "about %d days ago"
 msgstr ""
 
 #: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: lib/util.php:778
 #, php-format
 msgid "about %d hours ago"
 msgstr ""
 
 #: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: lib/util.php:774
 #, php-format
 msgid "about %d minutes ago"
 msgstr ""
 
 #: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: lib/util.php:786
 #, php-format
 msgid "about %d months ago"
 msgstr ""
 
 #: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: lib/util.php:780
 msgid "about a day ago"
 msgstr ""
 
 #: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: lib/util.php:772
 msgid "about a minute ago"
 msgstr ""
 
 #: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: lib/util.php:784
 msgid "about a month ago"
 msgstr ""
 
 #: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: lib/util.php:788
 msgid "about a year ago"
 msgstr ""
 
 #: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: lib/util.php:776
 msgid "about an hour ago"
 msgstr ""
 
@@ -2761,7 +2920,8 @@ msgstr ""
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
 #: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
-#: actions/twitapistatuses.php:618
+#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
+#: actions/twitapistatuses.php:575
 msgid "unsupported file type"
 msgstr ""
 
@@ -2790,6 +2950,11 @@ msgstr ""
 #: actions/register.php:113 actions/remotesubscribe.php:53
 #: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
 #: actions/twittersettings.php:294 actions/userauthorization.php:39
+#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
+#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
+#: actions/othersettings.php:138 actions/recoverpassword.php:334
+#: actions/register.php:153 actions/twittersettings.php:310
+#: lib/designsettings.php:291
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -2798,6 +2963,7 @@ msgid "This notice is not a favorite!"
 msgstr ""
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
+#: actions/twitapifavorites.php:188
 msgid "Could not delete favorite."
 msgstr ""
 
@@ -2815,13 +2981,15 @@ msgstr ""
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
 #: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
+#: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr ""
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
-#: actions/twitapifavorites.php:131 lib/command.php:152
+#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
+#: actions/twitapifavorites.php:133 lib/command.php:145
 msgid "Could not create favorite."
 msgstr ""
 
@@ -2879,6 +3047,7 @@ msgstr ""
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
 #: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
 #: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:145
 msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
@@ -2891,6 +3060,7 @@ msgstr ""
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
 #: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
+#: lib/command.php:230
 msgid "You can't send a message to this user."
 msgstr ""
 
@@ -2898,6 +3068,7 @@ msgstr ""
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
 #: classes/Command.php:240 actions/newmessage.php:161
 #: actions/twitapidirect_messages.php:167 lib/command.php:240
+#: actions/twitapidirect_messages.php:163 lib/command.php:233
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2964,6 +3135,8 @@ msgstr ""
 #: actions/userauthorization.php:176 actions/userrss.php:82
 #: actions/avatarsettings.php:106 actions/avatarsettings.php:182
 #: actions/grouplogo.php:183 actions/remotesubscribe.php:366
+#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
+#: actions/userrss.php:103
 msgid "User without matching profile"
 msgstr ""
 
@@ -2992,7 +3165,7 @@ msgid "New password successfully saved. "
 msgstr ""
 
 #: actions/register.php:95 actions/register.php:180
-#: actions/passwordsettings.php:147
+#: actions/passwordsettings.php:147 actions/register.php:217
 msgid "Password must be 6 or more characters."
 msgstr ""
 
@@ -3020,7 +3193,7 @@ msgstr ""
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-#: actions/showfavorites.php:179
+#: actions/showfavorites.php:179 actions/showfavorites.php:209
 msgid "Could not retrieve favorite notices."
 msgstr ""
 
@@ -3052,24 +3225,24 @@ msgid "Mobile carrier for your phone. "
 msgstr ""
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
-#: actions/twitapidirect_messages.php:67
+#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
-#: actions/twitapidirect_messages.php:68
+#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-#: actions/twitapidirect_messages.php:72
+#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
 msgid "Direct Messages You've Sent"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
-#: actions/twitapidirect_messages.php:73
+#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
@@ -3077,29 +3250,32 @@ msgstr ""
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
 #: actions/twitapidirect_messages.php:146
+#: actions/twitapidirect_messages.php:140
 msgid "No message text!"
 msgstr ""
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
 #: actions/twitapidirect_messages.php:159
+#: actions/twitapidirect_messages.php:154
 msgid "Recipient user not found."
 msgstr ""
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
 #: actions/twitapidirect_messages.php:162
+#: actions/twitapidirect_messages.php:158
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
-#: actions/twitapifavorites.php:64
+#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
-#: actions/twitapifavorites.php:68
+#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
@@ -3107,6 +3283,7 @@ msgstr ""
 #: actions/twitapifavorites.php:187 lib/mail.php:275
 #: actions/twitapifavorites.php:164 lib/mail.php:553
 #: actions/twitapifavorites.php:170 lib/mail.php:554
+#: actions/twitapifavorites.php:221
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr ""
@@ -3168,13 +3345,14 @@ msgid "Subscribe to my Twitter friends here."
 msgstr ""
 
 #: actions/twittersettings.php:122 actions/twittersettings.php:331
+#: actions/twittersettings.php:348
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
-#: actions/twittersettings.php:338
+#: actions/twittersettings.php:338 actions/twittersettings.php:355
 msgid "Could not verify your Twitter credentials!"
 msgstr ""
 
@@ -3186,26 +3364,28 @@ msgstr ""
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
 #: actions/twittersettings.php:352 actions/twittersettings.php:372
+#: actions/twittersettings.php:369 actions/twittersettings.php:389
 msgid "Unable to save your Twitter settings!"
 msgstr ""
 
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
-#: actions/twittersettings.php:380
+#: actions/twittersettings.php:380 actions/twittersettings.php:399
 msgid "Twitter settings saved."
 msgstr ""
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
-#: actions/twittersettings.php:399
+#: actions/twittersettings.php:399 actions/twittersettings.php:418
 msgid "That is not your Twitter account."
 msgstr ""
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
 #: actions/twittersettings.php:403 actions/twittersettings.php:407
+#: actions/twittersettings.php:426
 msgid "Couldn't remove Twitter user."
 msgstr ""
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
-#: actions/twittersettings.php:411
+#: actions/twittersettings.php:411 actions/twittersettings.php:430
 msgid "Twitter account removed."
 msgstr ""
 
@@ -3213,11 +3393,13 @@ msgstr ""
 #: actions/twittersettings.php:428 actions/twittersettings.php:439
 #: actions/twittersettings.php:453 actions/twittersettings.php:432
 #: actions/twittersettings.php:443 actions/twittersettings.php:457
+#: actions/twittersettings.php:452 actions/twittersettings.php:463
+#: actions/twittersettings.php:477
 msgid "Couldn't save Twitter preferences."
 msgstr ""
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
-#: actions/twittersettings.php:465
+#: actions/twittersettings.php:465 actions/twittersettings.php:485
 msgid "Twitter preferences saved."
 msgstr ""
 
@@ -3257,88 +3439,107 @@ msgstr ""
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
 #: classes/Command.php:276 lib/command.php:145 lib/command.php:276
+#: lib/command.php:138 lib/command.php:269
 msgid "User has no last notice"
 msgstr ""
 
 #: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
+#: lib/command.php:159
 msgid "Notice marked as fave."
 msgstr ""
 
 #: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
+#: lib/command.php:182
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
 
 #: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
+#: lib/command.php:185
 #, php-format
 msgid "Fullname: %s"
 msgstr ""
 
 #: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
+#: lib/command.php:188
 #, php-format
 msgid "Location: %s"
 msgstr ""
 
 #: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
+#: lib/command.php:191
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
 #: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
+#: lib/command.php:194
 #, php-format
 msgid "About: %s"
 msgstr ""
 
 #: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
+#: lib/command.php:221
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
 
 #: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
+#: actions/newmessage.php:182 lib/command.php:238
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
 #: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
+#: lib/command.php:240
 msgid "Error sending direct message."
 msgstr ""
 
 #: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
+#: lib/command.php:293
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
 #: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
+#: lib/command.php:300
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
 #: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
+#: lib/command.php:321
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
 #: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
+#: lib/command.php:328
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
 #: classes/Command.php:376 lib/command.php:353 lib/command.php:376
+#: lib/command.php:346 lib/command.php:369
 msgid "Command not yet implemented."
 msgstr ""
 
 #: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
+#: lib/command.php:349
 msgid "Notification off."
 msgstr ""
 
 #: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
+#: lib/command.php:351
 msgid "Can't turn off notification."
 msgstr ""
 
 #: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
+#: lib/command.php:372
 msgid "Notification on."
 msgstr ""
 
 #: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
+#: lib/command.php:374
 msgid "Can't turn on notification."
 msgstr ""
 
@@ -3386,31 +3587,39 @@ msgid "This form should automatically submit itself. "
 msgstr ""
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
+#: lib/personalgroupnav.php:114
 msgid "Favorites"
 msgstr ""
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/favoritesrss.php:110 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
 #, php-format
 msgid "%s's favorite notices"
 msgstr ""
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:115
 msgid "User"
 msgstr ""
 
 #: lib/personal.php:75 lib/personalgroupnav.php:123
+#: lib/personalgroupnav.php:124
 msgid "Inbox"
 msgstr ""
 
 #: lib/personal.php:76 lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
 msgid "Your incoming messages"
 msgstr ""
 
 #: lib/personal.php:80 lib/personalgroupnav.php:128
+#: lib/personalgroupnav.php:129
 msgid "Outbox"
 msgstr ""
 
 #: lib/personal.php:81 lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
 msgid "Your sent messages"
 msgstr ""
 
@@ -3423,16 +3632,19 @@ msgid "Twitter integration options"
 msgstr ""
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-#: lib/messageform.php:137 lib/noticelist.php:425
+#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
+#: lib/noticelist.php:433
 msgid "To"
 msgstr ""
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+#: scripts/maildaemon.php:47
 msgid "Could not parse message."
 msgstr ""
 
 #: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
-#: actions/facebookhome.php:161
+#: actions/facebookhome.php:161 actions/all.php:48
+#: actions/facebookhome.php:156
 #, php-format
 msgid "%s and friends, page %d"
 msgstr ""
@@ -3489,27 +3701,30 @@ msgid "Lost our file data."
 msgstr ""
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112 lib/imagefile.php:112
+#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
 msgid "Lost our file."
 msgstr ""
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
 #: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
-#: lib/imagefile.php:191
+#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
 msgid "Unknown file type"
 msgstr ""
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71
 msgid "No profile specified."
 msgstr ""
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/unblock.php:75 actions/groupblock.php:76
+#: actions/groupunblock.php:76 actions/makeadmin.php:76
 msgid "No profile with that ID."
 msgstr ""
 
-#: actions/block.php:111
+#: actions/block.php:111 actions/block.php:134
 msgid "Block user"
 msgstr ""
 
@@ -3517,11 +3732,11 @@ msgstr ""
 msgid "Are you sure you want to block this user? "
 msgstr ""
 
-#: actions/block.php:162
+#: actions/block.php:162 actions/block.php:165
 msgid "You have already blocked this user."
 msgstr ""
 
-#: actions/block.php:167
+#: actions/block.php:167 actions/block.php:170
 msgid "Failed to save block information."
 msgstr ""
 
@@ -3538,41 +3753,48 @@ msgstr ""
 msgid "Add to favorites"
 msgstr ""
 
-#: actions/editgroup.php:54
+#: actions/editgroup.php:54 actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
 msgstr ""
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-#: actions/grouplogo.php:70 actions/grouprss.php:80
+#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68
+#: actions/groupdesignsettings.php:68 actions/showgroup.php:105
 msgid "Inboxes must be enabled for groups to work"
 msgstr ""
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-#: actions/grouplogo.php:75
+#: actions/grouplogo.php:75 actions/editgroup.php:73
 msgid "You must be logged in to create a group."
 msgstr ""
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
 #: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
+#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
 msgid "No nickname"
 msgstr ""
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
 #: actions/showgroup.php:128 actions/grouplogo.php:104
-#: actions/grouprss.php:103
+#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
+#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
+#: actions/showgroup.php:133
 msgid "No such group"
 msgstr ""
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
 #: actions/grouplogo.php:107 actions/grouplogo.php:111
+#: actions/editgroup.php:108 actions/editgroup.php:167
+#: actions/groupdesignsettings.php:109
 msgid "You must be an admin to edit the group"
 msgstr ""
 
-#: actions/editgroup.php:157
+#: actions/editgroup.php:157 actions/editgroup.php:159
 msgid "Use this form to edit the group."
 msgstr ""
 
@@ -3581,14 +3803,15 @@ msgid "Nickname must have only lowercase letters "
 msgstr ""
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/editgroup.php:200 actions/newgroup.php:150
 msgid "description is too long (max 140 chars)."
 msgstr ""
 
-#: actions/editgroup.php:218
+#: actions/editgroup.php:218 actions/editgroup.php:253
 msgid "Could not update group."
 msgstr ""
 
-#: actions/editgroup.php:226
+#: actions/editgroup.php:226 actions/editgroup.php:269
 msgid "Options saved."
 msgstr ""
 
@@ -3617,7 +3840,7 @@ msgstr ""
 msgid "A confirmation code was sent to the email address you added. "
 msgstr ""
 
-#: actions/facebookhome.php:110
+#: actions/facebookhome.php:110 actions/facebookhome.php:109
 msgid "Server error - couldn't get user!"
 msgstr ""
 
@@ -3632,53 +3855,62 @@ msgid "Allow %s to update my Facebook status"
 msgstr ""
 
 #: actions/facebookhome.php:218 actions/facebookhome.php:223
+#: actions/facebookhome.php:217
 msgid "Skip"
 msgstr ""
 
 #: actions/facebookhome.php:235 lib/facebookaction.php:479
+#: lib/facebookaction.php:471
 msgid "No notice content!"
 msgstr ""
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
 #: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
+#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
 msgid "Pagination"
 msgstr ""
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
 #: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
+#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
 msgid "After"
 msgstr ""
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
 #: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
 msgid "Before"
 msgstr ""
 
-#: actions/facebookinvite.php:70
+#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
 msgstr ""
 
-#: actions/facebookinvite.php:72
+#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
 msgid "Invitations have been sent to the following users:"
 msgstr ""
 
 #: actions/facebookinvite.php:96 actions/facebookinvite.php:102
+#: actions/facebookinvite.php:94
 #, php-format
 msgid "You have been invited to %s"
 msgstr ""
 
 #: actions/facebookinvite.php:105 actions/facebookinvite.php:111
+#: actions/facebookinvite.php:103
 #, php-format
 msgid "Invite your friends to use %s"
 msgstr ""
 
 #: actions/facebookinvite.php:113 actions/facebookinvite.php:126
+#: actions/facebookinvite.php:124
 #, php-format
 msgid "Friends already using %s:"
 msgstr ""
 
 #: actions/facebookinvite.php:130 actions/facebookinvite.php:143
+#: actions/facebookinvite.php:142
 #, php-format
 msgid "Send invitations"
 msgstr ""
@@ -3720,13 +3952,13 @@ msgstr ""
 msgid "Sync preferences"
 msgstr ""
 
-#: actions/favor.php:94 lib/disfavorform.php:140
+#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
 msgid "Disfavor favorite"
 msgstr ""
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
 #: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
-#: lib/publicgroupnav.php:93
+#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
 msgid "Popular notices"
 msgstr ""
 
@@ -3741,6 +3973,7 @@ msgstr ""
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
 #: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
+#: lib/featureduserssection.php:87
 msgid "Featured users"
 msgstr ""
 
@@ -3794,7 +4027,8 @@ msgid "A list of the users in this group."
 msgstr ""
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220
+#: lib/subgroupnav.php:98
 msgid "Groups"
 msgstr ""
 
@@ -3809,7 +4043,7 @@ msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr ""
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-#: actions/usergroups.php:125
+#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
 msgid "Create a new group"
 msgstr ""
 
@@ -3819,7 +4053,7 @@ msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
 msgstr ""
 
-#: actions/groupsearch.php:63
+#: actions/groupsearch.php:63 actions/groupsearch.php:58
 msgid "Group search"
 msgstr ""
 
@@ -3849,12 +4083,12 @@ msgstr ""
 msgid "You are already a member of that group"
 msgstr ""
 
-#: actions/joingroup.php:128
+#: actions/joingroup.php:128 actions/joingroup.php:133
 #, php-format
 msgid "Could not join user %s to group %s"
 msgstr ""
 
-#: actions/joingroup.php:135
+#: actions/joingroup.php:135 actions/joingroup.php:140
 #, php-format
 msgid "%s joined group %s"
 msgstr ""
@@ -3867,7 +4101,8 @@ msgstr ""
 msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: actions/leavegroup.php:88
+#: actions/leavegroup.php:88 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/makeadmin.php:86
 msgid "No such group."
 msgstr ""
 
@@ -3909,11 +4144,11 @@ msgstr ""
 msgid "Use this form to create a new group."
 msgstr ""
 
-#: actions/newgroup.php:177
+#: actions/newgroup.php:177 actions/newgroup.php:209
 msgid "Could not create group."
 msgstr ""
 
-#: actions/newgroup.php:191
+#: actions/newgroup.php:191 actions/newgroup.php:229
 msgid "Could not set group membership."
 msgstr ""
 
@@ -3926,11 +4161,12 @@ msgid "Don't send a message to yourself; "
 msgstr ""
 
 #: actions/newnotice.php:166 actions/newnotice.php:174
+#: actions/newnotice.php:272
 msgid "Notice posted"
 msgstr ""
 
 #: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
-#: lib/channel.php:170
+#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
 msgid "Ajax Error"
 msgstr ""
 
@@ -3971,11 +4207,11 @@ msgstr ""
 msgid "Service"
 msgstr ""
 
-#: actions/othersettings.php:113
+#: actions/othersettings.php:113 actions/othersettings.php:111
 msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/othersettings.php:144
+#: actions/othersettings.php:144 actions/othersettings.php:146
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr ""
 
@@ -3983,7 +4219,7 @@ msgstr ""
 msgid "Change your password."
 msgstr ""
 
-#: actions/passwordsettings.php:89
+#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
 msgid "Password change"
 msgstr ""
 
@@ -4006,7 +4242,7 @@ msgstr ""
 msgid "Profile information"
 msgstr ""
 
-#: actions/profilesettings.php:124
+#: actions/profilesettings.php:124 actions/profilesettings.php:125
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4016,21 +4252,21 @@ msgid "Automatically subscribe to whoever "
 msgstr ""
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
-#: actions/tagother.php:178
+#: actions/tagother.php:178 actions/profilesettings.php:230
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr ""
 
-#: actions/profilesettings.php:311
+#: actions/profilesettings.php:311 actions/profilesettings.php:310
 msgid "Couldn't save tags."
 msgstr ""
 
-#: actions/public.php:107 actions/public.php:110
+#: actions/public.php:107 actions/public.php:110 actions/public.php:118
 #, php-format
 msgid "Public timeline, page %d"
 msgstr ""
 
-#: actions/public.php:173 actions/public.php:184
+#: actions/public.php:173 actions/public.php:184 actions/public.php:210
 msgid "Could not retrieve public stream."
 msgstr ""
 
@@ -4050,11 +4286,12 @@ msgstr ""
 msgid "These are most popular recent tags on %s "
 msgstr ""
 
-#: actions/publictagcloud.php:119
+#: actions/publictagcloud.php:119 actions/publictagcloud.php:135
 msgid "Tag cloud"
 msgstr ""
 
-#: actions/register.php:139 actions/register.php:349
+#: actions/register.php:139 actions/register.php:349 actions/register.php:79
+#: actions/register.php:177 actions/register.php:394
 msgid "Sorry, only invited people can register."
 msgstr ""
 
@@ -4103,7 +4340,7 @@ msgstr ""
 msgid "That's a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/replies.php:118 actions/replies.php:120
+#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
 #, php-format
 msgid "Replies to %s, page %d"
 msgstr ""
@@ -4113,35 +4350,41 @@ msgstr ""
 msgid "%s favorite notices, page %d"
 msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr ""
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:79 actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr ""
 
 #: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:213
 msgid "Group profile"
 msgstr ""
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
 #: actions/showgroup.php:253 actions/showstream.php:271
-#: actions/tagother.php:118 lib/profilelist.php:131
+#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
+#: actions/showstream.php:236 actions/userauthorization.php:137
+#: lib/profilelist.php:197
 msgid "URL"
 msgstr ""
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
 #: actions/showgroup.php:264 actions/showstream.php:282
-#: actions/tagother.php:128 lib/profilelist.php:142
+#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
+#: actions/showstream.php:247 actions/userauthorization.php:149
+#: lib/profilelist.php:212
 msgid "Note"
 msgstr ""
 
 #: actions/showgroup.php:270 actions/showgroup.php:272
+#: actions/showgroup.php:288
 msgid "Group actions"
 msgstr ""
 
@@ -4151,17 +4394,21 @@ msgid "Notice feed for %s group"
 msgstr ""
 
 #: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
-#: actions/showgroup.php:384
+#: actions/showgroup.php:384 actions/showgroup.php:373
+#: actions/showgroup.php:430
 msgid "Members"
 msgstr ""
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
 #: lib/tagcloudsection.php:71 actions/showgroup.php:344
+#: actions/showgroup.php:378 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226
 msgid "(None)"
 msgstr ""
 
 #: actions/showgroup.php:370 actions/showgroup.php:350
+#: actions/showgroup.php:384
 msgid "All members"
 msgstr ""
 
@@ -4176,7 +4423,7 @@ msgstr ""
 msgid "Only the sender and recipient "
 msgstr ""
 
-#: actions/showstream.php:73
+#: actions/showstream.php:73 actions/showstream.php:78
 #, php-format
 msgid "%s, page %d"
 msgstr ""
@@ -4186,32 +4433,33 @@ msgid "'s profile"
 msgstr ""
 
 #: actions/showstream.php:236 actions/tagother.php:77
-#: actions/showstream.php:220
+#: actions/showstream.php:220 actions/showstream.php:185
 msgid "User profile"
 msgstr ""
 
 #: actions/showstream.php:240 actions/tagother.php:81
-#: actions/showstream.php:224
+#: actions/showstream.php:224 actions/showstream.php:189
 msgid "Photo"
 msgstr ""
 
 #: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:274
 msgid "User actions"
 msgstr ""
 
-#: actions/showstream.php:342
+#: actions/showstream.php:342 actions/showstream.php:307
 msgid "Send a direct message to this user"
 msgstr ""
 
-#: actions/showstream.php:343
+#: actions/showstream.php:343 actions/showstream.php:308
 msgid "Message"
 msgstr ""
 
-#: actions/showstream.php:451
+#: actions/showstream.php:451 lib/profileaction.php:157
 msgid "All subscribers"
 msgstr ""
 
-#: actions/showstream.php:533
+#: actions/showstream.php:533 lib/profileaction.php:235
 msgid "All groups"
 msgstr ""
 
@@ -4293,10 +4541,11 @@ msgid "These are the people whose "
 msgstr ""
 
 #: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:183
 msgid "Jabber"
 msgstr ""
 
-#: actions/tag.php:43 actions/tag.php:51
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59
 #, php-format
 msgid "Notices tagged with %s, page %d"
 msgstr ""
@@ -4342,7 +4591,7 @@ msgstr ""
 msgid "Could not save tags."
 msgstr ""
 
-#: actions/tagother.php:233 actions/tagother.php:235
+#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
@@ -4355,15 +4604,16 @@ msgstr ""
 msgid "Microblog tagged with %s"
 msgstr ""
 
-#: actions/twitapiblocks.php:47
+#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
 msgid "Block user failed."
 msgstr ""
 
-#: actions/twitapiblocks.php:69
+#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
 msgid "Unblock user failed."
 msgstr ""
 
 #: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:50
 msgid "Not found."
 msgstr ""
 
@@ -4380,6 +4630,7 @@ msgid "Twitter password"
 msgstr ""
 
 #: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:248
 msgid "Twitter Friends"
 msgstr ""
 
@@ -4392,7 +4643,7 @@ msgstr ""
 msgid "Unable to retrieve account information "
 msgstr ""
 
-#: actions/unblock.php:108
+#: actions/unblock.php:108 actions/groupunblock.php:128
 msgid "Error removing the block."
 msgstr ""
 
@@ -4408,26 +4659,26 @@ msgstr ""
 msgid "Unsubscribed"
 msgstr ""
 
-#: actions/usergroups.php:63
+#: actions/usergroups.php:63 actions/usergroups.php:62
 #, php-format
 msgid "%s groups"
 msgstr ""
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:65 actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr ""
 
-#: classes/Notice.php:104 classes/Notice.php:128
+#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
 msgid "Problem saving notice. Unknown user."
 msgstr ""
 
-#: classes/Notice.php:109 classes/Notice.php:133
+#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: classes/Notice.php:116 classes/Notice.php:145
+#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
@@ -4435,56 +4686,56 @@ msgstr ""
 msgid "Upload an avatar"
 msgstr ""
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
 msgid "Other"
 msgstr ""
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
 msgid "Other options"
 msgstr ""
 
-#: lib/action.php:130 lib/action.php:132
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142
 #, php-format
 msgid "%s - %s"
 msgstr ""
 
-#: lib/action.php:145 lib/action.php:147
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157
 msgid "Untitled page"
 msgstr ""
 
-#: lib/action.php:316 lib/action.php:387
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411
 msgid "Primary site navigation"
 msgstr ""
 
-#: lib/action.php:322 lib/action.php:393
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#: lib/action.php:325 lib/action.php:396
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448
 msgid "Search for people or text"
 msgstr ""
 
-#: lib/action.php:328 lib/action.php:399
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419
 msgid "Account"
 msgstr ""
 
-#: lib/action.php:328 lib/action.php:399
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419
 msgid "Change your email, avatar, password, profile"
 msgstr ""
 
-#: lib/action.php:330 lib/action.php:403
+#: lib/action.php:330 lib/action.php:403 lib/action.php:422
 msgid "Connect to IM, SMS, Twitter"
 msgstr ""
 
-#: lib/action.php:332 lib/action.php:409
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435
 msgid "Logout from the site"
 msgstr ""
 
-#: lib/action.php:335 lib/action.php:412
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443
 msgid "Login to the site"
 msgstr ""
 
-#: lib/action.php:338 lib/action.php:415
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440
 msgid "Create an account"
 msgstr ""
 
@@ -4492,43 +4743,44 @@ msgstr ""
 msgid "Login with OpenID"
 msgstr ""
 
-#: lib/action.php:344 lib/action.php:421
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446
 msgid "Help me!"
 msgstr ""
 
-#: lib/action.php:362 lib/action.php:441
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468
 msgid "Site notice"
 msgstr ""
 
-#: lib/action.php:417 lib/action.php:504
+#: lib/action.php:417 lib/action.php:504 lib/action.php:531
 msgid "Local views"
 msgstr ""
 
-#: lib/action.php:472 lib/action.php:559
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597
 msgid "Page notice"
 msgstr ""
 
-#: lib/action.php:562 lib/action.php:654
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699
 msgid "Secondary site navigation"
 msgstr ""
 
 #: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
+#: lib/action.php:749 lib/action.php:770
 msgid "Laconica software license"
 msgstr ""
 
-#: lib/action.php:630 lib/action.php:727
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779
 msgid "All "
 msgstr ""
 
-#: lib/action.php:635 lib/action.php:732
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784
 msgid "license."
 msgstr ""
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
 msgid "Block this user"
 msgstr ""
 
-#: lib/blockform.php:153
+#: lib/blockform.php:153 actions/groupmembers.php:343
 msgid "Block"
 msgstr ""
 
@@ -4542,11 +4794,13 @@ msgid "To use the %s Facebook Application you need to login "
 msgstr ""
 
 #: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:275
 msgid " a new account."
 msgstr ""
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
 #: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#: lib/mailbox.php:217 lib/noticelist.php:361
 msgid "Published"
 msgstr ""
 
@@ -4566,31 +4820,31 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:137 lib/galleryaction.php:138
 msgid "Tag"
 msgstr ""
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:138 lib/galleryaction.php:139
 msgid "Choose a tag to narrow list"
 msgstr ""
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:139 lib/galleryaction.php:141
 msgid "Go"
 msgstr ""
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:148 lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr ""
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:151 lib/groupeditform.php:166
 msgid "Description"
 msgstr ""
 
-#: lib/groupeditform.php:153
+#: lib/groupeditform.php:153 lib/groupeditform.php:168
 msgid "Describe the group or topic in 140 chars"
 msgstr ""
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:158 lib/groupeditform.php:173
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr ""
@@ -4599,20 +4853,20 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
-#: lib/groupnav.php:100
+#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
 msgid "Admin"
 msgstr ""
 
-#: lib/groupnav.php:101
+#: lib/groupnav.php:101 lib/groupnav.php:107
 #, php-format
 msgid "Edit %s group properties"
 msgstr ""
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:106 lib/groupnav.php:112
 msgid "Logo"
 msgstr ""
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:107 lib/groupnav.php:113
 #, php-format
 msgid "Add or edit %s logo"
 msgstr ""
@@ -4666,17 +4920,17 @@ msgstr ""
 msgid "%1$s is now listening to "
 msgstr ""
 
-#: lib/mail.php:254
+#: lib/mail.php:254 lib/mail.php:253
 #, php-format
 msgid "Location: %s\n"
 msgstr ""
 
-#: lib/mail.php:256
+#: lib/mail.php:256 lib/mail.php:255
 #, php-format
 msgid "Homepage: %s\n"
 msgstr ""
 
-#: lib/mail.php:258
+#: lib/mail.php:258 lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
@@ -4699,7 +4953,7 @@ msgid "%1$s just added your notice from %2$s"
 msgstr ""
 
 #: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
-#: lib/noticelist.php:383
+#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
 msgid "From"
 msgstr ""
 
@@ -4707,11 +4961,11 @@ msgstr ""
 msgid "Send a direct notice"
 msgstr ""
 
-#: lib/noticeform.php:125
+#: lib/noticeform.php:125 lib/noticeform.php:128
 msgid "Send a notice"
 msgstr ""
 
-#: lib/noticeform.php:152
+#: lib/noticeform.php:152 lib/noticeform.php:149
 msgid "Available characters"
 msgstr ""
 
@@ -4720,21 +4974,22 @@ msgid "in reply to"
 msgstr ""
 
 #: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
-#: lib/noticelist.php:454
+#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
 msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:451 lib/noticelist.php:455
+#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
 msgid "Reply"
 msgstr ""
 
 #: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
-#: lib/noticelist.php:479
+#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
+#: lib/noticelist.php:486
 msgid "Delete this notice"
 msgstr ""
 
 #: lib/noticelist.php:474 actions/avatarsettings.php:148
-#: lib/noticelist.php:479
+#: lib/noticelist.php:479 lib/noticelist.php:486
 msgid "Delete"
 msgstr ""
 
@@ -4756,6 +5011,7 @@ msgid "Tags in %s's notices"
 msgstr ""
 
 #: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/subscriptionlist.php:126
 msgid "(none)"
 msgstr ""
 
@@ -4792,31 +5048,32 @@ msgstr ""
 msgid "Untitled section"
 msgstr ""
 
-#: lib/subgroupnav.php:81
+#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
 msgstr ""
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
 #, php-format
 msgid "People subscribed to %s"
 msgstr ""
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:104
+#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#: lib/subs.php:53
+#: lib/subs.php:53 lib/subs.php:52
 msgid "User has blocked you."
 msgstr ""
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: actions/userauthorization.php:178
 msgid "Subscribe to this user"
 msgstr ""
 
@@ -4829,10 +5086,11 @@ msgid "Top posters"
 msgstr ""
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
 msgid "Unblock this user"
 msgstr ""
 
-#: lib/unblockform.php:150
+#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
 msgid "Unblock"
 msgstr ""
 
@@ -4840,22 +5098,22 @@ msgstr ""
 msgid "Unsubscribe from this user"
 msgstr ""
 
-#: actions/all.php:77
+#: actions/all.php:77 actions/all.php:59
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr ""
 
-#: actions/all.php:82
+#: actions/all.php:82 actions/all.php:64
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr ""
 
-#: actions/all.php:87
+#: actions/all.php:87 actions/all.php:69
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr ""
 
-#: actions/all.php:112
+#: actions/all.php:112 actions/all.php:125
 msgid "You and friends"
 msgstr ""
 
@@ -4868,7 +5126,7 @@ msgstr ""
 msgid "Avatar deleted."
 msgstr ""
 
-#: actions/block.php:129
+#: actions/block.php:129 actions/block.php:136
 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 "
@@ -4889,14 +5147,14 @@ msgstr ""
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
-#: actions/facebookhome.php:193
+#: actions/facebookhome.php:193 actions/facebookhome.php:187
 #, php-format
 msgid ""
 "If you would like the %s app to automatically update your Facebook status "
 "with your latest notice, you need to give it permission."
 msgstr ""
 
-#: actions/facebookhome.php:217
+#: actions/facebookhome.php:217 actions/facebookhome.php:211
 #, php-format
 msgid "Okay, do it!"
 msgstr ""
@@ -4918,12 +5176,12 @@ msgstr ""
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
-#: actions/grouprss.php:136
+#: actions/grouprss.php:136 actions/grouprss.php:137
 #, php-format
 msgid "Microblog by %s group"
 msgstr ""
 
-#: actions/groupsearch.php:57
+#: actions/groupsearch.php:57 actions/groupsearch.php:52
 #, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
@@ -4956,19 +5214,19 @@ msgid ""
 "before changing your settings."
 msgstr ""
 
-#: actions/public.php:125
+#: actions/public.php:125 actions/public.php:133
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr ""
 
-#: actions/public.php:130
+#: actions/public.php:130 actions/public.php:138
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr ""
 
-#: actions/public.php:135
+#: actions/public.php:135 actions/public.php:143
 msgid "Public Stream Feed (Atom)"
 msgstr ""
 
-#: actions/public.php:210
+#: actions/public.php:210 actions/public.php:241
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4977,7 +5235,7 @@ msgid ""
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 
-#: actions/register.php:286
+#: actions/register.php:286 actions/register.php:329
 #, php-format
 msgid ""
 "With this form you can create  a new account. You can then post notices and "
@@ -4985,21 +5243,21 @@ msgid ""
 "Try our [OpenID registration](%%action.openidlogin%%)!)"
 msgstr ""
 
-#: actions/register.php:432
+#: actions/register.php:432 actions/register.php:479
 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
-#: actions/register.php:433
+#: actions/register.php:433 actions/register.php:480
 msgid ""
 " except this private data: password, email address, IM address, and phone "
 "number."
 msgstr ""
 
-#: actions/showgroup.php:378
+#: actions/showgroup.php:378 actions/showgroup.php:424
 msgid "Created"
 msgstr ""
 
-#: actions/showgroup.php:393
+#: actions/showgroup.php:393 actions/showgroup.php:440
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5018,39 +5276,39 @@ msgstr ""
 msgid "%s's profile"
 msgstr ""
 
-#: actions/showstream.php:163
+#: actions/showstream.php:163 actions/showstream.php:128
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr ""
 
-#: actions/showstream.php:170
+#: actions/showstream.php:170 actions/showstream.php:135
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr ""
 
-#: actions/showstream.php:177
+#: actions/showstream.php:177 actions/showstream.php:142
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr ""
 
-#: actions/showstream.php:182
+#: actions/showstream.php:182 actions/showstream.php:147
 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 
-#: actions/showstream.php:237
+#: actions/showstream.php:237 actions/showstream.php:202
 msgid "Edit Avatar"
 msgstr ""
 
-#: actions/showstream.php:316
+#: actions/showstream.php:316 actions/showstream.php:281
 msgid "Edit profile settings"
 msgstr ""
 
-#: actions/showstream.php:317
+#: actions/showstream.php:317 actions/showstream.php:282
 msgid "Edit"
 msgstr ""
 
-#: actions/showstream.php:542
+#: actions/showstream.php:542 actions/showstream.php:388
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5066,6 +5324,7 @@ msgid ""
 msgstr ""
 
 #: actions/twitapifavorites.php:171 lib/mail.php:556
+#: actions/twitapifavorites.php:222
 #, php-format
 msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
@@ -5082,7 +5341,8 @@ msgid ""
 "%5$s\n"
 msgstr ""
 
-#: actions/twitapistatuses.php:124
+#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
+#: actions/twitapistatuses.php:314
 msgid "No such user!"
 msgstr ""
 
@@ -5092,37 +5352,37 @@ msgid ""
 "subscribe to Twitter friends already here."
 msgstr ""
 
-#: actions/twittersettings.php:345
+#: actions/twittersettings.php:345 actions/twittersettings.php:362
 #, php-format
 msgid "Unable to retrieve account information For \"%s\" from Twitter."
 msgstr ""
 
-#: actions/userauthorization.php:86
+#: actions/userauthorization.php:86 actions/userauthorization.php:81
 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 ""
 
-#: actions/usergroups.php:131
+#: actions/usergroups.php:131 actions/usergroups.php:130
 msgid "Search for more groups"
 msgstr ""
 
-#: classes/Notice.php:138
+#: classes/Notice.php:138 classes/Notice.php:154
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
-#: lib/action.php:406
+#: lib/action.php:406 lib/action.php:425
 msgid "Connect to SMS, Twitter"
 msgstr ""
 
-#: lib/action.php:671
+#: lib/action.php:671 lib/action.php:721
 msgid "Badge"
 msgstr ""
 
-#: lib/command.php:113
+#: lib/command.php:113 lib/command.php:106
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5130,7 +5390,7 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:392
+#: lib/command.php:392 lib/command.php:385
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -5164,7 +5424,7 @@ msgstr ""
 msgid "Database error"
 msgstr ""
 
-#: lib/facebookaction.php:271
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
 #, php-format
 msgid ""
 "To use the %s Facebook Application you need to login with your username and "
@@ -5192,7 +5452,7 @@ msgstr ""
 msgid "That file is too big. The maximum file size is %d."
 msgstr ""
 
-#: lib/mail.php:175
+#: lib/mail.php:175 lib/mail.php:174
 #, php-format
 msgid ""
 "Hey, %s.\n"
@@ -5209,7 +5469,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: lib/mail.php:241
+#: lib/mail.php:241 lib/mail.php:240
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -5259,12 +5519,12 @@ msgid ""
 "%5$s\n"
 msgstr ""
 
-#: lib/mail.php:598
+#: lib/mail.php:598 lib/mail.php:600
 #, php-format
 msgid "%s sent a notice to your attention"
 msgstr ""
 
-#: lib/mail.php:600
+#: lib/mail.php:600 lib/mail.php:602
 #, php-format
 msgid ""
 "%1$s just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5291,10 +5551,923 @@ msgid ""
 "P.S. You can turn off these email notifications here: %7$s\n"
 msgstr ""
 
-#: lib/searchaction.php:122
+#: lib/searchaction.php:122 lib/searchaction.php:120
 msgid "Search site"
 msgstr ""
 
 #: lib/section.php:106
 msgid "More..."
 msgstr ""
+
+#: actions/all.php:80
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+
+#: actions/all.php:85
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+
+#: actions/all.php:87
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
+
+#: actions/attachment.php:73
+msgid "No such attachment."
+msgstr ""
+
+#: actions/block.php:149
+msgid "Do not block this user from this group"
+msgstr ""
+
+#: actions/block.php:150
+msgid "Block this user from this group"
+msgstr ""
+
+#: actions/blockedfromgroup.php:90
+#, php-format
+msgid "%s blocked profiles"
+msgstr ""
+
+#: actions/blockedfromgroup.php:93
+#, php-format
+msgid "%s blocked profiles, page %d"
+msgstr ""
+
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr ""
+
+#: actions/blockedfromgroup.php:281
+msgid "Unblock user from group"
+msgstr ""
+
+#: actions/conversation.php:99
+msgid "Conversation"
+msgstr ""
+
+#: actions/deletenotice.php:115
+msgid "Do not delete this notice"
+msgstr ""
+
+#: actions/editgroup.php:214 actions/newgroup.php:164
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/editgroup.php:223 actions/newgroup.php:173
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr ""
+
+#: actions/editgroup.php:227 actions/newgroup.php:177
+#, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr ""
+
+#: actions/editgroup.php:233 actions/newgroup.php:183
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#: actions/editgroup.php:259 actions/newgroup.php:215
+msgid "Could not create aliases."
+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/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/finishopenidlogin.php:211
+msgid "Not a valid invitation code."
+msgstr ""
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: 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:136 actions/groupmembers.php:311
+msgid "Block user from group"
+msgstr ""
+
+#: actions/groupblock.php:155
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+
+#: actions/groupblock.php:193
+msgid "Database error blocking user from group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:73
+msgid "You must be logged in to edit a group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:146
+msgid "Group design"
+msgstr ""
+
+#: actions/groupdesignsettings.php:157
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
+#: lib/designsettings.php:440 lib/designsettings.php:470
+msgid "Couldn't update your design."
+msgstr ""
+
+#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
+#: 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/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+msgid "Design preferences saved."
+msgstr ""
+
+#: actions/groupmembers.php:438
+msgid "Make user an admin of the group"
+msgstr ""
+
+#: actions/groupmembers.php:470
+msgid "Make Admin"
+msgstr ""
+
+#: actions/groupmembers.php:470
+msgid "Make this user an admin"
+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 ""
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
+
+#: actions/groupunblock.php:95
+msgid "User is not blocked from group."
+msgstr ""
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
+
+#: actions/joingroup.php:100
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
+
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
+
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
+
+#: actions/newmessage.php:178
+msgid "Message sent"
+msgstr ""
+
+#: actions/newnotice.php:93 lib/designsettings.php:281
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/newnotice.php:128 scripts/maildaemon.php:185
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: actions/newnotice.php:133 scripts/maildaemon.php:190
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: actions/newnotice.php:205
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: actions/newnotice.php:208
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: actions/newnotice.php:211
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: actions/newnotice.php:214
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: actions/newnotice.php:217
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: actions/newnotice.php:220
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: actions/newnotice.php:230 scripts/maildaemon.php:85
+msgid "Couldn't save file."
+msgstr ""
+
+#: actions/newnotice.php:246 scripts/maildaemon.php:101
+msgid "Max notice size is 140 chars, including attachment URL."
+msgstr ""
+
+#: actions/newnotice.php:297
+msgid "Somehow lost the login in saveFile"
+msgstr ""
+
+#: actions/newnotice.php:309 scripts/maildaemon.php:127
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: actions/newnotice.php:336 actions/newnotice.php:360
+#: scripts/maildaemon.php:148 scripts/maildaemon.php:167
+msgid "There was a database error while saving your file. Please try again."
+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/openidsettings.php:70
+#, php-format
+msgid ""
+"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
+"account. Manage your associated OpenIDs from here."
+msgstr ""
+
+#: actions/othersettings.php:110
+msgid "Shorten URLs with"
+msgstr ""
+
+#: actions/othersettings.php:115
+msgid "View profile designs"
+msgstr ""
+
+#: actions/othersettings.php:116
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/public.php:82
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
+
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
+
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+
+#: actions/public.php:245
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [Laconica](http://laconi.ca/) "
+"tool."
+msgstr ""
+
+#: actions/publictagcloud.php:69
+#, php-format
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
+msgstr ""
+
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
+msgstr ""
+
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+
+#: actions/recoverpassword.php:152
+msgid ""
+"If you've 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've been identified. Enter a new password below. "
+msgstr ""
+
+#: actions/recoverpassword.php:188
+msgid "Password recover"
+msgstr ""
+
+#: actions/register.php:86
+msgid "Sorry, invalid invitation code."
+msgstr ""
+
+#: actions/remotesubscribe.php:100
+msgid "Subscribe to a remote user"
+msgstr ""
+
+#: actions/replies.php:179
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
+
+#: actions/replies.php:184
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+
+#: actions/replies.php:186
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%s's favorite notices, page %d"
+msgstr ""
+
+#: actions/showfavorites.php:170
+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:172
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:176
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to thier favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:226
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:279 lib/groupeditform.php:178
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:323
+#, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr ""
+
+#: actions/showgroup.php:330 actions/tag.php:84
+#, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr ""
+
+#: actions/showgroup.php:337
+#, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr ""
+
+#: actions/showgroup.php:446
+#, 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 "
+"[Laconica](http://laconi.ca/) tool. Its members share short messages about "
+"their life and interests. "
+msgstr ""
+
+#: actions/showgroup.php:474
+msgid "Admins"
+msgstr ""
+
+#: actions/shownotice.php:101
+msgid "Not a local notice"
+msgstr ""
+
+#: actions/showstream.php:72
+#, php-format
+msgid " tagged %s"
+msgstr ""
+
+#: actions/showstream.php:121
+#, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr ""
+
+#: actions/showstream.php:350
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+
+#: actions/showstream.php:355
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:357
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:393
+#, 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 "
+"[Laconica](http://laconi.ca/) tool. "
+msgstr ""
+
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
+msgstr ""
+
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
+msgstr ""
+
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
+#: actions/subscriptions.php:115
+#, 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 ""
+
+#: actions/subscriptions.php:117 actions/subscriptions.php:121
+#, php-format
+msgid "%s is not listening to anyone."
+msgstr ""
+
+#: actions/tag.php:77
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr ""
+
+#: actions/tag.php:91
+#, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr ""
+
+#: actions/twitapifavorites.php:125
+msgid "This status is already a favorite!"
+msgstr ""
+
+#: actions/twitapifavorites.php:179
+msgid "That status is not a favorite!"
+msgstr ""
+
+#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+msgid "Could not determine source user."
+msgstr ""
+
+#: actions/twitapifriendships.php:215
+msgid "Target user not specified."
+msgstr ""
+
+#: actions/twitapifriendships.php:221
+msgid "Could not find target user."
+msgstr ""
+
+#: actions/twitapistatuses.php:322
+#, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr ""
+
+#: actions/twitapitags.php:74
+#, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr ""
+
+#: actions/twittersettings.php:165
+msgid "Import my Friends Timeline."
+msgstr ""
+
+#: actions/userauthorization.php:158
+msgid "License"
+msgstr ""
+
+#: actions/userauthorization.php:179
+msgid "Reject this subscription"
+msgstr ""
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+msgid "Profile design"
+msgstr ""
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+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 ""
+
+#: actions/usergroups.php:153
+#, php-format
+msgid "%s is not a member of any group."
+msgstr ""
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:127
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:137
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:145
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Notice.php:139
+msgid "Problem saving notice. Too long."
+msgstr ""
+
+#: classes/User.php:319
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr ""
+
+#: lib/accountsettingsaction.php:119 lib/groupnav.php:118
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120
+msgid "Design your profile"
+msgstr ""
+
+#: lib/action.php:712
+msgid "TOS"
+msgstr ""
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+msgid "Provider"
+msgstr ""
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+msgid "Upload file"
+msgstr ""
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+msgid "Change colours"
+msgstr ""
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+msgid "Content"
+msgstr ""
+
+#: lib/designsettings.php:204
+msgid "Sidebar"
+msgstr ""
+
+#: lib/designsettings.php:230
+msgid "Links"
+msgstr ""
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:378
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:474
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/groupeditform.php:181
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:100
+msgid "Blocked"
+msgstr ""
+
+#: lib/groupnav.php:101
+#, php-format
+msgid "%s blocked users"
+msgstr ""
+
+#: lib/groupnav.php:119
+#, php-format
+msgid "Add or edit %s design"
+msgstr ""
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$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 ""
+
+#: lib/mail.php:646
+#, php-format
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: lib/mail.php:648
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. Your Twitter credentials have either changed (did you recently "
+"change your Twitter password?) or you have otherwise revoked our access to "
+"your Twitter account.\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\n"
+msgstr ""
+
+#: lib/mail.php:682
+#, php-format
+msgid "Your %s Facebook application access has been disabled."
+msgstr ""
+
+#: lib/mail.php:685
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %s, and have disabled the Facebook application for your "
+"account. This may be because you have removed the Facebook application's "
+"authorization, or have deleted your Facebook account.  You can re-enable the "
+"Facebook application and automatic status updating by re-installing the %1$s "
+"Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%1$s"
+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/noticeform.php:154
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:158
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:436
+msgid "in context"
+msgstr ""
+
+#: lib/profileaction.php:177
+msgid "User ID"
+msgstr ""
+
+#: lib/searchaction.php:156
+msgid "Search help"
+msgstr ""
+
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/webcolor.php:82
+#, php-format
+msgid "%s is not a valid color!"
+msgstr ""
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
diff --git a/locale/nb_NO/LC_MESSAGES/laconica.mo b/locale/nb_NO/LC_MESSAGES/laconica.mo
index 480d559c9..4cc6b6181 100644
--- a/locale/nb_NO/LC_MESSAGES/laconica.mo
+++ b/locale/nb_NO/LC_MESSAGES/laconica.mo
diff --git a/locale/nb_NO/LC_MESSAGES/laconica.po b/locale/nb_NO/LC_MESSAGES/laconica.po
index b349f7d6b..424cf4da3 100644
--- a/locale/nb_NO/LC_MESSAGES/laconica.po
+++ b/locale/nb_NO/LC_MESSAGES/laconica.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-02-07 22:33+0000\n"
-"Last-Translator: Jimmy Volatile <spam@useful.no>\n"
+"PO-Revision-Date: 2009-04-09 22:44+0000\n"
+"Last-Translator: Charlie Ball <staselig@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
-msgstr ""
+msgstr "%1$s lytter nå til dine notiser på %2$s."
 
 #: ../lib/mail.php:126
 #, php-format
@@ -94,6 +94,12 @@ msgid ""
 "Faithfully yours,\n"
 "%4$s.\n"
 msgstr ""
+"%1$s lytter nå til dine notiser på %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Mvh,\n"
+"%4$s.\n"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
 #: actions/twitapistatuses.php:350
@@ -105,19 +111,19 @@ msgstr ""
 #: actions/shownotice.php:161
 #, php-format
 msgid "%1$s's status on %2$s"
-msgstr ""
+msgstr "%1$s sin status på %2$s"
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
 #, php-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
 #: actions/publicrss.php:90
 #, php-format
 msgid "%s Public Stream"
-msgstr ""
+msgstr "%s Offentlig Strøm"
 
 #: ../actions/all.php:47 ../actions/allrss.php:60
 #: ../actions/twitapistatuses.php:238 ../lib/stream.php:51 actions/all.php:47
@@ -132,7 +138,7 @@ msgstr "%s og venner"
 #: actions/twitapistatuses.php:33
 #, php-format
 msgid "%s public timeline"
-msgstr ""
+msgstr "%s sin offentlige tidslinje"
 
 #: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
 #, php-format
@@ -143,13 +149,13 @@ msgstr "%s status"
 #: actions/twitapistatuses.php:199
 #, php-format
 msgid "%s timeline"
-msgstr ""
+msgstr "%s tidslinje"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
 #: actions/twitapistatuses.php:36
 #, php-format
 msgid "%s updates from everyone!"
-msgstr "%s oppdatering fra alle!"
+msgstr "%s oppdateringer fra alle!"
 
 #: ../actions/register.php:213
 msgid ""
@@ -165,15 +171,17 @@ msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
+"**%%site.name%%** er en mikroblogging-tjeneste av "
+"[%%site.broughtby%%](%%site.broughtbyurl%%). "
 
 #: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
-msgstr ""
+msgstr "**%%site.name%%** er en mikroblogging-tjeneste. "
 
 #: ../lib/util.php:274 lib/util.php:290
 msgid ". Contributors should be attributed by full name or nickname."
-msgstr ""
+msgstr ". Bidragsytere burde være etterfulgt av fullt navn eller brukernavn."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
@@ -181,10 +189,14 @@ msgstr ""
 #: lib/groupeditform.php:139
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
+"1-64 småbokstaver eller nummer, ingen punktum eller mellomrom (ei heller æøå "
+"og lign.)"
 
 #: ../actions/register.php:152 actions/register.php:166
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
+"1-64 småbokstaver eller nummer, ingen punktum eller mellomrom (ei heller æøå "
+"og lign.) Påkrevd."
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
 #: actions/passwordsettings.php:102
@@ -194,7 +206,7 @@ msgstr "6 eller flere tegn"
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
 #: actions/recoverpassword.php:220
 msgid "6 or more characters, and don't forget it!"
-msgstr "6 eller flere tegn. Og ikke glem det, nå!"
+msgstr "6 eller flere tegn. Og ikke glem det!"
 
 #: ../actions/register.php:154 actions/register.php:168
 #: actions/register.php:373
@@ -207,12 +219,16 @@ msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
 "s for sending messages to you."
 msgstr ""
+"En bekreftelseskode ble sendt til lynmeldingsadressen du la til. Du må "
+"godkjenne %s for å sende meldinger til deg."
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
 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 ""
+"En bekreftelseskode ble sendt til lynmeldingsadressen du la til. Sjekk "
+"innboksen din (og søppel-posten!) for koden, og hvordan du skal bruke den."
 
 #: ../actions/smssettings.php:216 actions/smssettings.php:224
 msgid ""
@@ -240,7 +256,7 @@ msgstr ""
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
 #: actions/twitapiusers.php:32
 msgid "API method not found!"
-msgstr ""
+msgstr "API-metode ikke funnet!"
 
 #: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
 #: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
@@ -263,7 +279,7 @@ msgstr ""
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
 #: actions/twitapistatuses.php:562
 msgid "API method under construction."
-msgstr ""
+msgstr "API-metode under utvikling."
 
 #: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
 msgid "About"
@@ -292,7 +308,7 @@ msgstr "Legg til OpenID"
 #: ../lib/settingsaction.php:97 lib/settingsaction.php:91
 #: lib/accountsettingsaction.php:117
 msgid "Add or remove OpenIDs"
-msgstr ""
+msgstr "Legg til eller slett OpenID"
 
 #: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
@@ -304,7 +320,7 @@ msgstr "Adresse"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
 msgid "Addresses of friends to invite (one per line)"
-msgstr ""
+msgstr "Adresser til venner som skal inviteres (én per linje)"
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
 #: actions/showstream.php:422
@@ -321,7 +337,7 @@ msgstr "Alle oppdateringer for %s"
 #: actions/noticesearchrss.php:90
 #, php-format
 msgid "All updates matching search term \"%s\""
-msgstr ""
+msgstr "Alle oppdateringer som passer søket: \"%s\""
 
 #: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
 #: ../actions/openidlogin.php:29 ../actions/register.php:30
@@ -330,16 +346,16 @@ msgstr ""
 #: actions/finishopenidlogin.php:34 actions/login.php:77
 #: actions/openidlogin.php:30 actions/register.php:92
 msgid "Already logged in."
-msgstr "Allerede logget inn."
+msgstr "Allerede innlogget."
 
 #: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
 msgid "Already subscribed!."
-msgstr ""
+msgstr "Allerede abonnert!"
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
 #: actions/deletenotice.php:113
 msgid "Are you sure you want to delete this notice?"
-msgstr ""
+msgstr "Er du sikker på at du vil slette denne notisen?"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 #: actions/userauthorization.php:81
@@ -355,18 +371,18 @@ msgstr ""
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr "Abonner "
+msgstr "Abonner automatisk på de som abonnerer på meg (best for ikke-mennesker)"
 
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
 msgid "Avatar"
-msgstr "Avatar"
+msgstr "Brukerbilde"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395
 msgid "Avatar updated."
-msgstr "Avataren har blitt oppdatert."
+msgstr "Brukerbildet har blitt oppdatert."
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
 #, php-format
@@ -380,6 +396,8 @@ msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
+"Venter på bekreftelse av adressen. Sjekk innboksen din (og søppel-post!) for "
+"melding med videre veiledning."
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
 #: actions/smssettings.php:111
@@ -403,17 +421,17 @@ msgstr "Bio"
 #: actions/profilesettings.php:205 actions/register.php:174
 #: actions/updateprofile.php:107
 msgid "Bio is too long (max 140 chars)."
-msgstr "Bioen er for lang (max 140 tegn)"
+msgstr "Bioen er for lang (maks 140 tegn)."
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
 msgid "Can't delete this notice."
-msgstr ""
+msgstr "Kan ikke slette notisen."
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #: actions/updateprofile.php:123
 #, php-format
 msgid "Can't read avatar URL '%s'"
-msgstr ""
+msgstr "Kan ikke lese brukerbilde URL '%s'"
 
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
@@ -441,7 +459,7 @@ msgstr ""
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
 #: actions/emailsettings.php:311
 msgid "Cannot normalize that email address"
-msgstr ""
+msgstr "Kan ikke normalisere den e-postadressen"
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
 #: actions/passwordsettings.php:110
@@ -451,7 +469,7 @@ msgstr "Endre"
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
 #: lib/accountsettingsaction.php:114
 msgid "Change email handling"
-msgstr ""
+msgstr "Endre e-post håndtering"
 
 #: ../actions/password.php:32 actions/profilesettings.php:36
 #: actions/passwordsettings.php:58
@@ -460,12 +478,12 @@ msgstr "Endre passord"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
 msgid "Change your password"
-msgstr ""
+msgstr "Endre passordet ditt"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
 #: lib/accountsettingsaction.php:105
 msgid "Change your profile settings"
-msgstr ""
+msgstr "Endre profil instillingene dine"
 
 #: ../actions/password.php:43 ../actions/recoverpassword.php:181
 #: ../actions/register.php:155 ../actions/smssettings.php:65
@@ -497,7 +515,7 @@ msgstr "Bekreftelseskode"
 #: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 #: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
-msgstr ""
+msgstr "Bekreftelseskode ikke funnet."
 
 #: ../actions/register.php:202
 #, php-format
@@ -517,6 +535,19 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
+"Gratulerer, %s! Og velkommen til %%%%site.name%%%%. Herfra vil du kanskje...\n"
+"\n"
+"* Gå til [din profil](%s) og sende din første notis.\n"
+"* Legge til en [Jabber/GTalk addresse](%%%%action.imsettings%%%%) så du kan "
+"sende notiser fra lynmeldinger.\n"
+"* [Søke etter brukere](%%%%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."
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
 #: actions/finishopenidlogin.php:119 lib/action.php:330
@@ -526,7 +557,7 @@ msgstr "Koble til"
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
 #: actions/finishopenidlogin.php:114
 msgid "Connect existing account"
-msgstr ""
+msgstr "Koble til eksisterende konto"
 
 #: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
 msgid "Contact"
@@ -557,7 +588,7 @@ msgstr ""
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
 #: actions/updateprofile.php:166
 msgid "Could not save avatar info"
-msgstr "Klarte ikke å lagre avatar-informasjonen"
+msgstr "Klarte ikke å lagre brukerbilde-informasjonen"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
 #: actions/updateprofile.php:159
@@ -575,7 +606,7 @@ msgstr ""
 #: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
 #: actions/recoverpassword.php:111
 msgid "Could not update user with confirmed email address."
-msgstr ""
+msgstr "Klarte ikke å oppdatere bruker med bekreftet e-post."
 
 #: ../actions/finishremotesubscribe.php:99
 #: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
@@ -654,7 +685,7 @@ msgstr "Klarte ikke å oppdatere bruker."
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
 #: actions/finishopenidlogin.php:112
 msgid "Create"
-msgstr ""
+msgstr "Opprett"
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
 #: actions/finishopenidlogin.php:98
@@ -1603,18 +1634,12 @@ msgstr ""
 msgid "OpenID URL"
 msgstr "OpenID-URL"
 
-# -#-#-#-
-#  laconica.po#-#-#-#-
-#  eller autentifikasjon?
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 #: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 #: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
 #, fuzzy
 msgid "OpenID authentication cancelled."
-msgstr ""
-"#-#-#-#-#  laconica.po  #-#-#-#-#\n"
-"OpenID-autentifisering avbrutt.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+msgstr "OpenID-autentifisering avbrutt."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
@@ -4565,7 +4590,7 @@ msgstr ""
 #: lib/mail.php:256
 #, fuzzy, php-format
 msgid "Homepage: %s\n"
-msgstr "Hjemmesiden"
+msgstr "Hjemmesiden: %s\n"
 
 #: lib/mail.php:258
 #, php-format
diff --git a/locale/nl_NL/LC_MESSAGES/laconica.mo b/locale/nl_NL/LC_MESSAGES/laconica.mo
index 564d6f709..270e81b7c 100644
--- a/locale/nl_NL/LC_MESSAGES/laconica.mo
+++ b/locale/nl_NL/LC_MESSAGES/laconica.mo
diff --git a/locale/nl_NL/LC_MESSAGES/laconica.po b/locale/nl_NL/LC_MESSAGES/laconica.po
index 48ee3dd9a..6f2eed6ab 100644
--- a/locale/nl_NL/LC_MESSAGES/laconica.po
+++ b/locale/nl_NL/LC_MESSAGES/laconica.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-01-22 15:48+0000\n"
-"Last-Translator: chris <chris@chrisvandesteeg.nl>\n"
+"PO-Revision-Date: 2009-07-11 00:23+0000\n"
+"Last-Translator: Ben van Es van Conkelenberghe <ben@ikhier.be>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -77,11 +77,37 @@ msgid ""
 "\n"
 "Sincerely, %2$s\n"
 msgstr ""
+"%1$s heeft je uitgenodigd voor %2$s (%3$s).\n"
+"\n"
+"%2$s is een micro-blog service waarmee je mensen op de hoogte kunt houden "
+"van wat jou interesseerd en bezig houdt.\n"
+"\n"
+"Je kunt ook nieuws over jezelf of jouw hersenspinsels met anderen delen. Het "
+"is ook de ideale plek om mensen te ontmoeten met dezelfde interesses als "
+"jij.\n"
+"\n"
+"%1$s zei:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Je kunt %1$s's profiel pagina op %2$s hier bekijken:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Als je het wilt proberen, klik dan op de link hieronder om de uitnodiging te "
+"accepteren.\n"
+"\n"
+"%6$s\n"
+"\n"
+"Als je geen interesse hebt, kun je dit bericht gewoon negeren. Bedankt voor "
+"je geduld.\n"
+"\n"
+"Met vriendelijke groet, %2$s\n"
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s volgt nu je berichten op %2$s."
+msgstr "%1$s volgt nu je berichten %2$s."
 
 #: ../lib/mail.php:126
 #, php-format
@@ -104,7 +130,7 @@ msgstr ""
 #: actions/twitapistatuses.php:350
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
+msgstr "%1$s updates die een reactie zijn op updates van %2$s / %3$s."
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
 #: actions/shownotice.php:161
@@ -116,16 +142,13 @@ msgstr "%1$s's status op %2$s"
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
 #, php-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
 #: actions/publicrss.php:90
-#, fuzzy, php-format
+#, php-format
 msgid "%s Public Stream"
-msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"%s openbare stroom\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+msgstr "%s rss"
 
 #: ../actions/all.php:47 ../actions/allrss.php:60
 #: ../actions/twitapistatuses.php:238 ../lib/stream.php:51 actions/all.php:47
@@ -145,7 +168,7 @@ msgstr ""
 #: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
 #, php-format
 msgid "%s status"
-msgstr ""
+msgstr "%s status"
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
 #: actions/twitapistatuses.php:199
@@ -157,13 +180,15 @@ msgstr ""
 #: actions/twitapistatuses.php:36
 #, php-format
 msgid "%s updates from everyone!"
-msgstr ""
+msgstr "%s updates van iedereen"
 
 #: ../actions/register.php:213
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr ""
+"(U ontvangt een bericht per e-mail  met instructies over: hoe te bevestigen "
+"dat uw e-mailadres.)"
 
 #: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
 #, php-format
@@ -194,7 +219,7 @@ msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties"
 
 #: ../actions/register.php:152 actions/register.php:166
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
+msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties. Verplicht."
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
 #: actions/passwordsettings.php:102
@@ -209,7 +234,7 @@ msgstr "6 of meer tekens, en vergeet het niet!"
 #: ../actions/register.php:154 actions/register.php:168
 #: actions/register.php:373
 msgid "6 or more characters. Required."
-msgstr ""
+msgstr "6 of meer tekens. Verplicht"
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, php-format
@@ -218,19 +243,25 @@ msgid ""
 "s for sending messages to you."
 msgstr ""
 "Een bevestigingscode is verstuurd naar het opgegeven IM-adres. Je moet ermee "
-"accoord gaan dat %s boodschappen aan jou stuurt."
+"akkoord gaan dat %s boodschappen aan jou stuurt."
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
 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 ""
+"Een bevestigingscode is verzonden naar het e-mailadres dat u hebt "
+"toegevoegd. Controleer uw inbox (en spam box!) Voor de code en instructies "
+"hoe het te gebruiken."
 
 #: ../actions/smssettings.php:216 actions/smssettings.php:224
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your inbox "
 "(and spam box!) for the code and instructions on how to use it."
 msgstr ""
+"Een bevestigingscode is verzonden naar het telefoonnummer dat u hebt "
+"toegevoegd. Controleer uw inbox (en spam box!) Voor de code en instructies "
+"hoe het te gebruiken."
 
 #: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
 #: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
@@ -252,7 +283,7 @@ msgstr ""
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
 #: actions/twitapiusers.php:32
 msgid "API method not found!"
-msgstr ""
+msgstr "API functie niet gevonden"
 
 #: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
 #: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
@@ -275,12 +306,12 @@ msgstr ""
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
 #: actions/twitapistatuses.php:562
 msgid "API method under construction."
-msgstr ""
+msgstr "API functie in bewerking"
 
 #  This would be appropriate for the footer menu link (actual context isn't clear!)
 #: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
 msgid "About"
-msgstr "Over ons"
+msgstr "Over"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
 #: actions/userauthorization.php:143
@@ -305,7 +336,7 @@ msgstr "Voeg OpenID toe"
 #: ../lib/settingsaction.php:97 lib/settingsaction.php:91
 #: lib/accountsettingsaction.php:117
 msgid "Add or remove OpenIDs"
-msgstr ""
+msgstr "Toevoegen en verwijderen van je OpenIDs"
 
 #: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
@@ -317,7 +348,7 @@ msgstr "Adres"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
 msgid "Addresses of friends to invite (one per line)"
-msgstr ""
+msgstr "Adressen van je vrienden om uit te nodigen (1 per regel)"
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
 #: actions/showstream.php:422
@@ -352,7 +383,7 @@ msgstr "Al geabonneerd!"
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
 #: actions/deletenotice.php:113
 msgid "Are you sure you want to delete this notice?"
-msgstr ""
+msgstr "Weet u zeker dat u  deze aankondiging wilt verwijderen?"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 #: actions/userauthorization.php:81
@@ -368,6 +399,7 @@ msgstr "Voortaan automatisch inloggen; niet voor gemeenschappelijke computers!"
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
+"Automatisch een abonnement op wie abonneerd op mij (beste voor niet-mensen)"
 
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
@@ -395,14 +427,15 @@ msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
+"Wacht op bevestiging van dit adres. Controleer je mailbox en ook je spambox "
+"voor een bericht met verdere instructies. "
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
 #: actions/smssettings.php:111
 msgid "Awaiting confirmation on this phone number."
-msgstr ""
+msgstr "Afwachtend op bevestiging van dit telefoonnummer"
 
 #: ../lib/util.php:1318 lib/util.php:1452
-#, fuzzy
 msgid "Before »"
 msgstr "Eerder »"
 
@@ -422,7 +455,7 @@ msgstr "Biografie is te lang (maximaal 140 tekens)"
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
 msgid "Can't delete this notice."
-msgstr ""
+msgstr "Kan dit bericht niet verwijderen."
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #: actions/updateprofile.php:123
@@ -456,7 +489,7 @@ msgstr "Kan die Jabber-ID niet normaliseren"
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
 #: actions/emailsettings.php:311
 msgid "Cannot normalize that email address"
-msgstr ""
+msgstr "Kan het emailadres niet normaliseren"
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
 #: actions/passwordsettings.php:110
@@ -466,7 +499,7 @@ msgstr "Wijzig"
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
 #: lib/accountsettingsaction.php:114
 msgid "Change email handling"
-msgstr ""
+msgstr "Wijzigen e-mail afhandeling"
 
 #: ../actions/password.php:32 actions/profilesettings.php:36
 #: actions/passwordsettings.php:58
@@ -475,12 +508,12 @@ msgstr "Wijzig wachtwoord"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
 msgid "Change your password"
-msgstr ""
+msgstr "Wijzig jouw wachtwoord"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
 #: lib/accountsettingsaction.php:105
 msgid "Change your profile settings"
-msgstr ""
+msgstr "Wijzig jouw profiel gegevens"
 
 #: ../actions/password.php:43 ../actions/recoverpassword.php:181
 #: ../actions/register.php:155 ../actions/smssettings.php:65
@@ -507,7 +540,7 @@ msgstr "Bevestiging geannuleerd."
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
 #: actions/smssettings.php:118
 msgid "Confirmation code"
-msgstr ""
+msgstr "Bevestigingscode"
 
 #: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 #: actions/confirmaddress.php:80
@@ -532,6 +565,21 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
+"Gefeliciteerd, %s! Welkom op de site:  %%%%site.name%%%%. Vanaf hier je zult "
+"misschien....\n"
+"\n"
+"* Naar je [profiel](%s) gaan en je eerste bericht posten.\n"
+"* een adres [Jabber/GTalk](%%%%action.imsettings%%%%) toevoegen zodat je "
+"vandaaruit berichten kan verzenden.\n"
+"* [Op zoek naar mensen](%%%%action.peoplesearch%%%%) die je misschien kent "
+"en / of dezelfde interesse hebben of uit dezelfde plaats komen. \n"
+"* Bijwerken van [je profiel](%%%%action.profilesettings%%%%) om andere meer "
+"van jezelf te vertellen en een leuke foto te uploaden. \n"
+"* Lees ook even de [online documenten](%%%%doc.help%%%%) met alle "
+"mogelijkheden en hulp \n"
+"\n"
+"Dank je wel voor het inschrijven op onze site en we hoen dat je een hele "
+"leuke tijd hebt met deze service."
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
 #: actions/finishopenidlogin.php:119 lib/action.php:330
@@ -550,52 +598,56 @@ msgstr "Contact"
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
 #, php-format
 msgid "Could not create OpenID form: %s"
-msgstr ""
+msgstr "Kan geen OpenID aanmaken van: %s"
 
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
 #, php-format
 msgid "Could not follow user: %s is already on your list."
-msgstr ""
+msgstr "je kan deze persoon %s niet volgen omdat deze al je vriend is"
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
 #: actions/twitapifriendships.php:41
 msgid "Could not follow user: User not found."
-msgstr ""
+msgstr "Je kan de gebruiker niet volgen, we hebben deze gebruiker niet gevonden"
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
 #, php-format
 msgid "Could not redirect to server: %s"
-msgstr "Kon niet omleiden naar server: %s"
+msgstr "Kon niet omleiden naar service: %s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
 #: actions/updateprofile.php:166
 msgid "Could not save avatar info"
-msgstr "Kon avatarinformatie niet opslaan"
+msgstr "Kon avatar informatie niet opslaan"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
 #: actions/updateprofile.php:159
 msgid "Could not save new profile info"
-msgstr "Kon de nieuwe profielinformatie niet opslaan"
+msgstr "Kon de nieuwe profiel informatie niet opslaan"
 
 #: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
 msgid "Could not subscribe other to you."
-msgstr ""
+msgstr "Kan geen abonnee toewijzen aan je"
 
 #: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
 msgid "Could not subscribe."
-msgstr ""
+msgstr "Kan niet abonneren "
 
 #: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
 #: actions/recoverpassword.php:111
 msgid "Could not update user with confirmed email address."
-msgstr ""
+msgstr "Kan de gebruiker niet aan het bevestigde mailadres bijwerken"
 
+# tokens zou vervangen moeten worden dus
+# tokens need to be replaced
 #: ../actions/finishremotesubscribe.php:99
 #: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
+#, fuzzy
 msgid "Couldn't convert request tokens to access tokens."
 msgstr ""
+"Kan niet converteren verzoek om tokens om toegang te krijgen tot de tokens"
 
 #: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
 #: ../actions/imsettings.php:218 ../actions/smssettings.php:241
@@ -613,12 +665,14 @@ msgstr "Kon abonnement niet verwijderen."
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
 #: actions/twitapistatuses.php:84
 msgid "Couldn't find any statuses."
-msgstr ""
+msgstr "Kan geen ene status vinden"
 
+# Token need to be replaced
 #: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
 #: actions/remotesubscribe.php:178
+#, fuzzy
 msgid "Couldn't get a request token."
-msgstr ""
+msgstr "Kan geen verzoek om token krijgen"
 
 #: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
 #: ../actions/smssettings.php:206 actions/emailsettings.php:223
@@ -642,13 +696,13 @@ msgstr "Kon profiel niet opslaan."
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
 #: actions/profilesettings.php:279
 msgid "Couldn't update user for autosubscribe."
-msgstr ""
+msgstr "kan de automatische inschrijving niet verwerken"
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
 #: actions/emailsettings.php:440 actions/emailsettings.php:462
 msgid "Couldn't update user record."
-msgstr ""
+msgstr "Kan de gebruikersgegevens niet vernieuwen"
 
 #: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
 #: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
@@ -696,12 +750,12 @@ msgstr "Huidig bevestigd Jabber/GTalk adres."
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
 #: actions/smssettings.php:100
 msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
+msgstr "Huidig bevestigd SMS-ingevoerd telefoonnummer."
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
 #: actions/emailsettings.php:99
 msgid "Current confirmed email address."
-msgstr ""
+msgstr "Huidig bevestigd emailadres"
 
 #: ../actions/showstream.php:356 actions/showstream.php:367
 msgid "Currently"
@@ -710,7 +764,7 @@ msgstr "Op dit moment"
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
 #, php-format
 msgid "DB error inserting hashtag: %s"
-msgstr ""
+msgstr "Database fout van de invoer hashtag: %s"
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
 #, php-format
@@ -720,7 +774,7 @@ msgstr "Database-fout bij toevoegen antwoord: %s"
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
 #: actions/deletenotice.php:79
 msgid "Delete notice"
-msgstr ""
+msgstr "Verwijderd bericht"
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
@@ -738,12 +792,12 @@ msgstr "E-mail"
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
 #: actions/emailsettings.php:115
 msgid "Email Address"
-msgstr ""
+msgstr "Email adres"
 
 #: ../actions/emailsettings.php:32 actions/emailsettings.php:32
 #: actions/emailsettings.php:60
 msgid "Email Settings"
-msgstr ""
+msgstr "Email instellingen"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
 msgid "Email address already exists."
@@ -756,11 +810,11 @@ msgstr "Bevestiging e-mailadres"
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
 #: actions/emailsettings.php:117
 msgid "Email address, like \"UserName@example.org\""
-msgstr ""
+msgstr "Email adres, zoals \"gebruikersnaam@voorbeeld.net\""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
 msgid "Email addresses"
-msgstr ""
+msgstr "Email adressen"
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 #: actions/recoverpassword.php:231
@@ -770,7 +824,7 @@ msgstr "Voer een gebruikersnaam of e-mailadres in"
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
 #: actions/smssettings.php:119
 msgid "Enter the code you received on your phone."
-msgstr ""
+msgstr "Voer de code in die je kreeg via je telefoon"
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 #: actions/userauthorization.php:161
@@ -830,12 +884,8 @@ msgstr "Fout bij opslaan gebruiker; ongeldig."
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
-#, fuzzy
 msgid "Error setting user."
-msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"Fout bij vastleggen gebruiker.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+msgstr "Fout bij instellingen gebruiker."
 
 #: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
 #: actions/finishaddopenid.php:131
@@ -882,17 +932,17 @@ msgstr "Feed voor antwoorden aan %s"
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
 #, php-format
 msgid "Feed for tag %s"
-msgstr ""
+msgstr "Feed voor tag %s"
 
 #: ../lib/searchaction.php:105 lib/searchaction.php:105
 #: lib/searchgroupnav.php:83
 msgid "Find content of notices"
-msgstr ""
+msgstr "Vind de inhoud van een bericht"
 
 #: ../lib/searchaction.php:101 lib/searchaction.php:101
 #: lib/searchgroupnav.php:81
 msgid "Find people on this site"
-msgstr ""
+msgstr "Vind mensen op deze site"
 
 #: ../actions/login.php:122
 msgid ""
@@ -945,12 +995,12 @@ msgstr "Homepage is geen geldige URL"
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
 #: actions/emailsettings.php:173
 msgid "I want to post notices by email."
-msgstr ""
+msgstr "Ik wil een bericht posten per email"
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
 #: lib/connectsettingsaction.php:104
 msgid "IM"
-msgstr ""
+msgstr "IM"
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
 #: actions/imsettings.php:118
@@ -984,17 +1034,19 @@ msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
 msgstr ""
+"Als je je paswoord vergeten of verloren bent, kan je hier een nieuwe "
+"aanvragen naar het mailadres dat bij ons _ _ opgeslagen is in je account."
 
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
 msgid "Incoming email"
-msgstr ""
+msgstr "Binnenkomende mail"
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
 #: actions/emailsettings.php:443
 msgid "Incoming email address removed."
-msgstr ""
+msgstr "Binnenkomende mailadres is verwijderd"
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
 #: actions/passwordsettings.php:153
@@ -1023,7 +1075,7 @@ msgstr "Ongeldige avatar-URL '%s'"
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
 #, php-format
 msgid "Invalid email address: %s"
-msgstr ""
+msgstr "Ongeldig Email adres: %s"
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #: actions/updateprofile.php:102
@@ -1083,20 +1135,20 @@ msgstr "Ongeldige gebruikersnaam of wachtwoord."
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
 msgid "Invitation(s) sent"
-msgstr ""
+msgstr "Uitnodiging(en) verzonden"
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
 msgid "Invitation(s) sent to the following people:"
-msgstr ""
+msgstr "Uitnodiging(en) verzonden an de volgende mensen:"
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
 #: lib/subgroupnav.php:103
 msgid "Invite"
-msgstr ""
+msgstr "Uitnodigen"
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
 msgid "Invite new users"
-msgstr ""
+msgstr "Nodig nieuwe gebruikers uit"
 
 #: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
 #, php-format
@@ -1105,9 +1157,9 @@ msgid ""
 "s, available under the [GNU Affero General Public License](http://www.fsf."
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
-"Het draait op de [Laconica](http://laconi.ca/) microbloggingsoftware versie %"
-"s, beschikbaar onder the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
+"Het draait op de [Laconica](http://laconi.ca/) microbloggingsoftware versie "
+"%s, beschikbaar onder de [GNU Affero General Public "
+"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
 #: actions/imsettings.php:296
@@ -1126,12 +1178,12 @@ msgstr ""
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
 #: actions/profilesettings.php:128
 msgid "Language"
-msgstr ""
+msgstr "Taal"
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
 #: actions/profilesettings.php:217
 msgid "Language is too long (max 50 chars)."
-msgstr ""
+msgstr "Taal is te lang (max 50 karaketers)"
 
 #: ../actions/profilesettings.php:52 ../actions/register.php:173
 #: actions/profilesettings.php:85 actions/register.php:187
@@ -1185,7 +1237,7 @@ msgstr "Uitloggen"
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393
 msgid "Longer name, preferably your \"real\" name"
-msgstr ""
+msgstr "Langere naam, mogelijk je \"eigen\" naam"
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
 #: lib/facebookaction.php:320
@@ -1195,13 +1247,13 @@ msgstr "Wachtwoord kwijt of vergeten?"
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
 msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
+msgstr "Maak een nieuw emailadres aan voor te posten naar; verwijder de oude."
 
 #: ../actions/emailsettings.php:27 actions/emailsettings.php:27
 #: actions/emailsettings.php:71
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
-msgstr ""
+msgstr "Geef hier aan hoe je de notificaties wilt van %%site.name%%."
 
 #  String should contain a variable token for since 'when'
 #: ../actions/showstream.php:300 actions/showstream.php:315
@@ -1220,28 +1272,31 @@ 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 ""
+"Je provider van je mobiel. Als je weet welke provider je SMS over MAIL kan "
+"verzorgen en niet in de lijst staat kan je een verzoek bij ons doen, liefst "
+"met de gegevens erbij.  laat ons per mail iets weten %s."
 
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
 msgid "My text and files are available under "
-msgstr "Mijn tekst en bestanden zijn beschikbaar onder"
+msgstr "Mijn tekst en bestanden zijn beschikbaar onder_"
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
 msgid "New"
-msgstr ""
+msgstr "Nieuw"
 
 #: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
 #, php-format
 msgid "New email address for posting to %s"
-msgstr ""
+msgstr "Nieuw email adres om te posten aan %s"
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
 #: actions/emailsettings.php:465
 msgid "New incoming email address added."
-msgstr ""
+msgstr "Nieuw binnenkomende emailadres is toegevoegd"
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
 #: actions/finishopenidlogin.php:99
@@ -1311,7 +1366,7 @@ msgstr "Gebruikersnaam of e-mail"
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
 msgid "No"
-msgstr ""
+msgstr "Nee"
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
 #: actions/imsettings.php:279
@@ -1321,17 +1376,17 @@ msgstr "Geen Jabber-ID."
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
 #: actions/userauthorization.php:153
 msgid "No authorization request!"
-msgstr "Geen autorisatieverzoek!"
+msgstr "Geen autorisatie verzoek!"
 
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
 #: actions/smssettings.php:299
 msgid "No carrier selected."
-msgstr ""
+msgstr "Geen provider geselecteerd"
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
 #: actions/smssettings.php:486
 msgid "No code entered"
-msgstr ""
+msgstr "Geen code ingevuld"
 
 #: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 #: actions/confirmaddress.php:75
@@ -1347,7 +1402,7 @@ msgstr "Geen inhoud!"
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
 #: actions/emailsettings.php:304
 msgid "No email address."
-msgstr ""
+msgstr "Geen emailadres"
 
 #: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
 msgid "No id."
@@ -1356,7 +1411,7 @@ msgstr "Geen ID."
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
 #: actions/emailsettings.php:430
 msgid "No incoming email address."
-msgstr ""
+msgstr "Geen binnenkomende emailadres"
 
 #: ../actions/finishremotesubscribe.php:65
 #: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
@@ -1379,7 +1434,7 @@ msgstr "Geen bevestiging in behandeling om te annuleren."
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
 #: actions/smssettings.php:294
 msgid "No phone number."
-msgstr ""
+msgstr "Geen telefoonnummer"
 
 #: ../actions/finishremotesubscribe.php:72
 #: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
@@ -1401,7 +1456,7 @@ msgstr "Geen verzoek gevonden!"
 #: actions/groupsearch.php:81 actions/noticesearch.php:104
 #: actions/peoplesearch.php:85
 msgid "No results"
-msgstr ""
+msgstr "Geen resultaten"
 
 #: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
 #: actions/avatarbynickname.php:64
@@ -1412,12 +1467,12 @@ msgstr "Geen afmeting."
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
 #: actions/twitapistatuses.php:446
 msgid "No status found with that ID."
-msgstr ""
+msgstr "Geen status gevonden met dit ID"
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
 #: actions/twitapistatuses.php:418
 msgid "No status with that ID found."
-msgstr ""
+msgstr "Geen status gevonden met dat ID"
 
 #: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 #: actions/openidsettings.php:222
@@ -1476,7 +1531,7 @@ msgstr "Onbekende gebruiker."
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
 #: actions/recoverpassword.php:251
 msgid "No user with that email address or username."
-msgstr ""
+msgstr "Geen gebruiker met dit emailadres of gebruikersnaam"
 
 #: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
@@ -1490,14 +1545,14 @@ msgstr "Geen geldige herstelcode."
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
 #: scripts/maildaemon.php:53
 msgid "Not a registered user."
-msgstr ""
+msgstr "Geen geregistreerde gebruiker"
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
 #: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
 #: lib/twitterapi.php:566
 msgid "Not a supported data format."
-msgstr ""
+msgstr "Geen juiste ingevulde gegevens"
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
 #: actions/imsettings.php:290
@@ -1511,7 +1566,7 @@ msgstr "Geen geldige OpenID."
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
 #: actions/emailsettings.php:315
 msgid "Not a valid email address"
-msgstr ""
+msgstr "Geen geldig e-mailadres."
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
 msgid "Not a valid email address."
@@ -1557,7 +1612,7 @@ msgstr "Onverwacht antwoord!"
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309
 msgid "Not found"
-msgstr ""
+msgstr "Niet gevonden"
 
 #: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
 #: ../actions/newnotice.php:29 ../actions/subscribe.php:28
@@ -1582,7 +1637,7 @@ msgstr "Niet geabonneerd!"
 #: ../actions/opensearch.php:35 actions/opensearch.php:35
 #: actions/opensearch.php:67
 msgid "Notice Search"
-msgstr ""
+msgstr "Bericht zoeken"
 
 #: ../actions/showstream.php:82 actions/showstream.php:82
 #: actions/showstream.php:180 actions/showstream.php:187
@@ -1606,7 +1661,7 @@ msgstr "Berichten"
 #: actions/tag.php:81 actions/tag.php:41
 #, php-format
 msgid "Notices tagged with %s"
-msgstr ""
+msgstr "Berichten tagged met %s"
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
 #: actions/passwordsettings.php:97
@@ -1626,7 +1681,7 @@ msgstr "OpenID-account instellen"
 
 #: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
 msgid "OpenID Auto-Submit"
-msgstr ""
+msgstr "OpenID automatisch verzenden"
 
 #: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
@@ -1671,12 +1726,12 @@ msgstr "OpenID-instellingen."
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
 msgid "Optionally add a personal message to the invitation."
-msgstr ""
+msgstr "Eventueel een persoonlijke boodschap aan de uitnodiging"
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
 #: lib/imagefile.php:75
 msgid "Partial upload."
-msgstr "Onvolledige upload."
+msgstr "Gedeeltelijke uploaden."
 
 #: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
 #: ../actions/register.php:153 ../lib/settingsaction.php:93
@@ -1718,17 +1773,17 @@ msgstr "Wachtwoorden komen niet overeen."
 #: ../lib/searchaction.php:100 lib/searchaction.php:100
 #: lib/searchgroupnav.php:80
 msgid "People"
-msgstr ""
+msgstr "Mensen"
 
 #: ../actions/opensearch.php:33 actions/opensearch.php:33
 #: actions/opensearch.php:64
 msgid "People Search"
-msgstr ""
+msgstr "Mensen zoeken"
 
 #: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
 #: actions/peoplesearch.php:58
 msgid "People search"
-msgstr "Personen zoeken"
+msgstr "Mensen zoeken"
 
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
 msgid "Personal"
@@ -1736,11 +1791,11 @@ msgstr "Persoonlijk"
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
 msgid "Personal message"
-msgstr ""
+msgstr "Persoonlijk bericht"
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
 msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
+msgstr "Telefoonnummer, geen spaties of leestekens, met netnummer"
 
 #: ../actions/userauthorization.php:78
 msgid ""
@@ -1778,7 +1833,7 @@ msgstr "Voorkeuren opgeslagen."
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
 #: actions/profilesettings.php:129
 msgid "Preferred language"
-msgstr ""
+msgstr "Taal voorkeur"
 
 #: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
 msgid "Privacy"
@@ -1813,7 +1868,7 @@ msgstr "Profiel onbekend"
 
 #: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
 msgid "Public Stream Feed"
-msgstr "Openbare stream-feed"
+msgstr "Openbare feed"
 
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
 #: lib/publicgroupnav.php:77
@@ -1823,17 +1878,17 @@ msgstr "Openbare tijdlijn"
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
 #: actions/imsettings.php:153
 msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
+msgstr "Publiceer een MicroID voor mijn Jabber / GTalk adres"
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
 #: actions/emailsettings.php:178
 msgid "Publish a MicroID for my email address."
-msgstr ""
+msgstr "Publiceer een MicroID voor mijn email adres"
 
 #: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
 #: actions/tag.php:76
 msgid "Recent Tags"
-msgstr ""
+msgstr "Recent Tags"
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
 #: actions/recoverpassword.php:190
@@ -1860,12 +1915,12 @@ msgstr "Registreer"
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
 msgid "Registration not allowed."
-msgstr ""
+msgstr "Registratie niet toegestaan"
 
 #: ../actions/register.php:200 actions/register.php:214
 #: actions/register.php:67
 msgid "Registration successful"
-msgstr ""
+msgstr "Registratie gelukt"
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
 #: actions/userauthorization.php:144
@@ -1929,31 +1984,31 @@ msgstr "Antwoorden aan %s"
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
 #: actions/recoverpassword.php:223
 msgid "Reset"
-msgstr "Terugstellen"
+msgstr "Herstellen"
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
 #: actions/recoverpassword.php:197
 msgid "Reset password"
-msgstr "Wachtwoord terugstellen"
+msgstr "Wachtwoord herstellen"
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
 msgid "SMS"
-msgstr ""
+msgstr "SMS"
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
 #: actions/smssettings.php:126
 msgid "SMS Phone number"
-msgstr ""
+msgstr "SMS telefoonnummer"
 
 #: ../actions/smssettings.php:33 actions/smssettings.php:33
 #: actions/smssettings.php:58
 msgid "SMS Settings"
-msgstr ""
+msgstr "SMS instellingen"
 
 #: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
 msgid "SMS confirmation"
-msgstr ""
+msgstr "SMS bevestiging"
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
 #: actions/recoverpassword.php:222
@@ -1963,7 +2018,7 @@ msgstr "Gelijk aan wachtwoord hierboven"
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377
 msgid "Same as password above. Required."
-msgstr ""
+msgstr "Gelijk aan wachtwoord hierboven. verplicht"
 
 #: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
 #: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
@@ -1986,7 +2041,7 @@ msgstr "Zoeken"
 #: ../actions/noticesearch.php:80 actions/noticesearch.php:85
 #: actions/noticesearch.php:127
 msgid "Search Stream Feed"
-msgstr "Doorzoek stroom-feed"
+msgstr "Doorzoek feed"
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
 #: actions/noticesearch.php:57
@@ -2011,7 +2066,7 @@ msgstr ""
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
 #: actions/smssettings.php:457
 msgid "Select a carrier"
-msgstr ""
+msgstr "Selecteer een provider"
 
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
@@ -2023,12 +2078,12 @@ msgstr "Verstuur"
 #: actions/emailsettings.php:74 actions/smssettings.php:82
 #: actions/emailsettings.php:132 actions/smssettings.php:145
 msgid "Send email to this address to post new notices."
-msgstr ""
+msgstr "Stuur een email naar dit adres om een nieuw bericht te posten"
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
 #: actions/emailsettings.php:152
 msgid "Send me notices of new subscriptions through email."
-msgstr ""
+msgstr "Stuur mij een bericht van nieuwe abonnees via een email"
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
 #: actions/imsettings.php:137
@@ -2040,10 +2095,14 @@ msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
+"Stuur me aankondigingen via sms, maar ik begrijp dat ik kosten van mijn "
+"provider kan hebben."
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
+"Stuur me antwoorden via Jabber / GTalk van mensen op wie ik niet geabonneerd "
+"ben."
 
 #: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
 msgid "Settings"
@@ -2056,7 +2115,7 @@ msgstr "Instellingen opgeslagen."
 
 #: ../actions/tag.php:60 actions/tag.php:60
 msgid "Showing most popular tags from the last week"
-msgstr ""
+msgstr "De meest populaire tags van de afgelopen week"
 
 #: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 #: actions/finishaddopenid.php:114
@@ -2072,16 +2131,16 @@ msgstr "Er is iets eigenaardigs gebeurd."
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
 #: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
-msgstr ""
+msgstr "Sorry, inkomende mail is niet toegestaan"
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
 #: scripts/maildaemon.php:57
 msgid "Sorry, that is not your incoming email address."
-msgstr ""
+msgstr "Sorry, dit adres is niet een juist mailadres van je."
 
 #: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
 msgid "Source"
-msgstr ""
+msgstr "Bron"
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
 #: actions/showstream.php:476
@@ -2137,11 +2196,11 @@ msgstr "Systeemfout bij uploaden bestand."
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
 #: lib/profilelist.php:164
 msgid "Tags"
-msgstr ""
+msgstr "Tags"
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
 msgid "Text"
-msgstr ""
+msgstr "Tekst"
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
 #: actions/noticesearch.php:67
@@ -2156,7 +2215,7 @@ msgstr "Die OpenID is niet van jou."
 #: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
 #: actions/confirmaddress.php:94
 msgid "That address has already been confirmed."
-msgstr "Dat adres is al bevestigd."
+msgstr "Dit adres is al bevestigd."
 
 #: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
 #: actions/confirmaddress.php:85
@@ -2165,7 +2224,7 @@ msgstr "Die bevestigingscode is niet voor jou!"
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
 msgid "That email address already belongs to another user."
-msgstr ""
+msgstr "Dit Emailadres is al geregistreerd door iemand anders"
 
 #: ../actions/avatar.php:80 actions/profilesettings.php:317
 #: lib/imagefile.php:71
@@ -2180,12 +2239,12 @@ msgstr "Dat is al je Jabber-ID."
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
 #: actions/emailsettings.php:318
 msgid "That is already your email address."
-msgstr ""
+msgstr "Dit is al je mailadres."
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
 #: actions/smssettings.php:306
 msgid "That is already your phone number."
-msgstr ""
+msgstr "Dit is al je telefoonnummer"
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
 #: actions/imsettings.php:381
@@ -2195,12 +2254,12 @@ msgstr "Dat is niet je Jabber-ID."
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
 #: actions/emailsettings.php:397
 msgid "That is not your email address."
-msgstr ""
+msgstr "Dit is niet je emailadres"
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
 #: actions/smssettings.php:393
 msgid "That is not your phone number."
-msgstr ""
+msgstr "Dit is niet je telefoonnummer"
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
@@ -2211,23 +2270,23 @@ msgstr "Dat is het verkeerde IM-adres."
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
 #: actions/smssettings.php:362
 msgid "That is the wrong confirmation number."
-msgstr ""
+msgstr "Dit is het verkeerde bevestigings code/nummer"
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
 #: actions/smssettings.php:309
 msgid "That phone number already belongs to another user."
-msgstr ""
+msgstr "Dit telefoonnummer is al in gebruik door iemand"
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
 #: actions/facebookhome.php:243 actions/twitapistatuses.php:276
 msgid "That's too long. Max notice size is 140 chars."
-msgstr "Dat is te lang. Maximale berichtlengte is 140 tekens."
+msgstr "Dat is te lang. Maximale bericht lengte is 140 tekens."
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
 #: actions/twitapiaccount.php:62
 msgid "That's too long. Max notice size is 255 chars."
-msgstr ""
+msgstr "Dat is te lang. Maximale bericht lengte is 255 tekens."
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
@@ -2284,6 +2343,8 @@ msgstr "Dit zijn de mensen van wie jij de berichten volgt."
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
+"Deze mensen zijn al geregistreerd en jij kan je automatisch bij hun "
+"abonneren: "
 
 #: ../actions/recoverpassword.php:88
 msgid "This confirmation code is too old. Please start again."
@@ -2314,7 +2375,7 @@ msgstr ""
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
 msgid "This method requires a POST or DELETE."
-msgstr ""
+msgstr "Dit vraagt om te posten of te verwijderen"
 
 #: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
 #: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
@@ -2323,7 +2384,7 @@ msgstr ""
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
 #: actions/twitapistatuses.php:244
 msgid "This method requires a POST."
-msgstr ""
+msgstr "Je moet hier dus posten"
 
 #: ../lib/util.php:164 lib/util.php:246
 msgid "This page is not available in a media type you accept"
@@ -2332,12 +2393,12 @@ msgstr "Deze pagina is niet beschikbaar in een mediatype dat jij accepteert"
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
 #: actions/profilesettings.php:138
 msgid "Timezone"
-msgstr ""
+msgstr "Tijdzone"
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
 #: actions/profilesettings.php:211
 msgid "Timezone not selected."
-msgstr ""
+msgstr "Tijdzone niet geselecteerd"
 
 #: ../actions/remotesubscribe.php:43
 #, php-format
@@ -2354,7 +2415,7 @@ msgstr ""
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132
 msgid "Two user ids or screen_names must be supplied."
-msgstr ""
+msgstr "Twee gebruikers ID of namen moeten worden gegeven"
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
@@ -2385,7 +2446,7 @@ msgstr "Wachtwoord onverwacht teruggesteld."
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
 msgid "Unknown action"
-msgstr ""
+msgstr "Onbekende aktie"
 
 #: ../actions/finishremotesubscribe.php:58
 #: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
@@ -2398,13 +2459,13 @@ msgid ""
 "contributors and available under the "
 msgstr ""
 "Tenzij anders gespecificeerd valt de inhoud van deze site onder het "
-"copyright van de auteurs en is beschikbaar onder de"
+"copyright van de auteurs en is beschikbaar onder de_"
 
 #: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
 #: actions/confirmaddress.php:90
 #, php-format
 msgid "Unrecognized address type %s"
-msgstr ""
+msgstr "Onherkenbaar adrestype %s"
 
 #: ../actions/showstream.php:209 actions/showstream.php:219
 #: lib/unsubscribeform.php:137
@@ -2425,24 +2486,24 @@ msgstr "Niet ondersteund beeldbestandsformaat."
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
 #: lib/connectsettingsaction.php:108
 msgid "Updates by SMS"
-msgstr ""
+msgstr "Bijwerkingen door SMS"
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
 #: lib/connectsettingsaction.php:105
 msgid "Updates by instant messenger (IM)"
-msgstr ""
+msgstr "Bijwerkingen door de messenger (IM)"
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
 #: actions/twitapistatuses.php:129
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
+msgstr "Bijwerkingen van %1$s en vrienden op %2$s!"
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
 #: actions/twitapistatuses.php:202
 #, php-format
 msgid "Updates from %1$s on %2$s!"
-msgstr ""
+msgstr "Bijwerkingen van %1$s op %2$s!"
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
@@ -2463,12 +2524,14 @@ msgstr ""
 
 #: ../lib/settingsaction.php:91
 msgid "Upload a new profile image"
-msgstr ""
+msgstr "Upload een nieuwe profielfoto"
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
+"Gebruik deze pagina om je vrienden en collega´s uit te nodigen voor deze "
+"site"
 
 #: ../actions/register.php:159 ../actions/register.php:162
 #: actions/register.php:173 actions/register.php:176
@@ -2478,7 +2541,7 @@ msgstr "Alleen gebruikt voor updates, aankondigingen en wachtwoordherstel"
 #: ../actions/finishremotesubscribe.php:86
 #: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
 msgid "User being listened to doesn't exist."
-msgstr "Gebruiker waarnaar geluisterd wordt betaat niet."
+msgstr "Gebruiker waarnaar geluisterd wordt bestaat niet."
 
 #: ../actions/all.php:41 ../actions/avatarbynickname.php:48
 #: ../actions/foaf.php:47 ../actions/replies.php:41
@@ -2505,12 +2568,12 @@ msgstr "Gebruikersnaam"
 
 #: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
 msgid "User not found."
-msgstr ""
+msgstr "Gebruiker niet gevonden"
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
 #: actions/profilesettings.php:139
 msgid "What timezone are you normally in?"
-msgstr ""
+msgstr "Welke tijdzone heb je normaal?"
 
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
 #, php-format
@@ -2540,7 +2603,7 @@ msgstr "Verkeerde afmeting van afbeelding bij '%s'"
 #: actions/block.php:148 actions/deletenotice.php:122
 #: actions/deletenotice.php:141
 msgid "Yes"
-msgstr ""
+msgstr "Ja"
 
 #: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
 #: actions/finishaddopenid.php:112
@@ -2552,6 +2615,8 @@ msgid ""
 "You are about to permanently delete a notice.  Once this is done, it cannot "
 "be undone."
 msgstr ""
+"Je staat op het punt een bericht definitief te verwijderen._ _ Als dit "
+"gebeurd kan het nooit meer teruggevonden worden."
 
 #: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
 #: actions/recoverpassword.php:36
@@ -2560,12 +2625,12 @@ msgstr "Je bent al aangemeld!"
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
 msgid "You are already subscribed to these users:"
-msgstr ""
+msgstr "Je bent bij deze abonnees al aangemeld:"
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
 #: actions/twitapifriendships.php:105
 msgid "You are not friends with the specified user."
-msgstr ""
+msgstr "Je bent niet verbonden met deze gebruiker"
 
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
@@ -2579,7 +2644,7 @@ msgstr "Je kunt een nieuw account aanmaken om berichten te gaan plaatsen."
 #: actions/smssettings.php:69
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
+msgstr "Je kunt een SMS ontvangen via mail van %%site.name%%."
 
 #: ../actions/openidsettings.php:86
 msgid ""
@@ -2595,10 +2660,8 @@ msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Je kunt berichten verzenden en ontvangen via Jabber/GTalk [instant messages]"
-"(%%doc.im%%). Configureer je adres en instellingen hieronder.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"(%%doc.im%%). Configureer je adres en instellingen hieronder."
 
 #: ../actions/profilesettings.php:27
 msgid ""
@@ -2637,22 +2700,34 @@ msgid ""
 "Faithfully yours,\n"
 "%4$s"
 msgstr ""
+"Je hebt een nieuw postadres op %1$s.\n"
+"\n"
+"Zend een email naar %2$s om een nieuwe post te zetten.\n"
+"\n"
+"Meer mail instructies vind je op %3$s.\n"
+"\n"
+"Met vriendelijke groet,\n"
+"%4$s"
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
 #: actions/twitapistatuses.php:463
 msgid "You may not delete another user's status."
-msgstr ""
+msgstr "Je mag geen status van een ander wissen"
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr ""
+"Je moet ingelogd zijn om andere te uit te nodigen om gebruik te maken van %s"
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
 msgstr ""
+"U wordt verwittigd wanneer uw genodigden aanvaarden de uitnodiging en te "
+"registreren op de site. Bedankt voor de verspreiding en groei van de "
+"gemeenschap!"
 
 #: ../actions/recoverpassword.php:149
 msgid "You've been identified. Enter a  new password below. "
@@ -2723,7 +2798,7 @@ msgstr "ongeveer een uur geleden"
 #: ../actions/showstream.php:423 ../lib/stream.php:132
 #: actions/showstream.php:441 lib/stream.php:99
 msgid "delete"
-msgstr ""
+msgstr "Verwijderen"
 
 #: ../actions/noticesearch.php:130 ../actions/showstream.php:408
 #: ../lib/stream.php:117 actions/noticesearch.php:136
@@ -2745,10 +2820,9 @@ msgstr "gelijk aan wachtwoord hierboven"
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
 #: actions/twitapistatuses.php:555
 msgid "unsupported file type"
-msgstr ""
+msgstr "Dit filetype is niet toegestaan"
 
 #: ../lib/util.php:1309 lib/util.php:1443
-#, fuzzy
 msgid "« After"
 msgstr "« Later"
 
@@ -2766,67 +2840,67 @@ msgstr "« Later"
 #: actions/openidlogin.php:37 actions/recoverpassword.php:316
 #: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
 msgid "There was a problem with your session token. Try again, please."
-msgstr ""
+msgstr "Er is een problem ontstaan met je sessie, Porbeer nog eens aub."
 
 #: actions/disfavor.php:55 actions/disfavor.php:81
 msgid "This notice is not a favorite!"
-msgstr ""
+msgstr "Dit bericht is geen favoriet"
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
 msgid "Could not delete favorite."
-msgstr ""
+msgstr "Kan deze favoriet niet verwijderen"
 
 #: actions/disfavor.php:72 lib/favorform.php:140
 msgid "Favor"
-msgstr ""
+msgstr "Favoriet"
 
 #: actions/emailsettings.php:92
 msgid "Send me email when someone adds my notice as a favorite."
-msgstr ""
+msgstr "Stuur mij een Email als iemand mij als favoriet aanduid"
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
 msgid "Send me email when someone sends me a private message."
-msgstr ""
+msgstr "Stuur mij een Email als iemand mij een privebericht toezend"
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
 #: actions/twitapifavorites.php:118
 msgid "This notice is already a favorite!"
-msgstr ""
+msgstr "Dit bericht is al een favoriet"
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
 msgid "Could not create favorite."
-msgstr ""
+msgstr "Kan geen favoriet aanmaken"
 
 #: actions/favor.php:70
 msgid "Disfavor"
-msgstr ""
+msgstr "Niet favoriet"
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
 #, php-format
 msgid "%s favorite notices"
-msgstr ""
+msgstr "%s favorite berichten"
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
 #, php-format
 msgid "Feed of favorite notices of %s"
-msgstr ""
+msgstr "Feed voor favorieten berichten van %s"
 
 #: actions/inbox.php:28 actions/inbox.php:59
 #, php-format
 msgid "Inbox for %s - page %d"
-msgstr ""
+msgstr "Inbox van %s - pagina %d"
 
 #: actions/inbox.php:30 actions/inbox.php:62
 #, php-format
 msgid "Inbox for %s"
-msgstr ""
+msgstr "Inbox van %s"
 
 #: actions/inbox.php:53 actions/inbox.php:115
 msgid "This is your inbox, which lists your incoming private messages."
-msgstr ""
+msgstr "Dit is jouw inbox, waar je inkomende priveberichten staan"
 
 #: actions/invite.php:178 actions/invite.php:213
 #, php-format
@@ -2834,63 +2908,65 @@ msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
 "\n"
 msgstr ""
+"%1$s heeft je uitgenodigd om hem te volgen op %2$s (%3$s).\n"
+"\n"
 
 #: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
 #: actions/register.php:416
 msgid "Automatically login in the future; "
-msgstr ""
+msgstr "Automatisch in de toekomst inloggen;_"
 
 #: actions/login.php:122 actions/login.php:264
 msgid "For security reasons, please re-enter your "
-msgstr ""
+msgstr "Voor veiligheidsredenen herhaal hier je_"
 
 #: actions/login.php:126 actions/login.php:268
 msgid "Login with your username and password. "
-msgstr ""
+msgstr "Log in met je gebruikersnaam en paswoord._"
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
 #: actions/twitapidirect_messages.php:141
 msgid "That's too long. Max message size is 140 chars."
-msgstr ""
+msgstr "Dit is te lang. max. 140 karakters invoeren."
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
 msgid "No recipient specified."
-msgstr ""
+msgstr "Geen begunstigde aangeduid"
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
 msgid "You can't send a message to this user."
-msgstr ""
+msgstr "Je kunt geen bericht naar deze gebruiker zenden"
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
 #: classes/Command.php:240
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr ""
+msgstr "Stuur geen berichten naar jezelf, spreek gewoon zachtjes tegen jezelf."
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
 #: actions/newmessage.php:163
 msgid "No such user"
-msgstr ""
+msgstr "Geen gebruiker gevonden zoals je zoekt"
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
 msgid "New message"
-msgstr ""
+msgstr "Nieuw bericht"
 
 #: actions/noticesearch.php:95 actions/noticesearch.php:146
 msgid "Notice without matching profile"
-msgstr ""
+msgstr "Bericht zonder bekend profiel"
 
 #: actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr ""
+msgstr "[OpenID](%%doc.openid%%) laat je toe om in meerdere sites in te loggen_"
 
 #: actions/openidsettings.php:46 actions/openidsettings.php:96
 msgid "If you want to add an OpenID to your account, "
-msgstr ""
+msgstr "wil je een OpenID toevoegen op je account hier_"
 
 #: actions/openidsettings.php:74
 msgid "Removing your only OpenID would make it impossible to log in! "
@@ -3671,81 +3747,79 @@ msgstr ""
 #: lib/publicgroupnav.php:91
 #, fuzzy
 msgid "Popular notices"
-msgstr "Onbekend bericht."
+msgstr "Populaire berichten"
 
 #: actions/favorited.php:67
 #, fuzzy, php-format
 msgid "Popular notices, page %d"
-msgstr "Onbekend bericht."
+msgstr "Populaire berichten, pagina %d"
 
 #: actions/favorited.php:79
 msgid "The most popular notices on the site right now."
-msgstr ""
+msgstr "De meest populaire berichten op de site op dit moment."
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
 #: lib/publicgroupnav.php:87
 msgid "Featured users"
-msgstr ""
+msgstr "Nieuwe gebruikers"
 
 #: actions/featured.php:71
 #, php-format
 msgid "Featured users, page %d"
-msgstr ""
+msgstr "Nieuwe gebruikers, pagina %d"
 
 #: actions/featured.php:99
 #, php-format
 msgid "A selection of some of the great users on %s"
-msgstr ""
+msgstr "Een selectie van de actieve gebruikers op %s"
 
 #: actions/finishremotesubscribe.php:188
 msgid "That user has blocked you from subscribing."
-msgstr ""
+msgstr "Die gebruiker is geblokkeerd voor inschrijving"
 
 #: actions/groupbyid.php:79
 msgid "No ID"
-msgstr ""
+msgstr "Geen ID"
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
 msgid "Group logo"
-msgstr ""
+msgstr "Groeps logo"
 
 #: actions/grouplogo.php:149
 msgid "You can upload a logo image for your group."
-msgstr ""
+msgstr "Je kan hier een logo voor je groep uploaden"
 
 #: actions/grouplogo.php:448
-#, fuzzy
 msgid "Logo updated."
-msgstr "Avatar geactualiseerd."
+msgstr "Logo geactualiseerd."
 
 #: actions/grouplogo.php:450
-#, fuzzy
 msgid "Failed updating logo."
-msgstr "Actualiseren avatar niet gelukt."
+msgstr "Actualiseren van je logo is niet gelukt."
 
 #: actions/groupmembers.php:93 lib/groupnav.php:91
 #, php-format
 msgid "%s group members"
-msgstr ""
+msgstr "%s groeps leden"
 
 #: actions/groupmembers.php:96
 #, php-format
 msgid "%s group members, page %d"
-msgstr ""
+msgstr "% groeps leden, pagina %d"
 
 #: actions/groupmembers.php:111
 msgid "A list of the users in this group."
-msgstr ""
+msgstr "Lijst van de leden in deze groep"
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
 #: lib/subgroupnav.php:96
 msgid "Groups"
-msgstr ""
+msgstr "Groepen"
 
 #: actions/groups.php:64
 #, php-format
 msgid "Groups, page %d"
-msgstr ""
+msgstr "Groepen, pagina %d"
 
 #: actions/groups.php:90
 #, php-format
@@ -3753,221 +3827,207 @@ msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr ""
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-#, fuzzy
 msgid "Create a new group"
-msgstr "Maak een nieuw account aan"
+msgstr "Maak een nieuw groep aan"
 
 #: actions/groupsearch.php:57
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
 msgstr ""
-"Zoek naar mensen op %%site.name%% op basis van hun naam, locatie of "
+"Zoek naar groepen op %%site.name%%, op basis van hun naam, locatie of "
 "interesses. Scheid de zoektermen met spaties; ze moeten uit 3 of meer tekens "
 "bestaan."
 
 #: actions/groupsearch.php:63
-#, fuzzy
 msgid "Group search"
-msgstr "Personen zoeken"
+msgstr "Groep zoeken"
 
 #: actions/imsettings.php:70
 msgid "You can send and receive notices through "
-msgstr ""
+msgstr "Je kan berichten zenden en ontvangen via_"
 
 #: actions/imsettings.php:120
 #, php-format
 msgid "Jabber or GTalk address, "
-msgstr ""
+msgstr "Jabber of GTalk adres,_"
 
 #: actions/imsettings.php:147
-#, fuzzy
 msgid "Send me replies through Jabber/GTalk "
-msgstr "Stuur mij berichten via Jabber/GTalk."
+msgstr "Stuur mij reacties via Jabber/GTalk."
 
 #: actions/imsettings.php:321
-#, fuzzy, php-format
+#, php-format
 msgid "A confirmation code was sent "
-msgstr "Geen bevestigingscode."
+msgstr "Een bevestigingscode is gezonden naar_"
 
 #: actions/joingroup.php:65
 msgid "You must be logged in to join a group."
-msgstr ""
+msgstr "Je moet ingelogd zijn om deze groep bij te wonen"
 
 #: actions/joingroup.php:95
-#, fuzzy
 msgid "You are already a member of that group"
-msgstr "Je bent al aangemeld!"
+msgstr "Je bent al aangemeld bij deze groep!"
 
 #: actions/joingroup.php:128
-#, fuzzy, php-format
+#, php-format
 msgid "Could not join user %s to group %s"
-msgstr "Kon niet omleiden naar server: %s"
+msgstr "Kan de gebruiker %s niet aan de %s groep toevoegen "
 
 #: actions/joingroup.php:135
 #, php-format
 msgid "%s joined group %s"
-msgstr ""
+msgstr "% is bij de groep gekomen %s"
 
 #: actions/leavegroup.php:60
 msgid "Inboxes must be enabled for groups to work."
-msgstr ""
+msgstr "De inbox moet aan staan voor groepen om te kunnen functioneren"
 
 #: actions/leavegroup.php:65
 msgid "You must be logged in to leave a group."
-msgstr ""
+msgstr "Je moet ingelogd zijn om uit te schrijven uit de groep"
 
 #: actions/leavegroup.php:88
-#, fuzzy
 msgid "No such group."
-msgstr "Onbekend bericht."
+msgstr "Groep onbekend"
 
 #: actions/leavegroup.php:95
-#, fuzzy
 msgid "You are not a member of that group."
-msgstr "Je hebt dat profiel niet ingezonden"
+msgstr "Je bent geen lid van deze groep"
 
 #: actions/leavegroup.php:100
 msgid "You may not leave a group while you are its administrator."
 msgstr ""
+"Als administrator/eigenaar van de groep kan je niet je lidmaatschap opgeven"
 
 #: actions/leavegroup.php:130
 msgid "Could not find membership record."
-msgstr ""
+msgstr "Kon geen member vinden"
 
 #: actions/leavegroup.php:138
-#, fuzzy, php-format
+#, php-format
 msgid "Could not remove user %s to group %s"
-msgstr "Kon niet omleiden naar server: %s"
+msgstr "Kan de gebruiker %s niet verwijderen uit de groep %s"
 
 #: actions/leavegroup.php:145
 #, php-format
 msgid "%s left group %s"
-msgstr ""
+msgstr "%s heeft de groep verlaten %s"
 
 #: actions/login.php:225 lib/facebookaction.php:304
 msgid "Login to site"
-msgstr ""
+msgstr "Login op de website"
 
 #: actions/microsummary.php:69
 msgid "No current status"
-msgstr ""
+msgstr "Geen huidige status"
 
 #: actions/newgroup.php:53
 msgid "New group"
-msgstr ""
+msgstr "Nieuwe groep"
 
 #: actions/newgroup.php:115
 msgid "Use this form to create a new group."
-msgstr ""
+msgstr "Gebruik dit formulier voor de nieuwe groep te maken"
 
 #: actions/newgroup.php:177
-#, fuzzy
 msgid "Could not create group."
-msgstr "Kon avatarinformatie niet opslaan"
+msgstr "Kan de groep niet maken"
 
 #: actions/newgroup.php:191
-#, fuzzy
 msgid "Could not set group membership."
-msgstr "Kon abonnement niet aanmaken."
+msgstr "Kan de groeps-lidmaatschap niet aanmaken"
 
 #: actions/newmessage.php:119 actions/newnotice.php:132
-#, fuzzy
 msgid "That's too long. "
-msgstr "Dat bestand is te groot."
+msgstr "Dit is te lang._"
 
 #: actions/newmessage.php:134
 msgid "Don't send a message to yourself; "
-msgstr ""
+msgstr "Geen berichten naar jezelf zenden; _"
 
 #: actions/newnotice.php:166
-#, fuzzy
 msgid "Notice posted"
-msgstr "Berichten"
+msgstr "Berichten gepubliceerd "
 
 #: actions/newnotice.php:200 classes/Channel.php:163
 msgid "Ajax Error"
-msgstr ""
+msgstr "Ajax fout"
 
 #: actions/nudge.php:85
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
+"Deze gebruiker is het niet mogelijk nudges te hebben en/of heeft een niet "
+"bevestigd e-mailadres"
 
 #: actions/nudge.php:94
 msgid "Nudge sent"
-msgstr ""
+msgstr "Nudge verzonden"
 
 #: actions/nudge.php:97
 msgid "Nudge sent!"
-msgstr ""
+msgstr "Nudge verzonden!"
 
 #: actions/openidlogin.php:97
-#, fuzzy
 msgid "OpenID login"
 msgstr "Log in met OpenID"
 
 #: actions/openidsettings.php:128
-#, fuzzy
 msgid "Removing your only OpenID "
-msgstr "Verwijder OpenID"
+msgstr "Verwijder je enigste OpenID"
 
 #: actions/othersettings.php:60
-#, fuzzy
 msgid "Other Settings"
-msgstr "Instellingen"
+msgstr "Andere instellingen"
 
 #: actions/othersettings.php:71
 msgid "Manage various other options."
-msgstr ""
+msgstr "Beheer verschillende andere optie´s"
 
 #: actions/othersettings.php:93
+#, fuzzy
 msgid "URL Auto-shortening"
-msgstr ""
+msgstr "URL auto-sorteren"
 
 #: actions/othersettings.php:112
-#, fuzzy
 msgid "Service"
-msgstr "Zoeken"
+msgstr "Service"
 
 #: actions/othersettings.php:113
 msgid "Automatic shortening service to use."
-msgstr ""
+msgstr "Automatische verkorting dienst te gebruiken"
 
 #: actions/othersettings.php:144
-#, fuzzy
 msgid "URL shortening service is too long (max 50 chars)."
-msgstr "Locatie is te lang (maximaal 255 tekens)."
+msgstr "URL verkorting dienst is te lang (max. 50tekens)."
 
 #: actions/passwordsettings.php:69
-#, fuzzy
 msgid "Change your password."
-msgstr "Wijzig wachtwoord"
+msgstr "Verander je wachtwoord"
 
 #: actions/passwordsettings.php:89
-#, fuzzy
 msgid "Password change"
-msgstr "Wachtwoord opgeslagen."
+msgstr "Wachtwoord veranderd"
 
 #: actions/peopletag.php:35
-#, fuzzy, php-format
+#, php-format
 msgid "Not a valid people tag: %s"
-msgstr "Geen geldig e-mailadres."
+msgstr "Geen geldige personen-tag: %s"
 
 #: actions/peopletag.php:47
 #, php-format
 msgid "Users self-tagged with %s - page %d"
-msgstr ""
+msgstr "Gebruikers eigen-tagged met %s - page %d"
 
 #: actions/peopletag.php:91
 #, php-format
 msgid "These are users who have tagged themselves \"%s\" "
-msgstr ""
+msgstr "Er zijn gebruikers die hebben hunzelf getagged \"%s\""
 
 #: actions/profilesettings.php:91
-#, fuzzy
 msgid "Profile information"
-msgstr "Profiel onbekend"
+msgstr "Profiel informatie"
 
 #: actions/profilesettings.php:124
 msgid ""
@@ -3979,19 +4039,18 @@ msgid "Automatically subscribe to whoever "
 msgstr ""
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid tag: \"%s\""
-msgstr "Ongeldige homepage '%s'"
+msgstr "Ongeldige tag: '%s'"
 
 #: actions/profilesettings.php:311
-#, fuzzy
 msgid "Couldn't save tags."
-msgstr "Kon profiel niet opslaan."
+msgstr "Kon de tags niet opslaan."
 
 #: actions/public.php:107
-#, fuzzy, php-format
+#, php-format
 msgid "Public timeline, page %d"
-msgstr "Openbare tijdlijn"
+msgstr "Openbare tijdlijn, pagina %d"
 
 #: actions/public.php:173
 msgid "Could not retrieve public stream."
@@ -4005,68 +4064,60 @@ msgid ""
 msgstr ""
 
 #: actions/publictagcloud.php:57
-#, fuzzy
 msgid "Public tag cloud"
-msgstr "Openbare stream-feed"
+msgstr "Publieke tag-wolk"
 
 #: actions/publictagcloud.php:63
 #, php-format
 msgid "These are most popular recent tags on %s "
-msgstr ""
+msgstr "De meest recente en populairste tags %s_"
 
 #: actions/publictagcloud.php:119
 msgid "Tag cloud"
-msgstr ""
+msgstr "Tag-wolk"
 
 #: actions/register.php:139 actions/register.php:349
 msgid "Sorry, only invited people can register."
-msgstr ""
+msgstr "Sorry, maar alleen uitgenodigde mensen kunnen registeren"
 
 #: actions/register.php:149
-#, fuzzy
 msgid "You can't register if you don't "
-msgstr "Je kunt niet registreren als je niet met de licentie akkoord gaat."
+msgstr "Je kunt niet registreren als je niet_"
 
 #: actions/register.php:286
 msgid "With this form you can create "
-msgstr ""
+msgstr "Met dit formulier maak je_"
 
 #: actions/register.php:368
-#, fuzzy
 msgid "1-64 lowercase letters or numbers, "
-msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties"
+msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties_"
 
 #: actions/register.php:382 actions/register.php:386
-#, fuzzy
 msgid "Used only for updates, announcements, "
-msgstr "Alleen gebruikt voor updates, aankondigingen en wachtwoordherstel"
+msgstr "Alleen gebruikt voor updates, aankondigingen _"
 
 #: actions/register.php:398
-#, fuzzy
 msgid "URL of your homepage, blog, "
-msgstr "URL van je homepage, blog, of profiel op een andere site"
+msgstr "URL van je homepage, blog, _"
 
 #: actions/register.php:404
-#, fuzzy
 msgid "Describe yourself and your "
-msgstr "Beschrijf jezelf en je interesses in 140 tekens"
+msgstr "Beschrijf jezelf en je_"
 
 #: actions/register.php:410
-#, fuzzy
 msgid "Where you are, like \"City, "
-msgstr "Waar je bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\""
+msgstr "Waar je bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\"_"
 
 #: actions/register.php:432
-#, fuzzy
 msgid " except this private data: password, "
 msgstr ""
-" behalve de volgende privégegevens: wachtwoord, e-mailadres, IM-adres, "
-"telefoonnummer."
+"_behalve de volgende privégegevens: wachtwoord, e-mailadres, IM-adres, "
+"telefoonnummer._"
 
 #: actions/register.php:471
 #, php-format
 msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
-msgstr ""
+msgstr "Gefeliciteer, %s en welkom op de site \"%%site.name%%._"
 
 #: actions/register.php:495
 msgid "(You should receive a message by email "
@@ -4077,9 +4128,9 @@ msgid "That's a local profile! Login to subscribe."
 msgstr ""
 
 #: actions/replies.php:118
-#, fuzzy, php-format
+#, php-format
 msgid "Replies to %s, page %d"
-msgstr "Antwoorden aan %s"
+msgstr "Antwoorden aan %s, pagina %d"
 
 #: actions/showfavorites.php:79
 #, php-format
@@ -4089,53 +4140,50 @@ msgstr ""
 #: actions/showgroup.php:77 lib/groupnav.php:85
 #, php-format
 msgid "%s group"
-msgstr ""
+msgstr "%s groep"
 
 #: actions/showgroup.php:79
 #, php-format
 msgid "%s group, page %d"
-msgstr ""
+msgstr "%s groep, pagina %d"
 
 #: actions/showgroup.php:206
-#, fuzzy
 msgid "Group profile"
-msgstr "Onbekend bericht."
+msgstr "Groeps profiel"
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
-#, fuzzy
 msgid "Note"
-msgstr "Berichten"
+msgstr "Bericht"
 
 #: actions/showgroup.php:270
 msgid "Group actions"
-msgstr ""
+msgstr "Groeps aktie"
 
 #: actions/showgroup.php:323
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group"
-msgstr "Berichten-feed voor %s"
+msgstr "Berichten-feed voor groep %s"
 
 #  String should contain a variable token for since 'when'
 #: actions/showgroup.php:357 lib/groupnav.php:90
-#, fuzzy
 msgid "Members"
-msgstr "Lid sinds"
+msgstr "Lid"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
 #: lib/tagcloudsection.php:71
 msgid "(None)"
-msgstr ""
+msgstr "(geen)"
 
 #: actions/showgroup.php:370
 msgid "All members"
-msgstr ""
+msgstr "Alle leden"
 
 #: actions/showgroup.php:378
 #, php-format
@@ -4143,50 +4191,49 @@ msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
+"**%s** is een gebruikersgroep op  %%%%site.name%%%%, een [micro-"
+"blogging](http://en.wikipedia.org/wiki/Micro-blogging) service_"
 
 #: actions/showmessage.php:98
 msgid "Only the sender and recipient "
-msgstr ""
+msgstr "Alleen de zender en ontvanger_"
 
 #: actions/showstream.php:73
 #, php-format
 msgid "%s, page %d"
-msgstr ""
+msgstr "%s, pagina %d"
 
 #: actions/showstream.php:143
-#, fuzzy
 msgid "'s profile"
-msgstr "Profiel"
+msgstr "'s profiel"
 
 #: actions/showstream.php:236 actions/tagother.php:77
-#, fuzzy
 msgid "User profile"
-msgstr "Gebruiker heeft geen profiel."
+msgstr "Gebruikersprofiel"
 
 #: actions/showstream.php:240 actions/tagother.php:81
 msgid "Photo"
-msgstr ""
+msgstr "Foto"
 
 #: actions/showstream.php:317
 msgid "User actions"
-msgstr ""
+msgstr "Gebruikers akties"
 
 #: actions/showstream.php:342
 msgid "Send a direct message to this user"
-msgstr ""
+msgstr "Stuur de gebruiker een direct bericht"
 
 #: actions/showstream.php:343
 msgid "Message"
-msgstr ""
+msgstr "Bericht"
 
 #: actions/showstream.php:451
-#, fuzzy
 msgid "All subscribers"
-msgstr "Abonnees"
+msgstr "Alle abonnees"
 
 #: actions/showstream.php:533
 msgid "All groups"
-msgstr ""
+msgstr "Alle groepen"
 
 #: actions/showstream.php:542
 #, php-format
@@ -4194,11 +4241,12 @@ msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
+"**%s** heeft een account op %%%%site.name%%%%, een [micro-"
+"blogging](http://en.wikipedia.org/wiki/Micro-blogging) service_"
 
 #: actions/smssettings.php:128
-#, fuzzy
 msgid "Phone number, no punctuation or spaces, "
-msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties"
+msgstr "Telefoonnummer, geen leestekens of spaties,_"
 
 #: actions/smssettings.php:162
 #, fuzzy
@@ -4685,12 +4733,12 @@ msgstr "%1$s volgt nu je berichten op %2$s."
 #: lib/mail.php:254
 #, fuzzy, php-format
 msgid "Location: %s\n"
-msgstr "Locatie"
+msgstr "Locatie: %s\n"
 
 #: lib/mail.php:256
 #, fuzzy, php-format
 msgid "Homepage: %s\n"
-msgstr "Homepage"
+msgstr "Homepage: %s\n"
 
 #: lib/mail.php:258
 #, php-format
@@ -4736,7 +4784,7 @@ msgstr "6 of meer tekens"
 #: lib/noticelist.php:426
 #, fuzzy
 msgid "in reply to"
-msgstr "in antwoord op..."
+msgstr "in antwoord op"
 
 #: lib/noticelist.php:447 lib/noticelist.php:450
 msgid "Reply to this notice"
@@ -4833,33 +4881,31 @@ msgstr ""
 #: lib/subs.php:53
 #, fuzzy
 msgid "User has blocked you."
-msgstr "Gebruiker heeft geen profiel."
+msgstr "De gebruiker heeft je geblokkeerd."
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
-#, fuzzy
 msgid "Subscribe to this user"
 msgstr "Abonnement geautoriseerd"
 
 #: lib/tagcloudsection.php:56
 msgid "None"
-msgstr ""
+msgstr "Geen"
 
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr ""
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
-#, fuzzy
 msgid "Unblock this user"
-msgstr "Onbekende gebruiker."
+msgstr "Deblokkeer deze gebruiker."
 
 #: lib/unblockform.php:150
 msgid "Unblock"
-msgstr ""
+msgstr "Deblokkeer"
 
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
-msgstr ""
+msgstr "Uitschrijven van deze gebruiker"
 
 #, fuzzy
 #~ msgid "Delete my account"
diff --git a/locale/nn_NO/LC_MESSAGES/laconica.mo b/locale/nn_NO/LC_MESSAGES/laconica.mo
index 45463ff8c..f0fc1d620 100644
--- a/locale/nn_NO/LC_MESSAGES/laconica.mo
+++ b/locale/nn_NO/LC_MESSAGES/laconica.mo
diff --git a/locale/nn_NO/LC_MESSAGES/laconica.po b/locale/nn_NO/LC_MESSAGES/laconica.po
index a5a973e73..ff815409f 100644
--- a/locale/nn_NO/LC_MESSAGES/laconica.po
+++ b/locale/nn_NO/LC_MESSAGES/laconica.po
@@ -6,8 +6,8 @@ msgstr ""
 "Project-Id-Version: Laconica 0.6.3\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-02-18 22:11+0000\n"
-"Last-Translator: Tor Christian <tctovsli@gmail.com>\n"
+"PO-Revision-Date: 2009-03-16 18:52+0000\n"
+"Last-Translator: Simon Hansen <simonboba@gmail.com>\n"
 "Language-Team: Norwegian/Nynorsk <i18n-nn@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -100,7 +100,7 @@ msgstr ""
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s høyrar no på notisane dine på %2$s."
+msgstr "%1$s høyrer no på notisane dine på %2$s."
 
 #: ../lib/mail.php:126
 #, php-format
diff --git a/locale/pl_PL/LC_MESSAGES/laconica.mo b/locale/pl_PL/LC_MESSAGES/laconica.mo
index 9a9cdccf3..89cc4d349 100644
--- a/locale/pl_PL/LC_MESSAGES/laconica.mo
+++ b/locale/pl_PL/LC_MESSAGES/laconica.mo
diff --git a/locale/pl_PL/LC_MESSAGES/laconica.po b/locale/pl_PL/LC_MESSAGES/laconica.po
index 8da9dd59b..cf06ef958 100644
--- a/locale/pl_PL/LC_MESSAGES/laconica.po
+++ b/locale/pl_PL/LC_MESSAGES/laconica.po
@@ -1,33 +1,41 @@
-# translation of pl.po to Polish
+# #-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 # Paweł Wilk <siefca@gnu.org>, 2008.
-# Piotr Drąg <piotrdrag@gmail.com>, 2009.
 #
-# Polish language has 3 plural forms.
-# Special case is used for one and some numbers ending in 2, 3, or 4.
-# Example:
-# 1         WINDOW  -> 1 OKNO
-# x2 to x4  WINDOWS -> x2 do x4 OKNA (x != 1)
-# 5 or more WINDOWS -> 5 lub więcej OKIEN
+# #-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#
+# 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.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pl\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-11 09:33+0000\n"
-"PO-Revision-Date: 2009-04-10 00:39+0200\n"
-"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
-"Language-Team: Polish <pl@li.org>\n"
+"POT-Creation-Date: 2009-01-25 16:24+0000\n"
+"PO-Revision-Date: 2009-04-27 22:38+0000\n"
+"Last-Translator: Dawid Jan <dawidjan@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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"
-
+"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: Pootle 1.1.0\n"
+
+#  Polish language has 3 plural forms.
+#  Special case is used for one and some numbers ending in 2, 3, or 4.
+#  Example:
+#  1         WINDOW   -> 1 OKNO
+#  x2 to x4  WINDOWS  -> x2 do x4 OKNA  (x != 1)
+#  5 or more WINDOWS  -> 5 lub więcej OKIEN
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
 #: actions/noticesearchrss.php:88
 #, php-format
 msgid " Search Stream for \"%s\""
-msgstr " Znajdź strumień dla \"%s\""
+msgstr "Szukaj strumienia dla \"%s\""
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
@@ -35,27 +43,26 @@ msgstr " Znajdź strumień dla \"%s\""
 msgid ""
 " except this private data: password, email address, IM address, phone number."
 msgstr ""
-" poza tymi prywatnymi danymi: hasło, adres e-mail, adres komunikatora, numer "
+"z wyłączeniem tych prywatnych danych: e-maila, identyfikatora IM, numeru "
 "telefonu."
 
 #: ../actions/showstream.php:400 ../lib/stream.php:109
 #: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
 msgid " from "
-msgstr " od "
+msgstr ""
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
+#: actions/twitapistatuses.php:347
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
-msgstr "%1$s/aktualizacje odpowiadające na %2$s"
+msgstr "%1$s / Wpisów w odpowiedzi na %2$s"
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
-#: actions/invite.php:218
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s zapraszają Cię, abyś dołączył do nich w %2$s"
+msgstr "%1$s zapraszają Cię byś dołączył do nich w %2$s"
 
-#: ../actions/invite.php:170 actions/invite.php:220
+#: ../actions/invite.php:170
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -85,38 +92,11 @@ msgid ""
 "\n"
 "Sincerely, %2$s\n"
 msgstr ""
-"Użytkownik %1$s zapraszają Cię, abyś dołączył do nich w %2$s (%3$s).\n"
-"\n"
-"%2$s jest usługą mikroblogowania, która umożliwia pozostawanie w kontakcie z "
-"osobami, których znasz i z tymi, którzy Cię interesują.\n"
-"\n"
-"Możesz także dzielić się w sieci nowinkami o sobie, swoimi przemyśleniami, "
-"lub swoim życiem z osobami, którzy Cię znają. To także wspaniały sposób na "
-"poznawanie nowych osób, którzy dzielą Twoje zainteresowania.\n"
-"\n"
-"Użytkownik %1$s powiedział:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Możesz zobaczyć stronę profilu %1$s na %2$s tutaj:\n"
-"\n"
-"%5$s\n"
-"\n"
-"Jeśli chcesz wypróbować usługę, naciśnij na poniższy odnośnik, aby "
-"zaakceptować zaproszenie.\n"
-"\n"
-"%6$s\n"
-"\n"
-"Jeśli nie, możesz zignorować tę wiadomość. Dziękujemy za Twoją cierpliwość i "
-"czas.\n"
-"\n"
-"Z poważaniem, %2$s\n"
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
-#: lib/mail.php:236
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
-msgstr "Użytkownik %1$s obserwuje teraz Twoje wpisy na %2$s."
+msgstr "%1$s obserwuje teraz Twoje wpisy na %2$s."
 
 #: ../lib/mail.php:126
 #, php-format
@@ -128,18 +108,16 @@ msgid ""
 "Faithfully yours,\n"
 "%4$s.\n"
 msgstr ""
-"Użytkownik %1$s obserwuje teraz Twoje wpisy na %2$s.\n"
-"\n"
-"\t%3$s\n"
+"%1$s obserwuje teraz Twoje wpisy na %2$s.\n"
 "\n"
-"Z poważaniem,\n"
+"Kłaniam się,\n"
 "%4$s.\n"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:350
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "%1$s aktualizuje tę odpowiedź na aktualizacje od %2$s/%3$s."
+msgstr "%1$s wpisów, które są odpowiedziami na wpisy od %2$s / %3$s."
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
 #: actions/shownotice.php:161
@@ -151,7 +129,7 @@ msgstr "Status użytkownika %1$s na %2$s"
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
 #, php-format
 msgid "%s (%s)"
-msgstr "%s (%s)"
+msgstr ""
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
 #: actions/publicrss.php:90
@@ -164,74 +142,71 @@ msgstr "Publiczny strumień %s"
 #: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
 #: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
 #: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
-#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
-#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
 #, php-format
 msgid "%s and friends"
 msgstr "%s i przyjaciele"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:33
 #, php-format
 msgid "%s public timeline"
 msgstr "Publiczna oś czasu %s"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
 #, php-format
 msgid "%s status"
-msgstr "Status %s"
+msgstr "status %s"
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapistatuses.php:199
 #, php-format
 msgid "%s timeline"
-msgstr "Oś czasu %s"
+msgstr "oś czasu %s"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:36
 #, php-format
 msgid "%s updates from everyone!"
-msgstr "%s aktualizuje od każdego!"
+msgstr "%s wpisów od wszystkich!"
 
-#: ../actions/register.php:213 actions/register.php:497
+#: ../actions/register.php:213
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr ""
-"(Powinieneś właśnie otrzymać wiadomość e-mail, zawierającą instrukcje "
-"potwierdzenia adresu e-mail)"
+"(Wkrótce otrzymasz wiadomość na swoją skrzynkę e-mail, która będzie zawierać "
+"instrukcje, jak potwierdzić Twój adres e-mail.)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
-"**%%site.name%%** jest usługą mikroblogowania prowadzony przez [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** to serwis z mikroblogami prowadzony przez [%%site.broughtby"
+"%%](%%site.broughtbyurl%%)."
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** jest usługą mikroblogowania. "
+msgstr "**%%site.name%%** to serwis do mikroblogowania."
 
 #: ../lib/util.php:274 lib/util.php:290
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ""
-". Współtwórcy powinni być wymienieni z imienia i nazwiska lub pseudonimu."
+". Współpracownicy powinni być wymienieni z imienia i nazwiska lub pseudonimu."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 #: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
 #: lib/groupeditform.php:139
 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"
+msgstr "Max. 64 znaki alfanumeryczne, bez spacji i znaków przestankowych"
 
 #: ../actions/register.php:152 actions/register.php:166
-#: actions/register.php:368
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
-"1-64 małe litery lub liczby, bez spacji i znaków przestankowych. Wymagane."
+"Max. 64 znaki alfanumeryczne, bez spacji i znaków przestankowych. Wymagane."
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
 #: actions/passwordsettings.php:102
@@ -241,7 +216,7 @@ msgstr "6 lub więcej znaków"
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
 #: actions/recoverpassword.php:220
 msgid "6 or more characters, and don't forget it!"
-msgstr "6 lub więcej znaków, i nie zapomnij go!"
+msgstr "6 lub więcej znaków – nie zapomnij go!"
 
 #: ../actions/register.php:154 actions/register.php:168
 #: actions/register.php:373
@@ -249,33 +224,31 @@ msgid "6 or more characters. Required."
 msgstr "6 lub więcej znaków. Wymagane."
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
-#: actions/imsettings.php:321
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
 "s for sending messages to you."
 msgstr ""
-"Kod potwierdzający został wysłany na dodany adres komunikatora. Musisz "
+"Na Twój adres komunikatora został wysłany kod potwierdzający. Musisz "
 "zaakceptować otrzymywanie wiadomości od %s."
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
-#: actions/emailsettings.php:350
 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 ""
-"Kod potwierdzający został wysłany na dodany adres e-mail. Sprawdź w swojej "
-"skrzynce odbiorczej (także w wiadomościach niechcianych!), czy otrzymałeś "
-"kod i instrukcje dotyczące jego użycia."
+"Kod potwierdzający został wysłany na podany przez Ciebie adres e-mail. "
+"Sprawdź w swojej skrzynce odbiorczej (także w folderze SPAM) czy otrzymałeś "
+"kod i instrukcje dotyczące jego użycia. "
 
 #: ../actions/smssettings.php:216 actions/smssettings.php:224
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your inbox "
 "(and spam box!) for the code and instructions on how to use it."
 msgstr ""
-"Kod potwierdzający został wysłany na dodany numer telefonu. Sprawdź w swojej "
-"skrzynce odbiorczej (także w wiadomościach niechcianych!), czy otrzymałeś "
-"kod i instrukcje dotyczące jego użycia."
+"Kod potwierdzający został wysłany na podany przez Ciebie numer telefonu. "
+"Sprawdź w swojej skrzynce odbiorczej (także w folderze SPAM) czy otrzymałeś "
+"kod i instrukcje dotyczące jego użycia. "
 
 #: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
 #: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
@@ -295,14 +268,9 @@ msgstr ""
 #: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
 #: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
-#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
-#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
-#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
-#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
-#: actions/twitapistatuses.php:453
+#: actions/twitapiusers.php:32
 msgid "API method not found!"
-msgstr "Nie znaleziono metody API!"
+msgstr "metoda API nie znaleziona!"
 
 #: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
 #: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
@@ -323,21 +291,18 @@ msgstr "Nie znaleziono metody API!"
 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
 #: actions/twitapihelp.php:52 actions/twitapilaconica.php:172
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
-#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
-#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
-#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapistatuses.php:562
 msgid "API method under construction."
-msgstr "Metoda API jest w trakcie tworzenia."
+msgstr "metoda API w trakcie powstawania."
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
 msgid "About"
-msgstr "O usłudze"
+msgstr "O serwisie"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
 #: actions/userauthorization.php:143
 msgid "Accept"
-msgstr "Zaakceptuj"
+msgstr "Akceptuj"
 
 #: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
 #: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
@@ -346,7 +311,6 @@ msgstr "Zaakceptuj"
 #: actions/twittersettings.php:85 actions/emailsettings.php:120
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
-#: actions/twittersettings.php:166
 msgid "Add"
 msgstr "Dodaj"
 
@@ -369,14 +333,13 @@ msgid "Address"
 msgstr "Adres"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-#: actions/invite.php:181
 msgid "Addresses of friends to invite (one per line)"
-msgstr "Adresy przyjaciół, których zapraszasz (jeden na wiersz)"
+msgstr "Adresy subskrybentów, których zapraszasz (jeden w każdej linii)"
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
 #: actions/showstream.php:422
 msgid "All subscriptions"
-msgstr "Wszystkie subskrypcje"
+msgstr "Wszyscy obserwowani"
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
 #: actions/publicrss.php:92
@@ -388,7 +351,7 @@ msgstr "Wszystkie aktualizacje od %s"
 #: actions/noticesearchrss.php:90
 #, php-format
 msgid "All updates matching search term \"%s\""
-msgstr "Wszystkie aktualizacje pasujące do wyszukiwanego terminu \"%s\""
+msgstr "Wszystkie aktualizacje pasujące do wzorca wyszukiwania \"%s\""
 
 #: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
 #: ../actions/openidlogin.php:29 ../actions/register.php:30
@@ -401,72 +364,68 @@ msgstr "Jesteś już zalogowany."
 
 #: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
 msgid "Already subscribed!."
-msgstr "Już subskrybowane!"
+msgstr "Już obserwujesz!"
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:113
 msgid "Are you sure you want to delete this notice?"
 msgstr "Jesteś pewien, że chcesz usunąć ten wpis?"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 #: actions/userauthorization.php:81
 msgid "Authorize subscription"
-msgstr "Upoważnij subskrypcję"
+msgstr "Pozwól na obserwację"
 
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
-#: actions/register.php:416
+#: actions/register.php:192
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
-"Automatyczne logowanie. Nie użyj na komputerach używanych przez wiele osób!"
+"Automatycznie loguj mnie na konto. Nie używać w przypadku współdzielonych "
+"komputerów!"
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-#: actions/profilesettings.php:144
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
-"Automatycznie zasubskrybuj każdego, kto mnie zasubskrybuje (najlepsze dla "
+"Automatycznie zasubskrybuj każdego kto mnie zasubskrybuje (najlepsze dla "
 "botów)"
 
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
-#: actions/avatarsettings.php:67 actions/showgroup.php:211
 msgid "Avatar"
 msgstr "Awatar"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:395
 msgid "Avatar updated."
-msgstr "Zaktualizowano awatar."
+msgstr "Awatar załadowany."
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
-#: actions/imsettings.php:108
 #, 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 ""
-"Oczekiwanie na potwierdzenie tego adresu. Sprawdź swoje konto Jabbera/GTalk, "
-"czy otrzymałeś wiadomość z dalszymi instrukcjami (dodałeś %s do listy "
-"znajomych?)."
+"Oczekiwanie na potwierdzenie dla tego adresu. Sprawdź czy na Twoje konto "
+"Jabbera/GTalka przyszła wiadomość z dalszymi instrukcjami. (Nie zapomnij "
+"dodać %s do listy znajomych.)"
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
-#: actions/emailsettings.php:107
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
-"Oczekiwanie na potwierdzenie tego adresu. Sprawdź swoją skrzynkę odbiorczą "
-"(także w wiadomościach niechcianych!), czy otrzymałeś wiadomość z dalszymi "
-"instrukcjami."
+"Ten adres oczekuje potwierdzenia. Sprawdź swoją skrzynkę odbiorczą (także "
+"folder SPAM!) czy dostałeś wiadomość z dalszymi instrukcjami.  "
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
 #: actions/smssettings.php:111
 msgid "Awaiting confirmation on this phone number."
-msgstr "Oczekiwanie na potwierdzenie tego numeru telefonu."
+msgstr "Oczekiwanie na potwierdzenie dla tego numeru telefonu."
 
 #: ../lib/util.php:1318 lib/util.php:1452
+#, fuzzy
 msgid "Before »"
 msgstr "Wcześniej »"
 
@@ -480,24 +439,23 @@ msgstr "O mnie"
 #: ../actions/updateprofile.php:103 actions/profilesettings.php:216
 #: actions/register.php:89 actions/updateprofile.php:104
 #: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/updateprofile.php:107
 msgid "Bio is too long (max 140 chars)."
-msgstr "Wpis \"O mnie\" jest za długi (maksymalnie 140 znaków)."
+msgstr "Wpis \"O mnie\" jest za długi (maks. 140 znaków)"
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
 msgid "Can't delete this notice."
-msgstr "Nie można usunąć tego wpisu."
+msgstr "Nie można usunąć tego wpisu. "
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123 actions/updateprofile.php:125
+#: actions/updateprofile.php:123
 #, php-format
 msgid "Can't read avatar URL '%s'"
-msgstr "Nie można odczytać adresu URL awatara \"%s\""
+msgstr "Nie można odczytać URL-a awatara '%s'"
 
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-#: actions/passwordsettings.php:174
 msgid "Can't save new password."
 msgstr "Nie można zapisać nowego hasła."
 
@@ -510,9 +468,8 @@ msgid "Cancel"
 msgstr "Anuluj"
 
 #: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
-#: lib/openid.php:133
 msgid "Cannot instantiate OpenID consumer object."
-msgstr "Nie można utworzyć instancji obiektu klienta OpenID."
+msgstr "Nie można stworzyć instancji obiektu OpenID."
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
 #: actions/imsettings.php:286
@@ -520,9 +477,9 @@ msgid "Cannot normalize that Jabber ID"
 msgstr "Nie można znormalizować tego identyfikatora Jabbera"
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:311
 msgid "Cannot normalize that email address"
-msgstr "Nie można znormalizować tego adresu e-mail"
+msgstr "Nie można znormalizować tego adresu email."
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
 #: actions/passwordsettings.php:110
@@ -532,7 +489,7 @@ msgstr "Zmień"
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
 #: lib/accountsettingsaction.php:114
 msgid "Change email handling"
-msgstr "Zmień obsługę adresu e-mail"
+msgstr "Zmień ustawienia e-mail"
 
 #: ../actions/password.php:32 actions/profilesettings.php:36
 #: actions/passwordsettings.php:58
@@ -541,12 +498,12 @@ msgstr "Zmień hasło"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
 msgid "Change your password"
-msgstr "Zmień hasło"
+msgstr "Zmień swoje hasło"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
 #: lib/accountsettingsaction.php:105
 msgid "Change your profile settings"
-msgstr "Zmień ustawienia profilu"
+msgstr "Zmień ustawienia swojego profilu"
 
 #: ../actions/password.php:43 ../actions/recoverpassword.php:181
 #: ../actions/register.php:155 ../actions/smssettings.php:65
@@ -566,7 +523,7 @@ msgstr "Potwierdź adres"
 #: ../actions/smssettings.php:245 actions/emailsettings.php:256
 #: actions/imsettings.php:230 actions/smssettings.php:253
 #: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/smssettings.php:374
 msgid "Confirmation cancelled."
 msgstr "Anulowano potwierdzenie."
 
@@ -580,7 +537,7 @@ msgstr "Kod potwierdzający"
 msgid "Confirmation code not found."
 msgstr "Nie znaleziono kodu potwierdzającego."
 
-#: ../actions/register.php:202 actions/register.php:473
+#: ../actions/register.php:202
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -598,24 +555,9 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
-"Gratulacje, %s! Witaj na %%%%site.name%%%%. Stąd możesz chcieć...\n"
-"\n"
-"* Przejść do [swojego profilu](%s) i wysłać swoją pierwszą wiadomość.\n"
-"* Dodać [adres Jabbera/GTalk](%%%%action.imsettings%%%%), abyś mógł wysyłać "
-"wpisy przez komunikatora.\n"
-"* [Poszukać osób](%%%%action.peoplesearch%%%%), których możesz znać lub "
-"którzy dzielą Twoje zainteresowania. \n"
-"* Zaktualizować swoje [ustawienia profilu](%%%%action.profilesettings%%%%), "
-"aby powiedzieć innym więcej o sobie. \n"
-"* Przeczytać [dokumentację w sieci](%%%%doc.help%%%%), aby dowiedzieć się o "
-"funkcjach, które mogłeś pominąć. \n"
-"\n"
-"Dziękujemy za zarejestrowanie się i mamy nadzieję, że używanie tej usługi "
-"sprawi Ci przyjemność."
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
-#: lib/action.php:406
+#: actions/finishopenidlogin.php:119 lib/action.php:330
 msgid "Connect"
 msgstr "Połącz"
 
@@ -624,12 +566,11 @@ msgstr "Połącz"
 msgid "Connect existing account"
 msgstr "Połącz z istniejącym kontem"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
 msgid "Contact"
 msgstr "Kontakt"
 
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
-#: lib/openid.php:190
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Nie można utworzyć formularza OpenID: %s"
@@ -647,38 +588,37 @@ msgid "Could not follow user: User not found."
 msgstr "Nie można obserwować użytkownika: nie znaleziono użytkownika."
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
-#: lib/openid.php:172
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Nie można przekierować do serwera: %s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166 actions/updateprofile.php:176
+#: actions/updateprofile.php:166
 msgid "Could not save avatar info"
 msgstr "Nie można zapisać informacji o awatarze"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159 actions/updateprofile.php:163
+#: actions/updateprofile.php:159
 msgid "Could not save new profile info"
 msgstr "Nie można zapisać informacji o nowym profilu"
 
 #: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
 msgid "Could not subscribe other to you."
-msgstr "Nie można zasubskrybować innych do Ciebie."
+msgstr ""
 
 #: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
 msgid "Could not subscribe."
-msgstr "Nie można zasubskrybować."
+msgstr "Nie można subskrybować."
 
 #: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
 #: actions/recoverpassword.php:111
 msgid "Could not update user with confirmed email address."
-msgstr "Nie można zaktualizować użytkownika z potwierdzonym adresem e-mail."
+msgstr ""
 
 #: ../actions/finishremotesubscribe.php:99
 #: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
 msgid "Couldn't convert request tokens to access tokens."
-msgstr "Nie można przekonwertować tokenów żądań na tokeny dostępu."
+msgstr "Nie można przekształcić tokenów z żądaniami na tokeny dostępu."
 
 #: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
 #: ../actions/imsettings.php:218 ../actions/smssettings.php:241
@@ -686,56 +626,53 @@ msgstr "Nie można przekonwertować tokenów żądań na tokeny dostępu."
 #: actions/imsettings.php:226 actions/smssettings.php:249
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
-#: actions/emailsettings.php:382
 msgid "Couldn't delete email confirmation."
-msgstr "Nie można usunąć potwierdzenia adresu e-mail."
+msgstr "Nie można skasować potwierdzenia adresu e-mail."
 
 #: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
 msgid "Couldn't delete subscription."
-msgstr "Nie można usunąć subskrypcji."
+msgstr "Nie można usunąć obserwacji."
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
+#: actions/twitapistatuses.php:84
 msgid "Couldn't find any statuses."
-msgstr "Nie można znaleźć żadnych statusów."
+msgstr ""
 
 #: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
 #: actions/remotesubscribe.php:178
 msgid "Couldn't get a request token."
-msgstr "Nie można uzyskać tokenu żądana."
+msgstr "Nie można uzyskać tokena z żądaniem."
 
 #: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
 #: ../actions/smssettings.php:206 actions/emailsettings.php:223
 #: actions/imsettings.php:195 actions/smssettings.php:214
 #: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325 actions/emailsettings.php:344
+#: actions/smssettings.php:325
 msgid "Couldn't insert confirmation code."
 msgstr "Nie można wprowadzić kodu potwierdzającego."
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
 msgid "Couldn't insert new subscription."
-msgstr "Nie można wprowadzić nowej subskrypcji."
+msgstr "Nie można wprowadzić nowej obserwacji."
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 #: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-#: actions/twitapiaccount.php:82
 msgid "Couldn't save profile."
 msgstr "Nie można zapisać profilu."
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
 #: actions/profilesettings.php:279
 msgid "Couldn't update user for autosubscribe."
-msgstr "Nie można zaktualizować użytkownika do automatycznej subskrypcji."
+msgstr ""
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
 #: actions/emailsettings.php:440 actions/emailsettings.php:462
-#: actions/emailsettings.php:447 actions/emailsettings.php:469
-#: actions/smssettings.php:515 actions/smssettings.php:539
+#, fuzzy
 msgid "Couldn't update user record."
-msgstr "Nie można zaktualizować wpisu użytkownika."
+msgstr "Nie można uaktualnić wpisu użytkownika."
 
 #: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
 #: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
@@ -749,8 +686,7 @@ msgstr "Nie można zaktualizować wpisu użytkownika."
 #: actions/emailsettings.php:411 actions/imsettings.php:252
 #: actions/imsettings.php:395 actions/othersettings.php:162
 #: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408 actions/emailsettings.php:287
-#: actions/emailsettings.php:418
+#: actions/smssettings.php:408
 msgid "Couldn't update user."
 msgstr "Nie można zaktualizować użytkownika."
 
@@ -762,61 +698,57 @@ msgstr "Utwórz"
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
 #: actions/finishopenidlogin.php:98
 msgid "Create a new user with this nickname."
-msgstr "Utwórz nowego użytkownika o tym pseudonimie."
+msgstr "Załóż użytkownika o tym pseudonimie."
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
 #: actions/finishopenidlogin.php:96
 msgid "Create new account"
-msgstr "Utwórz nowe konto"
+msgstr "Załóż nowe konto"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
 #: actions/finishopenidlogin.php:231
 msgid "Creating new account for OpenID that already has a user."
-msgstr ""
-"Tworzenie nowego konta dla identyfikatora OpenID, który posiada już "
-"użytkownika."
+msgstr "Tworzenie nowego konta użytkownika na podstawie identyfikatora OpenID."
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
 #: actions/imsettings.php:100
 msgid "Current confirmed Jabber/GTalk address."
-msgstr "Obecnie potwierdzone adresy Jabbera/GTalk."
+msgstr "Potwierdzone adresy Jabbera/GTalka"
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
 #: actions/smssettings.php:100
 msgid "Current confirmed SMS-enabled phone number."
-msgstr "Obecnie potwierdzone numery telefonów z włączoną usługą SMS."
+msgstr "Potwierdzony numer telefonu z włączoną usługą SMS."
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
 #: actions/emailsettings.php:99
 msgid "Current confirmed email address."
-msgstr "Obecnie potwierdzone adresy e-mail."
+msgstr "Potwierdzony adres e-mail."
 
 #: ../actions/showstream.php:356 actions/showstream.php:367
 msgid "Currently"
 msgstr "Obecnie"
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
-#: classes/Notice.php:114
 #, php-format
 msgid "DB error inserting hashtag: %s"
-msgstr "Błąd bazy danych podczas wprowadzania znacznika hasha: %s"
+msgstr ""
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
-#: classes/Notice.php:757
 #, php-format
 msgid "DB error inserting reply: %s"
-msgstr "Błąd bazy danych podczas wprowadzania odpowiedzi: %s"
+msgstr "Błąd przy dodawaniu do bazy danych: %s"
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79 actions/deletenotice.php:111
+#: actions/deletenotice.php:79
 msgid "Delete notice"
 msgstr "Usuń wpis"
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114 actions/register.php:404
+#: actions/profilesettings.php:114
 msgid "Describe yourself and your interests in 140 chars"
-msgstr "Opisz się i swoje zainteresowania w 140 znakach"
+msgstr "Opisz się w 140 znakach"
 
 #: ../actions/register.php:158 ../actions/register.php:161
 #: ../lib/settingsaction.php:87 actions/register.php:172
@@ -833,55 +765,54 @@ msgstr "Adres e-mail"
 #: ../actions/emailsettings.php:32 actions/emailsettings.php:32
 #: actions/emailsettings.php:60
 msgid "Email Settings"
-msgstr "Ustawienia adresu e-mail"
+msgstr "Ustawienia e-mail"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
 msgid "Email address already exists."
-msgstr "Adres e-mail już istnieje."
+msgstr "Taki e-mail już istnieje"
 
 #: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
 msgid "Email address confirmation"
-msgstr "Potwierdzenie adresu e-mail"
+msgstr "Potwierdzenie adresu e-mailowego"
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
 #: actions/emailsettings.php:117
 msgid "Email address, like \"UserName@example.org\""
-msgstr "Adres e-mail, taki jak \"NazwaUżytkownika@przykład.org\""
+msgstr "Adres e-mail, taki jak \"NazwaUzytkownika@example.org\""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-#: actions/invite.php:179
 msgid "Email addresses"
 msgstr "Adresy e-mail"
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 #: actions/recoverpassword.php:231
 msgid "Enter a nickname or email address."
-msgstr "Podaj pseudonim lub adres e-mail."
+msgstr "Podaj pseudonim lub adres e-mailowy"
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
 #: actions/smssettings.php:119
 msgid "Enter the code you received on your phone."
-msgstr "Podaj kod, który otrzymałeś na telefonie."
+msgstr "Wprowadź kod, który otrzymałeś na swój telefon."
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 #: actions/userauthorization.php:161
 msgid "Error authorizing token"
-msgstr "Błąd podczas upoważniania tokena"
+msgstr "Błąd podczas autoryzacji tokena"
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
+#: actions/finishopenidlogin.php:297
 msgid "Error connecting user to OpenID."
-msgstr "Błąd podczas łączenia użytkownika z OpenID."
+msgstr "Błąd w podłączaniu użytkownika do OpenID."
 
 #: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
 #: actions/finishaddopenid.php:126
 msgid "Error connecting user."
-msgstr "Błąd podczas łączenia użytkownika."
+msgstr "Błąd w podłączaniu użytkownika."
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
 msgid "Error inserting avatar"
-msgstr "Błąd podczas wprowadzania awatara"
+msgstr "Błąd we wstawianiu awatara"
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
@@ -896,36 +827,33 @@ msgstr "Błąd podczas wprowadzania zdalnego profilu"
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
 #: actions/recoverpassword.php:280
 msgid "Error saving address confirmation."
-msgstr "Błąd podczas zapisywania potwierdzenia adresu."
+msgstr "Błąd w zapisie potwierdzenia adresu."
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
 #: actions/userauthorization.php:164
 msgid "Error saving remote profile"
-msgstr "Błąd podczas zapisie zdalnego profilu"
+msgstr "Błąd w zapisie zdalnego profilu."
 
 #: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-#: lib/openid.php:238
 msgid "Error saving the profile."
-msgstr "Błąd podczas zapisywania profilu."
+msgstr "Błąd w zapisie profilu."
 
 #: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-#: lib/openid.php:249
 msgid "Error saving the user."
-msgstr "Błąd podczas zapisywanie użytkownika."
+msgstr "Błąd w zapisie użytkownika."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
+#: actions/passwordsettings.php:164
 msgid "Error saving user; invalid."
-msgstr "Błąd podczas zapisywania użytkownika; nieprawidłowy."
+msgstr "Błąd podczas zapisywania użytkownika; niepoprawne dane."
 
 #: ../actions/login.php:47 ../actions/login.php:73
 #: ../actions/recoverpassword.php:307 ../actions/register.php:98
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
-#: actions/login.php:120
 msgid "Error setting user."
-msgstr "Błąd podczas ustawiania użytkownika."
+msgstr "Błąd w ustawianiu danych użytkownika."
 
 #: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
 #: actions/finishaddopenid.php:131
@@ -945,83 +873,79 @@ msgstr "Błąd kodu potwierdzającego."
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
 #: actions/finishopenidlogin.php:117
 msgid "Existing nickname"
-msgstr "Istniejący pseudonim"
+msgstr "Dotychczasowy pseudonim"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
 msgid "FAQ"
 msgstr "FAQ"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:397
 msgid "Failed updating avatar."
-msgstr "Zaktualizowanie awatara nie powiodło się."
+msgstr "Uaktualnianie awatara nie powiodło się."
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
-#: actions/allrss.php:110
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Kanał dla znajomych użytkownika %s"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71 actions/replies.php:136
+#: actions/repliesrss.php:71
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Kanał dla odpowiedzi do użytkownika %s"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
-#: actions/tag.php:68
 #, php-format
 msgid "Feed for tag %s"
-msgstr "Kanał dla znaczników %s"
+msgstr ""
 
 #: ../lib/searchaction.php:105 lib/searchaction.php:105
 #: lib/searchgroupnav.php:83
 msgid "Find content of notices"
-msgstr "Przeszukaj zawartość wpisów"
+msgstr ""
 
 #: ../lib/searchaction.php:101 lib/searchaction.php:101
 #: lib/searchgroupnav.php:81
+#, fuzzy
 msgid "Find people on this site"
-msgstr "Znajdź osoby na tej stronie"
+msgstr "Szukaj ludzi na tej stronie"
 
-#: ../actions/login.php:122 actions/login.php:247
+#: ../actions/login.php:122
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
-"Z powodów bezpieczeństwa ponownie podaj nazwę użytkownika i hasło przed "
-"zmienianiem ustawień."
+"Z powodów bezpieczeństwa wprowadź proszę ponownie nazwę użytkownika i hasło "
+"przed zmianą swoich ustawień."
 
 #: ../actions/profilesettings.php:44 ../actions/register.php:164
 #: actions/profilesettings.php:77 actions/register.php:178
 #: actions/profilesettings.php:103 actions/register.php:391
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
-#: actions/showgroup.php:237 actions/showstream.php:255
-#: actions/tagother.php:104
 msgid "Full name"
-msgstr "Imię i nazwisko"
+msgstr "Pełna nazwa"
 
 #: ../actions/profilesettings.php:98 ../actions/register.php:79
 #: ../actions/updateprofile.php:93 actions/profilesettings.php:213
 #: actions/register.php:86 actions/updateprofile.php:94
 #: actions/editgroup.php:195 actions/newgroup.php:146
 #: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/updateprofile.php:97
 msgid "Full name is too long (max 255 chars)."
-msgstr "Imię i nazwisko jest za długie (maksymalnie 255 znaków)."
+msgstr "Pełna nazwa jest zbyt długa (max. 255 znaków)."
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
-#: lib/action.php:421 lib/action.php:659
 msgid "Help"
 msgstr "Pomoc"
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/facebookaction.php:200
 msgid "Home"
-msgstr "Strona główna"
+msgstr "Początek"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
@@ -1035,10 +959,10 @@ msgstr "Strona domowa"
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
 msgid "Homepage is not a valid URL."
-msgstr "Strona domowa nie jest prawidłowym adresem URL."
+msgstr "Adres strony domowej nie jest poprawnym URL-em."
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173 actions/emailsettings.php:178
+#: actions/emailsettings.php:173
 msgid "I want to post notices by email."
 msgstr "Chcę wysyłać wpisy przez e-mail."
 
@@ -1063,60 +987,57 @@ msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
 msgstr ""
-"Jeśli już masz konto, zaloguj się za pomocą nazwy użytkownika i hasła, aby "
+"Jeśli już masz konto, zaloguj się używając nazwy użytkownika i hasła, aby "
 "połączyć je ze swoim identyfikatorem OpenID."
 
-#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
+#: ../actions/openidsettings.php:45
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
 msgstr ""
-"Jeśli chcesz dodać identyfikator OpenID do swojego konta, podaj go w "
-"poniższym polu i naciśnij \"Dodaj\"."
+"Jeśli chcesz skojarzyć konto OpenID ze swoim lokalnym kontem, wprowadź "
+"identyfikator w poniższe pole i kliknij \"Dodaj\"."
 
-#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
+#: ../actions/recoverpassword.php:137
 msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
 msgstr ""
-"Jeśli zapomniałeś lub zgubiłeś swoje hasło, możesz dostać nowe na adres e-"
-"mail, który podałeś."
 
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
 msgid "Incoming email"
-msgstr "Wiadomości przychodzące"
+msgstr ""
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443 actions/emailsettings.php:450
-#: actions/smssettings.php:518
+#: actions/emailsettings.php:443
 msgid "Incoming email address removed."
-msgstr "Usunięto przychodzący adres e-mail."
+msgstr ""
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:153
 msgid "Incorrect old password"
-msgstr "Niepoprawne stare hasło"
+msgstr "Stare hasło jest niepoprawne"
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/login.php:132
 msgid "Incorrect username or password."
-msgstr "Niepoprawna nazwa użytkownika lub hasło."
+msgstr "Błędna nazwa użytkownika lub hasło."
 
-#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: ../actions/recoverpassword.php:265
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
-"Instrukcje przywracania hasła zostały wysłane na adres e-mail zarejestrowany "
-"z Twoim kontem."
+"Instrukcje dotyczące przywrócenia hasła zostały wysłane na adres e-mailowy "
+"skojarzony z Twoim kontem."
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118 actions/updateprofile.php:120
+#: actions/updateprofile.php:118
 #, php-format
 msgid "Invalid avatar URL '%s'"
-msgstr "Nieprawidłowy adres URL awatara \"%s\""
+msgstr "Błędny URL awatara '%s'"
 
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
 #, php-format
@@ -1124,71 +1045,72 @@ msgid "Invalid email address: %s"
 msgstr "Nieprawidłowy adres e-mail: %s"
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102 actions/updateprofile.php:104
+#: actions/updateprofile.php:102
 #, php-format
 msgid "Invalid homepage '%s'"
-msgstr "Nieprawidłowa strona domowa \"%s\""
+msgstr "Błędna strona domowa '%s'"
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86 actions/updateprofile.php:88
+#: actions/updateprofile.php:86
 #, php-format
 msgid "Invalid license URL '%s'"
-msgstr "Nieprawidłowy adres URL licencji \"%s\""
+msgstr "Błędny URL licencji '%s'"
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
 #: actions/postnotice.php:66
 msgid "Invalid notice content"
-msgstr "Nieprawidłowa zawartość wpisu"
+msgstr "Błędna zawartość wpisu"
 
 #: ../actions/postnotice.php:67 actions/postnotice.php:68
 #: actions/postnotice.php:72
 msgid "Invalid notice uri"
-msgstr "Nieprawidłowy adres URI wpisu"
+msgstr "Błędny URI wpisu"
 
 #: ../actions/postnotice.php:72 actions/postnotice.php:73
 #: actions/postnotice.php:77
 msgid "Invalid notice url"
-msgstr "Nieprawidłowy adres URL wpisu"
+msgstr "Błędny URL wpisu"
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91 actions/updateprofile.php:93
+#: actions/updateprofile.php:91
 #, php-format
 msgid "Invalid profile URL '%s'."
-msgstr "Nieprawidłowy adres URL profilu \"%s\"."
+msgstr "Błędny URL profilu '%s'."
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
 #: actions/remotesubscribe.php:135
 msgid "Invalid profile URL (bad format)"
-msgstr "Nieprawidłowy adres URL profilu (błędny format)"
+msgstr "Błędny URL profilu (zły format)"
 
 #: ../actions/finishremotesubscribe.php:77
 #: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
 msgid "Invalid profile URL returned by server."
-msgstr "Nieprawidłowy adres URL profilu zwrócony przez serwer."
+msgstr "Błędny URL profilu zwrócony przez serwer."
 
 #: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 #: actions/avatarbynickname.php:69
 msgid "Invalid size."
-msgstr "Nieprawidłowy rozmiar."
+msgstr "Niepoprawny rozmiar."
 
 #: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
 #: ../actions/register.php:111 actions/finishopenidlogin.php:241
 #: actions/register.php:103 actions/register.php:121
 #: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/register.php:211
 msgid "Invalid username or password."
-msgstr "Nieprawidłowa nazwa użytkownika lub hasło."
+msgstr "Błędna nazwa użytkownika lub hasło."
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+#, fuzzy
 msgid "Invitation(s) sent"
-msgstr "Wysłano zaproszenia"
+msgstr "Zaproszenie(a) wysłane"
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
 msgid "Invitation(s) sent to the following people:"
-msgstr "Wysłano zaproszenia do następujących osób:"
+msgstr "Zaproszenia zostały wysłane do następujących osób:"
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103 lib/facebookaction.php:220
+#: lib/subgroupnav.php:103
 msgid "Invite"
 msgstr "Zaproś"
 
@@ -1196,16 +1118,16 @@ msgstr "Zaproś"
 msgid "Invite new users"
 msgstr "Zaproś nowych użytkowników"
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
 #, php-format
 msgid ""
 "It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
 "s, available under the [GNU Affero General Public License](http://www.fsf."
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
-"Działa pod kontrolą oprogramowania do mikroblogowania [Laconica](http://"
-"laconi.ca/) w wersji %s, dostępnego na [Powszechnej Licencji Publicznej GNU "
-"Affero](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"Działa pod kontrolą  oprogramowania [Laconica](http://laconi.ca/) służącego "
+"do prowadzenia mikroblogów, w wersji %s, dostępnego na licencji [GNU Affero "
+"General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
 #: actions/imsettings.php:296
@@ -1213,15 +1135,13 @@ msgid "Jabber ID already belongs to another user."
 msgstr "Identyfikator Jabbera należy już do innego użytkownika."
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
-#: actions/imsettings.php:120
 #, 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 ""
-"Adres Jabbera lub GTalk, taki jak \"NazwaUżytkownika@przykład.org\". "
-"Najpierw upewnij się, że dodałeś %s do listy znajomych w komunikatorze lub "
-"na GTalk."
+"Adres Jabbera lub GTalka w postaci \"Użytkownik@przykladowadomena.org\". Nie "
+"zapomnij dodać %s do listy znajomych w swoim komunikatorze lub panelu GTalka."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
 #: actions/profilesettings.php:128
@@ -1231,108 +1151,104 @@ msgstr "Język"
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
 #: actions/profilesettings.php:217
 msgid "Language is too long (max 50 chars)."
-msgstr "Język jest za długi (maksymalnie 50 znaków)."
+msgstr ""
 
 #: ../actions/profilesettings.php:52 ../actions/register.php:173
 #: actions/profilesettings.php:85 actions/register.php:187
 #: actions/profilesettings.php:117 actions/register.php:408
 #: actions/showgroup.php:244 actions/showstream.php:271
 #: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125 actions/showgroup.php:246
-#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
+#: lib/profilelist.php:125
 msgid "Location"
-msgstr "Położenie"
+msgstr "Lokalizacja"
 
 #: ../actions/profilesettings.php:104 ../actions/register.php:85
 #: ../actions/updateprofile.php:108 actions/profilesettings.php:219
 #: actions/register.php:92 actions/updateprofile.php:109
 #: actions/editgroup.php:201 actions/newgroup.php:152
 #: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112 actions/updateprofile.php:114
+#: actions/updateprofile.php:112
 msgid "Location is too long (max 255 chars)."
-msgstr "Położenie jest za długie (maksymalnie 255 znaków)."
+msgstr "Lokalizacja jest za długa (max. 255 znaków)."
 
 #: ../actions/login.php:97 ../actions/login.php:106
 #: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
 #: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
 #: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
 #: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
-#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
-#: lib/facebookaction.php:293 lib/facebookaction.php:319
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75
 #, php-format
 msgid "Login"
-msgstr "Zaloguj się"
+msgstr "Login"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62 actions/openidlogin.php:70
+#: actions/openidlogin.php:62
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Zaloguj się za pomocą konta [OpenID](%%doc.openid%%)."
+msgstr "Zaloguj się używając konta  [OpenID](%%doc.openid%%)."
 
-#: ../actions/login.php:126 actions/login.php:251
+#: ../actions/login.php:126
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
 "(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
 "%). "
 msgstr ""
-"Zaloguj się za pomocą nazwy użytkownika i hasła. Nie masz ich jeszcze? "
-"[Zarejestruj](%%action.register%%) nowe konto lub wypróbuj [OpenID](%%action."
-"openidlogin%%). "
+"Zaloguj się używając nazwy użytkownika i hasła. Nie masz ich jeszcze? "
+"[Zarejestruj się](%%action.register%%) i utwórz konto, albo użyj swojego "
+"[OpenID](%%action.openidlogin%%)."
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
 msgid "Logout"
-msgstr "Wyloguj się"
+msgstr "Wyloguj"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393
 msgid "Longer name, preferably your \"real\" name"
-msgstr "Dłuższa nazwa, najlepiej twoje \"prawdziwe\" nazwisko"
+msgstr ""
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:320
 msgid "Lost or forgotten password?"
-msgstr "Zgubione lub zapomniane hasło?"
+msgstr "Zgubione hasło?"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
-#: actions/emailsettings.php:139 actions/smssettings.php:150
 msgid "Make a new email address for posting to; cancels the old one."
-msgstr "Używaj nowego adresu e-mail do wysyłania; anuluj stary."
+msgstr ""
 
 #: ../actions/emailsettings.php:27 actions/emailsettings.php:27
 #: actions/emailsettings.php:71
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
-msgstr "Zarządzaj, jak otrzymywać wiadomości e-mail od %%site.name%%."
+msgstr "Zarządzaj tym, jak dostajesz wiadomości e-mail od %%site.name%%."
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
 #: actions/showstream.php:480
 msgid "Member since"
-msgstr "Członek od"
+msgstr "W serwisie od"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
 #, php-format
 msgid "Microblog by %s"
-msgstr "Mikroblog użytkownika %s"
+msgstr "%s – mikroblog"
 
-#: ../actions/smssettings.php:304 actions/smssettings.php:464
+#: ../actions/smssettings.php:304
 #, php-format
+#, fuzzy
 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 ""
-"Operator komórkowy Twojego telefonu. Jeśli znasz operatora, który akceptuje "
-"wiadomości SMS przez e-mail, a nie znajduje się na liście, wyślij wiadomość "
-"e-mail na %s (w języku angielskim), aby nam o tym powiedzieć."
+"Operator komórkowy Twojego telefonu. Jeżeli znasz operatora, który akceptuje "
+"SMS za pośrednictwem e-mail ale nie jest tu wymieniony, poinformuj nas "
+"wysyłając e-mail na %s."
 
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
-#: actions/register.php:430
 msgid "My text and files are available under "
-msgstr "Moje teksty i pliki są dostępne na "
+msgstr "Moje teksty i pliki są widoczne pod"
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 #: actions/emailsettings.php:83 actions/smssettings.php:91
@@ -1346,10 +1262,10 @@ msgid "New email address for posting to %s"
 msgstr "Nowy adres e-mail do wysyłania do %s"
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465 actions/emailsettings.php:472
-#: actions/smssettings.php:542
+#: actions/emailsettings.php:465
+#, fuzzy
 msgid "New incoming email address added."
-msgstr "Dodano nowy przychodzący adres e-mail."
+msgstr "Nowy przychodzący adres e-mail został dodany."
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
 #: actions/finishopenidlogin.php:99
@@ -1367,9 +1283,9 @@ msgstr "Nowy wpis"
 msgid "New password"
 msgstr "Nowe hasło"
 
-#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
+#: ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
-msgstr "Pomyślnie zapisano nowe hasło. Jesteś teraz zalogowany."
+msgstr "Nowe hasło zapisano pomyślnie. Możesz się zalogować."
 
 #: ../actions/login.php:101 ../actions/profilesettings.php:41
 #: ../actions/register.php:151 actions/login.php:101
@@ -1377,9 +1293,7 @@ msgstr "Pomyślnie zapisano nowe hasło. Jesteś teraz zalogowany."
 #: actions/login.php:228 actions/profilesettings.php:98
 #: actions/register.php:367 actions/showgroup.php:224
 #: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
-#: actions/showgroup.php:226 actions/showstream.php:244
-#: actions/tagother.php:94 lib/facebookaction.php:312
+#: lib/facebookaction.php:308 lib/groupeditform.php:137
 msgid "Nickname"
 msgstr "Pseudonim"
 
@@ -1390,23 +1304,21 @@ msgstr "Pseudonim"
 #: actions/newgroup.php:134 actions/profilesettings.php:214
 #: actions/register.php:159
 msgid "Nickname already in use. Try another one."
-msgstr "Pseudonim jest już używany. Spróbuj innego."
+msgstr "Ten pseudonim jest już w użyciu. Wybierz inny."
 
 #: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
 #: ../actions/register.php:67 ../actions/updateprofile.php:77
 #: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
 #: actions/register.php:74 actions/updateprofile.php:78
 #: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81 actions/editgroup.php:179
-#: actions/newgroup.php:130 actions/register.php:156
-#: actions/updateprofile.php:83
+#: actions/updateprofile.php:81
 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."
+msgstr "Pseudonim musi zawierać tylko małe litery i cyfry, bez znaków spacji."
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
 #: actions/finishopenidlogin.php:210
 msgid "Nickname not allowed."
-msgstr "Niedozwolony pseudonim."
+msgstr "Pseudonim niedozwolony."
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
 #: actions/remotesubscribe.php:106
@@ -1416,11 +1328,11 @@ msgstr "Pseudonim użytkownika którego chcesz obserwować"
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
 #: actions/recoverpassword.php:186
 msgid "Nickname or email"
-msgstr "Pseudonim lub adres e-mail"
+msgstr "Pseudonim lub e-mail"
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
-#: actions/deletenotice.php:116
+#, fuzzy
 msgid "No"
 msgstr "Nie"
 
@@ -1432,8 +1344,9 @@ msgstr "Brak identyfikatora Jabbera."
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
 #: actions/userauthorization.php:153
 msgid "No authorization request!"
-msgstr "Brak żądania upoważnienia!"
+msgstr "Brak żądania autoryzacji!"
 
+# If it's regarding mobile carrier, then translation is relevant. Skip it otherwise.
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
 #: actions/smssettings.php:299
 msgid "No carrier selected."
@@ -1442,7 +1355,7 @@ msgstr "Nie wybrano operatora."
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
 #: actions/smssettings.php:486
 msgid "No code entered"
-msgstr "Nie podano kodu"
+msgstr "Nie wprowadzono kodu"
 
 #: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 #: actions/confirmaddress.php:75
@@ -1452,12 +1365,11 @@ msgstr "Brak kodu potwierdzającego."
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
-#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
 msgid "No content!"
 msgstr "Brak zawartości!"
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:304
 msgid "No email address."
 msgstr "Brak adresu e-mail."
 
@@ -1466,15 +1378,15 @@ msgid "No id."
 msgstr "Brak identyfikatora."
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430 actions/emailsettings.php:437
-#: actions/smssettings.php:505
+#: actions/emailsettings.php:430
+#, fuzzy
 msgid "No incoming email address."
 msgstr "Brak przychodzącego adresu e-mail."
 
 #: ../actions/finishremotesubscribe.php:65
 #: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
 msgid "No nickname provided by remote server."
-msgstr "Zdalny serwer nie dostarczył pseudonimu."
+msgstr "Zdalny serwer nie wysłał pseudonimu."
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
@@ -1485,7 +1397,7 @@ msgstr "Brak pseudonimu."
 #: ../actions/smssettings.php:229 actions/emailsettings.php:240
 #: actions/imsettings.php:214 actions/smssettings.php:237
 #: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358 actions/emailsettings.php:370
+#: actions/smssettings.php:358
 msgid "No pending confirmation to cancel."
 msgstr "Brak oczekujących potwierdzeń do anulowania."
 
@@ -1497,12 +1409,12 @@ msgstr "Brak numeru telefonu."
 #: ../actions/finishremotesubscribe.php:72
 #: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
 msgid "No profile URL returned by server."
-msgstr "Serwer nie zwrócił adresu URL profilu."
+msgstr "Serwer nie zwrócił żadnego URL-a."
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
 #: actions/recoverpassword.php:266
 msgid "No registered email address for that user."
-msgstr "Brak zarejestrowanych adresów e-mail dla tego użytkownika."
+msgstr "Brak zarejestrowanych adresów e-mailowych dla tego użytkownika."
 
 #: ../actions/userauthorization.php:49 actions/userauthorization.php:55
 #: actions/userauthorization.php:57
@@ -1512,52 +1424,51 @@ msgstr "Nie znaleziono żądania!"
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
 #: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85 actions/noticesearch.php:117
+#: actions/peoplesearch.php:85
 msgid "No results"
 msgstr "Brak wyników"
 
 #: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
 #: actions/avatarbynickname.php:64
 msgid "No size."
-msgstr "Brak rozmiaru."
+msgstr "Zerowy rozmiar."
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
-#: actions/twitapistatuses.php:470
+#: actions/twitapistatuses.php:446
 msgid "No status found with that ID."
-msgstr "Nie znaleziono statusów z tym identyfikatorem."
+msgstr ""
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
+#: actions/twitapistatuses.php:418
 msgid "No status with that ID found."
-msgstr "Nie znaleziono statusów z tym identyfikatorem."
+msgstr ""
 
 #: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 #: actions/openidsettings.php:222
 msgid "No such OpenID."
-msgstr "Nie ma takiego identyfikatora OpenID."
+msgstr "Brak takiego identyfikatora OpenID."
 
 #: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
 msgid "No such document."
-msgstr "Nie ma takiego dokumentu."
+msgstr "Brak takiego dokumentu."
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30 actions/shownotice.php:32
 #: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
 #: lib/deleteaction.php:51
 msgid "No such notice."
-msgstr "Nie ma takiego wpisu."
+msgstr "Brak takiego wpisu."
 
 #: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
 #: actions/recoverpassword.php:62
 msgid "No such recovery code."
-msgstr "Nie ma takiego kodu przywracania."
+msgstr "Brak takiego kodu przywracania."
 
 #: ../actions/postnotice.php:56 actions/postnotice.php:57
 #: actions/postnotice.php:60
 msgid "No such subscription"
-msgstr "Nie ma takiej subskrypcji"
+msgstr "Nie ma takiej obserwacji"
 
 #: ../actions/all.php:34 ../actions/allrss.php:35
 #: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
@@ -1583,16 +1494,15 @@ msgstr "Nie ma takiej subskrypcji"
 #: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
 #: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
 #: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
-#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
-#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
+#: lib/subs.php:34 lib/subs.php:109
 msgid "No such user."
 msgstr "Brak takiego użytkownika."
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
 #: actions/recoverpassword.php:251
+#, fuzzy
 msgid "No user with that email address or username."
-msgstr "Brak użytkownika z tym adresem e-mail lub nazwą użytkownika."
+msgstr "Brak użytkownika z takim adresem e-mail lub nazwą."
 
 #: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
@@ -1606,66 +1516,64 @@ msgstr "To nie jest kod przywracania."
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
 #: scripts/maildaemon.php:53
 msgid "Not a registered user."
-msgstr "To nie jest zarejestrowany użytkownik."
+msgstr ""
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
 #: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
 #: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
-#: lib/twitterapi.php:601
+#: lib/twitterapi.php:566
 msgid "Not a supported data format."
-msgstr "To nie jest obsługiwany format danych."
+msgstr "Niewspierany format daty."
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
 #: actions/imsettings.php:290
 msgid "Not a valid Jabber ID"
-msgstr "To nie jest prawidłowy identyfikator Jabbera"
+msgstr "Niepoprawny identyfikator Jabbera"
 
 #: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
-#: lib/openid.php:143
 msgid "Not a valid OpenID."
-msgstr "To nie jest prawidłowy identyfikator OpenID."
+msgstr "Niepoprawny identyfikator OpenID."
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:315
 msgid "Not a valid email address"
-msgstr "To nie jest prawidłowy adres e-mail"
+msgstr "Niepoprawny adres e-mail."
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
 msgid "Not a valid email address."
-msgstr "To nie jest prawidłowy adres e-mail."
+msgstr "Niewłaściwy adres e-mailowy."
 
 #: ../actions/profilesettings.php:91 ../actions/register.php:71
 #: actions/profilesettings.php:206 actions/register.php:78
 #: actions/editgroup.php:186 actions/newgroup.php:137
 #: actions/profilesettings.php:195 actions/register.php:161
 msgid "Not a valid nickname."
-msgstr "To nie jest prawidłowy pseudonim."
+msgstr "Niewłaściwy pseudonim."
 
 #: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
 #: actions/remotesubscribe.php:159
 msgid "Not a valid profile URL (incorrect services)."
-msgstr "To nie jest prawidłowy adres URL profilu (niepoprawne usługi)."
+msgstr "Błędny URL profilu (niepoprawne usługi)"
 
 #: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
 #: actions/remotesubscribe.php:152
 msgid "Not a valid profile URL (no XRDS defined)."
-msgstr "To nie jest prawidłowy adres URL profilu (nie podano XRDS)."
+msgstr "Błędny URL profilu (nie zdefiniowany XRDS)"
 
 #: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
 #: actions/remotesubscribe.php:143
 msgid "Not a valid profile URL (no YADIS document)."
-msgstr "To nie jest prawidłowy adres URL profilu (brak dokumentu YADIS)."
+msgstr "Błędny URL profilu (brak dokumentu YADIS)"
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87 lib/imagefile.php:90
+#: lib/imagefile.php:87
 msgid "Not an image or corrupt file."
-msgstr "To nie jest obraz lub lub plik jest uszkodzony."
+msgstr "Brak obrazka lub plik uszkodzony."
 
 #: ../actions/finishremotesubscribe.php:51
 #: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
 msgid "Not authorized."
-msgstr "Brak upoważnienia."
+msgstr "Brak autoryzacji."
 
 #: ../actions/finishremotesubscribe.php:38
 #: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
@@ -1673,7 +1581,7 @@ msgid "Not expecting this response!"
 msgstr "Nieoczekiwana odpowiedź!"
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
+#: actions/twitapistatuses.php:309
 msgid "Not found"
 msgstr "Nie znaleziono"
 
@@ -1689,18 +1597,19 @@ msgstr "Nie znaleziono"
 #: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
 #: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
 #: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72 actions/newmessage.php:87
+#: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Niezalogowany."
 
 #: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
 msgid "Not subscribed!."
-msgstr "Nie zasubskrybowane!"
+msgstr "Nie obserwujesz!."
 
 #: ../actions/opensearch.php:35 actions/opensearch.php:35
 #: actions/opensearch.php:67
+#, fuzzy
 msgid "Notice Search"
-msgstr "Wyszukiwanie wpisów"
+msgstr "Przeszukuj wpisy"
 
 #: ../actions/showstream.php:82 actions/showstream.php:82
 #: actions/showstream.php:180 actions/showstream.php:187
@@ -1712,19 +1621,19 @@ msgstr "Kanał wpisów dla %s"
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
 #: actions/shownotice.php:94
 msgid "Notice has no profile"
-msgstr "Wpis nie posiada profilu"
+msgstr "Wpis nie ma przypisanego profilu"
 
 #: ../actions/showstream.php:316 actions/showstream.php:331
 #: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
+#: lib/noticelist.php:87
 msgid "Notices"
 msgstr "Wpisy"
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49
+#: actions/tag.php:81 actions/tag.php:41
 #, php-format
 msgid "Notices tagged with %s"
-msgstr "Wpisy ze znacznikiem %s"
+msgstr "Wpisy otagowane %s"
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
 #: actions/passwordsettings.php:97
@@ -1733,7 +1642,7 @@ msgstr "Stare hasło"
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
 #: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81 lib/action.php:418
+#: lib/logingroupnav.php:81
 msgid "OpenID"
 msgstr "OpenID"
 
@@ -1743,43 +1652,39 @@ msgid "OpenID Account Setup"
 msgstr "Ustawienia konta OpenID"
 
 #: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-#: lib/openid.php:269
 msgid "OpenID Auto-Submit"
-msgstr "Automatyczne wysłanie OpenID"
+msgstr "Automatyczne zatwierdzanie OpenID"
 
 #: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 #: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-#: actions/openidlogin.php:89
 msgid "OpenID Login"
-msgstr "Login OpenID"
+msgstr "Użytkownik OpenID"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
 #: actions/openidlogin.php:102 actions/openidsettings.php:101
-#: actions/openidlogin.php:111
 msgid "OpenID URL"
-msgstr "Adres URL identyfikatora OpenID"
+msgstr "URL usługi OpenID"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 #: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 #: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
 msgid "OpenID authentication cancelled."
-msgstr "Anulowano uwierzytelnienie OpenID."
+msgstr "Uwiarygadnianie OpenID przerwane."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
 #, php-format
 msgid "OpenID authentication failed: %s"
-msgstr "Uwierzytelnienie OpenID nie powiodło się: %s"
+msgstr "Uwiarygadnianie OpenID nie powiodło się: %s"
 
 #: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
-#: lib/openid.php:145
 #, php-format
 msgid "OpenID failure: %s"
-msgstr "Niepowodzenie OpenID: %s"
+msgstr "Awaria OpenID: %s"
 
 #: ../actions/openidsettings.php:144 actions/openidsettings.php:153
 #: actions/openidsettings.php:231
@@ -1792,14 +1697,13 @@ msgid "OpenID settings"
 msgstr "Ustawienia OpenID"
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-#: actions/invite.php:186
 msgid "Optionally add a personal message to the invitation."
-msgstr "Opcjonalnie dodaj osobistą wiadomość do zaproszenia."
+msgstr "Opcjonalnie do zaproszenia możesz dodać wiadomość od siebie."
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75 lib/imagefile.php:79
+#: lib/imagefile.php:75
 msgid "Partial upload."
-msgstr "Częściowo wysłano."
+msgstr "Częściowa wysyłka."
 
 #: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
 #: ../actions/register.php:153 ../lib/settingsaction.php:93
@@ -1807,68 +1711,64 @@ msgstr "Częściowo wysłano."
 #: actions/register.php:167 actions/finishopenidlogin.php:118
 #: actions/login.php:231 actions/register.php:372
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
-#: actions/login.php:214 lib/facebookaction.php:315
 msgid "Password"
 msgstr "Hasło"
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
 #: actions/recoverpassword.php:335
 msgid "Password and confirmation do not match."
-msgstr "Hasło i potwierdzenie nie pasują do siebie."
+msgstr "Hasło i jego potwierdzenie nie pasują do siebie."
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
 #: actions/recoverpassword.php:331
 msgid "Password must be 6 chars or more."
-msgstr "Hasło musi mieć sześć lub więcej znaków."
+msgstr "Hasło musi mieć 6 lub więcej znaków."
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 #: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:301
 msgid "Password recovery requested"
-msgstr "Zażądano przywracania hasła"
+msgstr "Zażądano odzyskania hasła"
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
 #: actions/profilesettings.php:408 actions/recoverpassword.php:326
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-#: actions/passwordsettings.php:178
 msgid "Password saved."
-msgstr "Zapisano hasło."
+msgstr "Hasło zostało zapisane."
 
 #: ../actions/password.php:61 ../actions/register.php:88
 #: actions/profilesettings.php:380 actions/register.php:98
 #: actions/passwordsettings.php:145 actions/register.php:183
-#: actions/passwordsettings.php:150
 msgid "Passwords don't match."
-msgstr "Hasła nie pasują do siebie."
+msgstr "Podane hasła nie pasują do siebie."
 
 #: ../lib/searchaction.php:100 lib/searchaction.php:100
 #: lib/searchgroupnav.php:80
 msgid "People"
-msgstr "Osoby"
+msgstr "Ludzie"
 
 #: ../actions/opensearch.php:33 actions/opensearch.php:33
 #: actions/opensearch.php:64
 msgid "People Search"
-msgstr "Wyszukiwanie osób"
+msgstr "Szukaj ludzi"
 
 #: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
 #: actions/peoplesearch.php:58
 msgid "People search"
-msgstr "Wyszukiwanie osób"
+msgstr "Szukaj ludzi"
 
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
 msgid "Personal"
 msgstr "Osobiste"
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-#: actions/invite.php:184
 msgid "Personal message"
-msgstr "Osobista wiadomość"
+msgstr "Wiadomość osobista"
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
-#: actions/smssettings.php:128
 msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "Numer telefonu, bez znaków przestankowych i spacji, z kodem państwa"
+msgstr ""
+"Numer telefonu z numerem kierunkowym, bez znaków przestankowych i spacji."
 
 #: ../actions/userauthorization.php:78
 msgid ""
@@ -1876,20 +1776,21 @@ msgid ""
 "user's notices. If you didn't just ask to subscribe to someone's notices, "
 "click \"Cancel\"."
 msgstr ""
-"Sprawdź te szczegóły, aby upewnić się, czy chcesz subskrybować wpisy tego "
-"użytkownika. Jeśli nie chcesz, po prostu naciśnij \"Anuluj\"."
+"Sprawdź proszę poniższe informacje, aby upewnić się czy na pewno chcesz "
+"obserwować wpisy tego użytkownika. Jeżeli to pomyłka lub chodziło o kogoś "
+"innego kliknij \"Anuluj\"."
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
 #: actions/imsettings.php:142
 msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "Wyślij wpis, kiedy zmieni się mój status na Jabberze/GTalk."
+msgstr "Utwórz wpis kiedy zmieni się status na komunikatorze."
 
 #: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
 #: ../actions/smssettings.php:94 actions/emailsettings.php:86
 #: actions/imsettings.php:68 actions/smssettings.php:94
 #: actions/twittersettings.php:70 actions/emailsettings.php:147
 #: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134 actions/twittersettings.php:137
+#: actions/twittersettings.php:134
 msgid "Preferences"
 msgstr "Preferencje"
 
@@ -1898,24 +1799,22 @@ msgstr "Preferencje"
 #: actions/imsettings.php:152 actions/smssettings.php:171
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
-#: actions/emailsettings.php:293
 msgid "Preferences saved."
-msgstr "Zapisano preferencje."
+msgstr "Preferencje zostały zapisane."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
 #: actions/profilesettings.php:129
 msgid "Preferred language"
 msgstr "Preferowany język"
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
 msgid "Privacy"
 msgstr "Prywatność"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
-#: classes/Notice.php:178 classes/Notice.php:188
 msgid "Problem saving notice."
-msgstr "Problem podczas zapisywania wpisu."
+msgstr "Problem z zachowywaniem wpisu."
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
@@ -1926,7 +1825,7 @@ msgstr "Profil"
 #: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
 #: actions/remotesubscribe.php:109
 msgid "Profile URL"
-msgstr "Adres URL profilu"
+msgstr "URL profilu"
 
 #: ../actions/profilesettings.php:34 actions/profilesettings.php:32
 #: actions/profilesettings.php:58
@@ -1936,33 +1835,32 @@ msgstr "Ustawienia profilu"
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
 #: actions/postnotice.php:52 actions/updateprofile.php:53
 #: actions/postnotice.php:55 actions/updateprofile.php:56
-#: actions/updateprofile.php:58
 msgid "Profile unknown"
 msgstr "Nieznany profil"
 
 #: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
 msgid "Public Stream Feed"
-msgstr "Kanał publicznego strumienia"
+msgstr "Publiczny Kanał Strumieni"
 
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
+#: lib/publicgroupnav.php:77
 msgid "Public timeline"
 msgstr "Publiczna oś czasu"
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
 #: actions/imsettings.php:153
 msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Opublikuj MicroID adresu Jabbera/GTalk."
+msgstr "Publikuj MicroID dla mojego adresu Jabber/GTalk."
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:178
 msgid "Publish a MicroID for my email address."
-msgstr "Opublikuj MicroID adresu e-mail."
+msgstr "Opublikuj MicroID dla mojego adresu e-mail."
 
 #: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
 #: actions/tag.php:76
 msgid "Recent Tags"
-msgstr "Ostatnie znaczniki"
+msgstr "Najnowsze tagi"
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
 #: actions/recoverpassword.php:190
@@ -1972,30 +1870,30 @@ msgstr "Przywróć"
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
 #: actions/recoverpassword.php:198
 msgid "Recover password"
-msgstr "Przywróć hasło"
+msgstr "Odzyskiwanie hasła"
 
 #: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
 #: actions/recoverpassword.php:73
 msgid "Recovery code for unknown user."
-msgstr "Kod przywracania dla nieznanego użytkownika."
+msgstr "Kod przywracający dla nieznanego użytkownika."
 
 #: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
 #: actions/register.php:152 actions/register.php:207 lib/util.php:328
 #: actions/register.php:69 actions/register.php:436 lib/action.php:338
 #: lib/facebookaction.php:277 lib/logingroupnav.php:78
-#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
 msgid "Register"
-msgstr "Zarejestruj się"
+msgstr "Zarejestruj"
 
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
+#, fuzzy
 msgid "Registration not allowed."
-msgstr "Rejestracja nie jest dozwolona."
+msgstr "Rejestracja niedozwolona. "
 
 #: ../actions/register.php:200 actions/register.php:214
 #: actions/register.php:67
 msgid "Registration successful"
-msgstr "Rejestracja powiodła się"
+msgstr "Rejestracja zakończona powodzeniem"
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
 #: actions/userauthorization.php:144
@@ -2004,19 +1902,19 @@ msgstr "Odrzuć"
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:414
 msgid "Remember me"
-msgstr "Zapamiętaj mnie"
+msgstr "Pamiętaj mnie"
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74 actions/updateprofile.php:76
+#: actions/updateprofile.php:74
 msgid "Remote profile with no matching profile"
-msgstr "Zdalny profil bez odpowiadającego profilu"
+msgstr "Zdalny profil bez odpowiadającego profilu lokalnego"
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
 #: actions/remotesubscribe.php:88
 msgid "Remote subscribe"
-msgstr "Zasubskrybuj zdalnie"
+msgstr "Zdalna subskrypcja"
 
 #: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
@@ -2028,22 +1926,21 @@ msgstr "Zasubskrybuj zdalnie"
 #: actions/emailsettings.php:134 actions/imsettings.php:102
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
-#: actions/twittersettings.php:118
 msgid "Remove"
 msgstr "Usuń"
 
 #: ../actions/openidsettings.php:68 actions/openidsettings.php:69
 #: actions/openidsettings.php:123
 msgid "Remove OpenID"
-msgstr "Usuń identyfikator OpenID"
+msgstr "Usuń konto OpenID"
 
-#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
+#: ../actions/openidsettings.php:73
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 msgstr ""
-"Usunięcie jedynego identyfikatora OpenID uniemożliwi zalogowanie się! Jeśli "
-"musisz je usunąć, dodaj najpierw inne."
+"Usunięcie jedynego konta OpenID uniemożliwi dalsze logowanie! Jeśli musisz "
+"je usunąć dodaj wcześniej jakieś inne."
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
 msgid "Replies"
@@ -2052,7 +1949,7 @@ msgstr "Odpowiedzi"
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
 #: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #: actions/replies.php:116 actions/repliesrss.php:67
-#: lib/personalgroupnav.php:104 actions/replies.php:118
+#: lib/personalgroupnav.php:104
 #, php-format
 msgid "Replies to %s"
 msgstr "Odpowiedzi na %s"
@@ -2060,16 +1957,15 @@ msgstr "Odpowiedzi na %s"
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
 #: actions/recoverpassword.php:223
 msgid "Reset"
-msgstr "Przywróć"
+msgstr "Wyzeruj"
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
 #: actions/recoverpassword.php:197
 msgid "Reset password"
-msgstr "Przywróć hasło"
+msgstr "Ustaw ponownie hasło"
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-#: actions/subscriptions.php:125
 msgid "SMS"
 msgstr "SMS"
 
@@ -2083,19 +1979,19 @@ msgstr "Numer telefonu SMS"
 msgid "SMS Settings"
 msgstr "Ustawienia SMS"
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
 msgid "SMS confirmation"
 msgstr "Potwierdzenie SMS"
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
 #: actions/recoverpassword.php:222
 msgid "Same as password above"
-msgstr "Takie samo jak powyższe hasło"
+msgstr "Takie samo jak hasło wprowadzone powyżej"
 
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377
 msgid "Same as password above. Required."
-msgstr "Takie samo jak powyższe hasło. Wymagane."
+msgstr "Takie samo jak hasło powyżej. Wymagane."
 
 #: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
 #: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
@@ -2106,41 +2002,39 @@ msgstr "Takie samo jak powyższe hasło. Wymagane."
 #: actions/othersettings.php:117 actions/profilesettings.php:150
 #: actions/smssettings.php:169 actions/subscriptions.php:124
 #: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171 actions/emailsettings.php:187
-#: actions/subscriptions.php:126 actions/tagother.php:154
-#: actions/twittersettings.php:164
+#: lib/groupeditform.php:171
 msgid "Save"
 msgstr "Zapisz"
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325 lib/action.php:396
+#: lib/util.php:316 lib/action.php:325
 msgid "Search"
-msgstr "Znajdź"
+msgstr "Szukaj"
 
 #: ../actions/noticesearch.php:80 actions/noticesearch.php:85
 #: actions/noticesearch.php:127
 msgid "Search Stream Feed"
-msgstr "Znajdź kanał strumienia"
+msgstr "Szukaj Kanału Strumieni"
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57 actions/noticesearch.php:68
+#: actions/noticesearch.php:57
 #, 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 ""
-"Znajdź wpisy na %%site.name%% według ich zawartości. Oddziel wyszukiwane "
-"terminy spacjami. Terminy muszą mieć trzy znaki lub więcej."
+"Wyszukiwanie w treści wpisów w serwisie %%site.name%%. Użyj spacji aby "
+"oddzielić elementy wyszukiwania. Słowa muszą mieć minimum 3 znaki."
 
-#: ../actions/peoplesearch.php:28 actions/peoplesearch.php:52
+#: ../actions/peoplesearch.php:28
 #, 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 ""
-"Znajdź osoby na %%site.name%% według ich nazwiska, położenia lub "
-"zainteresowań. Oddziel wyszukiwane terminy spacjami. Terminy muszą mieć trzy "
-"znaki lub więcej."
+"Szukaj ludzi w serwisie %%site.name%%. Kryteriami mogą być imiona i "
+"nazwiska, miejscowości lub zainteresowania. Użyj spacji aby oddzielić "
+"elementy wyszukiwania. Słowa muszą mieć minimum 3 znaki."
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
 #: actions/smssettings.php:457
@@ -2149,8 +2043,7 @@ msgstr "Wybierz operatora"
 
 #: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
 #: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
-#: lib/messageform.php:165
+#: lib/messageform.php:167 lib/noticeform.php:177
 msgid "Send"
 msgstr "Wyślij"
 
@@ -2158,51 +2051,45 @@ msgstr "Wyślij"
 #: actions/emailsettings.php:74 actions/smssettings.php:82
 #: actions/emailsettings.php:132 actions/smssettings.php:145
 msgid "Send email to this address to post new notices."
-msgstr "Wyślij wiadomość e-mail na ten adres, aby wysyłać nowe wpisy."
+msgstr "Wyślij wiadomość e-mail na ten adres by wysłać nowy wpis."
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
 #: actions/emailsettings.php:152
 msgid "Send me notices of new subscriptions through email."
-msgstr "Wyślij mi wpisy nowych subskrypcji przez e-mail."
+msgstr "Wyślij mi powiadomienia o nowych subskrypcjach za pośrednictwem e-mail."
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
 #: actions/imsettings.php:137
 msgid "Send me notices through Jabber/GTalk."
-msgstr "Wyślij mi wpisy przez Jabbera/GTalk."
+msgstr "Wysyłaj mi wpisy przez Jabbera/GTalka"
 
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
-#: actions/smssettings.php:162
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
-"Wyślij mi wpisy przez SMS. Rozumiem, że mogę otrzymywać większe rachunki od "
-"swojego operatora."
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
-#: actions/imsettings.php:147
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
-"Wyślij mi odpowiedzi przez Jabbera/GTalk od osób, których nie subskrybuję."
 
 #: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
-#: lib/facebookaction.php:228
 msgid "Settings"
 msgstr "Ustawienia"
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
 #: actions/profilesettings.php:319
 msgid "Settings saved."
-msgstr "Zapisano ustawienia."
+msgstr "Ustawienia zostały zapisane."
 
 #: ../actions/tag.php:60 actions/tag.php:60
 msgid "Showing most popular tags from the last week"
-msgstr "Wyświetlanie najpopularniejszych znaczników od ostatniego tygodnia"
+msgstr ""
 
 #: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 #: actions/finishaddopenid.php:114
 msgid "Someone else already has this OpenID."
-msgstr "Ktoś inny już posiada ten identyfikator OpenID."
+msgstr "Ktoś inny posługuje się już tym identyfikatorem OpenID."
 
 #: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
 #: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
@@ -2213,28 +2100,27 @@ msgstr "Stało się coś dziwnego."
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
 #: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
-msgstr "Przepraszamy, przychodzący e-mail nie jest dozwolony."
+msgstr ""
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
 #: scripts/maildaemon.php:57
 msgid "Sorry, that is not your incoming email address."
-msgstr "Przepraszamy, to nie jest twój przychodzący adres e-mail."
+msgstr ""
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
 msgid "Source"
 msgstr "Kod źródłowy"
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showstream.php:476
 msgid "Statistics"
 msgstr "Statystyki"
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 #: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 #: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-#: actions/finishopenidlogin.php:295
 msgid "Stored OpenID not found."
-msgstr "Nie znaleziono przechowywanego identyfikatora OpenID."
+msgstr "Nie znaleziono zapisanego konta OpenID."
 
 #: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
 #: ../actions/showstream.php:197 actions/remotesubscribe.php:84
@@ -2242,7 +2128,7 @@ msgstr "Nie znaleziono przechowywanego identyfikatora OpenID."
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139
 msgid "Subscribe"
-msgstr "Zasubskrybuj"
+msgstr "Subskrybuj"
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 #: actions/showstream.php:328 actions/subscribers.php:27
@@ -2252,14 +2138,14 @@ msgid "Subscribers"
 msgstr "Subskrybenci"
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338 actions/userauthorization.php:344
+#: actions/userauthorization.php:338
 msgid "Subscription authorized"
-msgstr "Upoważniono subskrypcję"
+msgstr "Subskrypcja uwierzytelniona"
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349 actions/userauthorization.php:355
+#: actions/userauthorization.php:349
 msgid "Subscription rejected"
-msgstr "Odrzucono subskrypcję"
+msgstr "Subskrypcja odrzucona"
 
 #: ../actions/showstream.php:230 ../actions/showstream.php:307
 #: ../actions/subscriptions.php:27 actions/showstream.php:240
@@ -2270,26 +2156,25 @@ msgid "Subscriptions"
 msgstr "Subskrypcje"
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78 lib/imagefile.php:82
+#: lib/imagefile.php:78
 msgid "System error uploading file."
-msgstr "Błąd systemu podczas wysyłania pliku."
+msgstr "Błąd systemowy podczas wysyłania pliku."
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
 #: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
-#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
-#: actions/tagother.php:209 lib/profilelist.php:160
+#: lib/profilelist.php:164
 msgid "Tags"
-msgstr "Znaczniki"
+msgstr ""
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
 msgid "Text"
-msgstr "Tekst"
+msgstr ""
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67 actions/noticesearch.php:78
+#: actions/noticesearch.php:67
 msgid "Text search"
-msgstr "Znajdź tekst"
+msgstr "Szukaj tekstu"
 
 #: ../actions/openidsettings.php:140 actions/openidsettings.php:149
 #: actions/openidsettings.php:227
@@ -2299,7 +2184,7 @@ msgstr "Ten identyfikator OpenID nie należy do Ciebie."
 #: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
 #: actions/confirmaddress.php:94
 msgid "That address has already been confirmed."
-msgstr "Ten adres został już potwierdzony."
+msgstr "Ten adres został już potwierdzony"
 
 #: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
 #: actions/confirmaddress.php:85
@@ -2307,9 +2192,8 @@ msgid "That confirmation code is not for you!"
 msgstr "Ten kod potwierdzający nie jest przeznaczony dla Ciebie!"
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-#: actions/emailsettings.php:328
 msgid "That email address already belongs to another user."
-msgstr "Ten adres e-mail należy już do innego użytkownika."
+msgstr ""
 
 #: ../actions/avatar.php:80 actions/profilesettings.php:317
 #: lib/imagefile.php:71
@@ -2319,17 +2203,17 @@ msgstr "Ten plik jest za duży."
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
 #: actions/imsettings.php:293
 msgid "That is already your Jabber ID."
-msgstr "Ten identyfikator Jabbera jest już Twój."
+msgstr "Ten identyfikator Jabbera jest już do Ciebie przypisany."
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:318
 msgid "That is already your email address."
-msgstr "Ten adres e-mail jest już Twój."
+msgstr ""
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
 #: actions/smssettings.php:306
 msgid "That is already your phone number."
-msgstr "Ten numer telefonu jest już Twój."
+msgstr ""
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
 #: actions/imsettings.php:381
@@ -2337,117 +2221,109 @@ msgid "That is not your Jabber ID."
 msgstr "To nie jest Twój identyfikator Jabbera."
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:397
 msgid "That is not your email address."
-msgstr "To nie jest Twój adres e-mail."
+msgstr ""
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
 #: actions/smssettings.php:393
 msgid "That is not your phone number."
-msgstr "To nie jest Twój numer telefonu."
+msgstr ""
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 #: actions/emailsettings.php:244 actions/imsettings.php:218
 #: actions/emailsettings.php:367 actions/imsettings.php:349
-#: actions/emailsettings.php:374
 msgid "That is the wrong IM address."
 msgstr "To jest błędny adres komunikatora."
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
 #: actions/smssettings.php:362
 msgid "That is the wrong confirmation number."
-msgstr "To jest błędny numer potwierdzenia."
+msgstr ""
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
 #: actions/smssettings.php:309
 msgid "That phone number already belongs to another user."
-msgstr "Ten numer telefonu należy już do innego użytkownika."
+msgstr ""
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
 #: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-#: actions/newnotice.php:136 actions/twitapistatuses.php:294
-#: lib/facebookaction.php:485
 msgid "That's too long. Max notice size is 140 chars."
-msgstr "Wpis jest za długi. Maksymalna długość to 140 znaków."
+msgstr "Wpis za długi. Maksymalna długość to 140 znaków."
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
+#: actions/twitapiaccount.php:62
 msgid "That's too long. Max notice size is 255 chars."
-msgstr "Wpis jest za długi. Maksymalna długość to 255 znaków."
+msgstr ""
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
-#: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
-msgstr "Adres \"%s\" został potwierdzony dla Twojego konta."
+msgstr "Skojarzony z Twoim kontem adres \"%s\" został potwierdzony."
 
 #: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
 #: ../actions/smssettings.php:274 actions/emailsettings.php:282
 #: actions/imsettings.php:258 actions/smssettings.php:282
 #: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413 actions/emailsettings.php:423
+#: actions/smssettings.php:413
 msgid "The address was removed."
 msgstr "Adres został usunięty."
 
-#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
+#: ../actions/userauthorization.php:312
 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 ""
-"Subskrypcja została upoważniona, ale nie przekazano zwrotnego adresu URL. "
-"Sprawdź w instrukcjach strony, jak upoważnić subskrypcję. Token subskrypcji:"
+"Twoje żądanie obserwacji zostało odrzucone, ale nie przekazano żadnego URL-a "
+"do zwrotnego komunikatu. Sprawdź w instrukcjach serwisu w jaki sposób "
+"dokładnie odbywa się odrzucanie subskrypcji. Twój token subskrypcji to:"
 
-#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
+#: ../actions/userauthorization.php:322
 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 ""
-"Subskrypcja została odrzucona, ale nie przekazano zwrotnego adresu URL. "
-"Sprawdź w instrukcjach strony, jak w pełni odrzucić subskrypcję."
+"Twoje żądanie obserwacji zostało odrzucone, ale nie przekazano żadnego URL-a "
+"do zwrotnego komunikatu. Sprawdź w instrukcjach serwisu w jaki sposób "
+"dokładnie odbywa się odrzucanie subskrypcji."
 
 #: ../actions/subscribers.php:35 actions/subscribers.php:35
-#: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
-msgstr "Osoby obserwujące wpisy użytkownika %s."
+msgstr "Ludzie obserwujący wpisy użytkownika %s."
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
-#: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
-msgstr "Osoby obserwujący Twoje wpisy."
+msgstr "Ludzie obserwujący Twoje wpisy."
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
-#: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose notices %s listens to."
-msgstr "Osoby, których wpisy obserwuje użytkownik %s."
+msgstr "Ludzie, których wpisy obserwuje użytkownik %s."
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-#: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
-msgstr "Osoby, których wpisy obserwujesz."
+msgstr "Ludzie których wpisy obserwujesz."
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
-"Te osoby są już użytkownikami i zostałeś do nich automatycznie "
-"zasubskrybowany:"
 
-#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
+#: ../actions/recoverpassword.php:88
 msgid "This confirmation code is too old. Please start again."
-msgstr "Kod potwierdzający jest za stary. Rozpocznij ponownie."
+msgstr "Kod potwierdzający jest przeterminowany. Zacznij jeszcze raz."
 
-#: ../lib/openid.php:195 lib/openid.php:206
+#: ../lib/openid.php:195
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr ""
-"Ten formularz powinien wysłać się automatycznie. Jeśli tak się nie stanie, "
-"naciśnij przycisk Wyślij, aby przejść do dostawcy OpenID."
+"Ten formularz powinien wysłać się automatycznie. Jeśli tak się nie stanie "
+"kliknij Wyślij, aby przejść do Twojego dostawcy OpenID."
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
 #: actions/finishopenidlogin.php:67
@@ -2457,69 +2333,66 @@ msgid ""
 "to a local account. You can either create a new account, or connect with "
 "your existing account, if you have one."
 msgstr ""
-"Jeżeli logujesz się do %s po raz pierwszy, musimy połączyć identyfikator "
-"OpenID z lokalnym kontem. Można utworzyć nowe konto lub połączyć z "
-"istniejącym, jeśli je posiadasz."
+"Jeżeli logujesz się po raz pierwszy do %s to twoje konto OpenID musi zostać "
+"skojarzone z kontem lokalnym. Możesz więc albo utworzyć nowe konto, albo "
+"połączyć je z posiadanym istniejącym."
 
 #: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
 msgid "This method requires a POST or DELETE."
-msgstr "Ta metoda wymaga POST lub DELETE."
+msgstr ""
 
 #: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
 #: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
 #: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
 #: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
-#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
+#: actions/twitapistatuses.php:244
 msgid "This method requires a POST."
-msgstr "Ta metoda wymaga POST."
+msgstr ""
 
-#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
+#: ../lib/util.php:164 lib/util.php:246
 msgid "This page is not available in a media type you accept"
-msgstr "Ta strona jest niedostępna dla akceptowanego typu medium"
+msgstr "Ta strona nie jest dostępna dla medium, którego typ akceptujesz"
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
 #: actions/profilesettings.php:138
 msgid "Timezone"
-msgstr "Strefa czasowa"
+msgstr ""
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
 #: actions/profilesettings.php:211
 msgid "Timezone not selected."
-msgstr "Nie wybrano strefy czasowej."
+msgstr ""
 
-#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: ../actions/remotesubscribe.php:43
 #, 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 ""
-"Aby zasubskrybować, można [zalogować się](%%action.login%%) lub "
-"[zarejestrować](%%action.register%%) nowe konto. Jeśli już posiadasz konto "
-"na [zgodnej stronie mikroblogowania](%%doc.openmublog%%), podaj poniżej "
-"adres URL profilu."
+"Aby się zapisać możesz się [zalogować](%%action.login%%) lub [zarejestrować]"
+"(%%action.register%%). Jeśli już posiadasz konto w [kompatybilnym serwisie](%"
+"%doc.openmublog%%) wprowadź poniżej identyfikator URL."
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132
 msgid "Two user ids or screen_names must be supplied."
-msgstr "Należy dostarczyć dwa identyfikatory lub nazwy użytkowników."
+msgstr ""
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 #: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109 actions/register.php:398
+#: actions/profilesettings.php:109
 msgid "URL of your homepage, blog, or profile on another site"
-msgstr "Adres URL strony domowej, bloga lub profilu na innej stronie"
+msgstr "URL Twojej strony domowej, bloga, lub profilu na innej stronie"
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
 #: actions/remotesubscribe.php:110
 msgid "URL of your profile on another compatible microblogging service"
-msgstr "Adres URL profilu na innej, zgodnej usłudze mikroblogowania"
+msgstr "URL Twojego profilu na kompatybilnym serwisie do mikroblogów"
 
 #: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
 #: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
@@ -2529,19 +2402,17 @@ msgstr "Adres URL profilu na innej, zgodnej usłudze mikroblogowania"
 #: actions/emailsettings.php:242 actions/grouplogo.php:317
 #: actions/imsettings.php:214 actions/recoverpassword.php:44
 #: actions/smssettings.php:236 actions/twittersettings.php:302
-#: actions/avatarsettings.php:263 actions/emailsettings.php:247
-#: actions/grouplogo.php:324 actions/twittersettings.php:306
 msgid "Unexpected form submission."
-msgstr "Nieoczekiwane wysłanie formularza."
+msgstr "Nieoczekiwane przesłanie formularza."
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
 #: actions/recoverpassword.php:323
 msgid "Unexpected password reset."
-msgstr "Nieoczekiwane przywrócenie hasła."
+msgstr "Nieoczekiwane wyzerowanie hasła."
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
 msgid "Unknown action"
-msgstr "Nieznane działanie"
+msgstr ""
 
 #: ../actions/finishremotesubscribe.php:58
 #: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
@@ -2553,8 +2424,8 @@ msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
 msgstr ""
-"Jeśli nie podano inaczej, prawa autorskie do zawartości tej strony należy do "
-"współtwórców i jest dostępna na warunkach licencji "
+"Prawo do kopiowania zawartości tej strony, chyba że zaznaczono inaczej, "
+"należy do tworzących jej treści i uwarunkowane zasadami"
 
 #: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
 #: actions/confirmaddress.php:90
@@ -2570,40 +2441,38 @@ msgstr "Zrezygnuj z subskrypcji"
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
 #: actions/postnotice.php:45 actions/updateprofile.php:46
 #: actions/postnotice.php:48 actions/updateprofile.php:49
-#: actions/updateprofile.php:51
 msgid "Unsupported OMB version"
 msgstr "Nieobsługiwana wersja OMB"
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102 lib/imagefile.php:99
+#: lib/imagefile.php:102
 msgid "Unsupported image file format."
 msgstr "Nieobsługiwany format pliku obrazu."
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
 #: lib/connectsettingsaction.php:108
 msgid "Updates by SMS"
-msgstr "Aktualizacje przez wiadomości SMS"
+msgstr ""
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
 #: lib/connectsettingsaction.php:105
 msgid "Updates by instant messenger (IM)"
-msgstr "Aktualizacje przez komunikator"
+msgstr ""
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:129
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
-msgstr "Aktualizacje od %1$s i przyjaciół na %2$s!"
+msgstr ""
 
 #: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
+#: actions/twitapistatuses.php:202
 #, php-format
 msgid "Updates from %1$s on %2$s!"
-msgstr "Aktualizacje od %1$s na %2$s!"
+msgstr ""
 
 #: ../actions/avatar.php:68 actions/profilesettings.php:161
 #: actions/avatarsettings.php:162 actions/grouplogo.php:232
-#: actions/avatarsettings.php:165 actions/grouplogo.php:238
 msgid "Upload"
 msgstr "Wyślij"
 
@@ -2614,25 +2483,23 @@ msgid ""
 "site license, also. Use a picture that belongs to you and that you want to "
 "share."
 msgstr ""
-"Tu można wysłać nowego \"awatara\" (obraz użytkownika). Nie można "
-"modyfikować obrazu po jego wysłaniu, więc upewnij się, że jest w miarę "
-"kwadratowy. Musi być także na licencji strony. Użyj obrazu, który należy do "
-"Ciebie, i którym chcesz się dzielić."
+"Tu możesz wysłać nowego \"awatara\" (wizerunek użytkownika). Nie da się "
+"edytować obrazu po jego umieszczeniu w serwisie, więc upewnij się, że jest w "
+"miarę kwadratowy. Wysyłając go zgadzasz się na jego publikację na warunkach "
+"podanych w licencji strony. Użyj grafiki, która należy do Ciebie i którą "
+"możesz dzielić się z innymi."
 
 #: ../lib/settingsaction.php:91
 msgid "Upload a new profile image"
-msgstr "Wyślij nowy obraz profilu"
+msgstr ""
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
-"Użyj tego formularza, aby zaprosić przyjaciół i kolegów do używania tej "
-"usługi."
 
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176 actions/register.php:382
-#: actions/register.php:386
+#: actions/register.php:173 actions/register.php:176
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Używane tylko do aktualizacji, ogłoszeń i przywracania hasła"
 
@@ -2656,10 +2523,8 @@ msgstr "Obserwowany użytkownik nie istnieje."
 #: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
 #: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
 #: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
-#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
 msgid "User has no profile."
-msgstr "Użytkownik nie posiada profilu."
+msgstr "Użytkownik nie ma profilu."
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
 #: actions/remotesubscribe.php:105
@@ -2668,12 +2533,12 @@ msgstr "Pseudonim użytkownika"
 
 #: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
 msgid "User not found."
-msgstr "Nie znaleziono użytkownika."
+msgstr ""
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
 #: actions/profilesettings.php:139
 msgid "What timezone are you normally in?"
-msgstr "W jakiej strefie czasowej zwykle się znajdujesz?"
+msgstr ""
 
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
 #, php-format
@@ -2682,115 +2547,111 @@ msgstr "Co słychać, %s?"
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 #: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119 actions/register.php:410
+#: actions/profilesettings.php:119
 msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Gdzie jesteś, np. \"miasto, województwo (lub region), kraj\""
+msgstr "Gdzie jesteś? (np. \"miasto, region, kraj\")"
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132 actions/updateprofile.php:134
+#: actions/updateprofile.php:132
 #, php-format
 msgid "Wrong image type for '%s'"
-msgstr "Błędny typ obrazu dla \"%s\""
+msgstr "Nieprawidłowy typ obrazu dla '%s'"
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127 actions/updateprofile.php:129
+#: actions/updateprofile.php:127
 #, php-format
 msgid "Wrong size image at '%s'"
-msgstr "Błędny rozmiar obrazu \"%s\""
+msgstr "Nieprawidłowy rozmiar obrazu dla '%s'"
 
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
 #: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/deletenotice.php:141
 msgid "Yes"
-msgstr "Tak"
+msgstr ""
 
 #: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
 #: actions/finishaddopenid.php:112
 msgid "You already have this OpenID!"
-msgstr "Już posiadasz ten identyfikator OpenID!"
+msgstr "Już masz ten identyfikator OpenID!"
 
 #: ../actions/deletenotice.php:37 actions/deletenotice.php:37
 msgid ""
 "You are about to permanently delete a notice.  Once this is done, it cannot "
 "be undone."
 msgstr ""
-"Wpis zostanie za chwilę trwale usunięty. Kiedy to się stanie, to już się nie "
-"odstanie."
 
 #: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
 #: actions/recoverpassword.php:36
 msgid "You are already logged in!"
-msgstr "Jesteś już zalogowany!"
+msgstr "Nie musisz ponownie się logować!"
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
 msgid "You are already subscribed to these users:"
-msgstr "Jesteś już zasubskrybowany do tych użytkowników:"
+msgstr ""
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
 #: actions/twitapifriendships.php:105
 msgid "You are not friends with the specified user."
-msgstr "Nie jesteś przyjacielem podanego użytkownika."
+msgstr ""
 
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
-msgstr "Tutaj można zmienić hasło. Wybierz dobre!"
+msgstr "Tu możesz zmienić hasło. Wybierz porządne!"
 
 #: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
-msgstr "Można utworzyć nowe konto, aby rozpocząć wysyłanie wpisów."
+msgstr "Możesz utworzyć nowe konto, aby rozpocząć wysyłanie wpisów."
 
 #: ../actions/smssettings.php:28 actions/smssettings.php:28
 #: actions/smssettings.php:69
 #, 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%%."
+msgstr ""
 
-#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
+#: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
-"Można usunąć identyfikator OpenID ze swojego konta naciskając przycisk \"Usuń"
-"\"."
+"Możesz usunąć łączność z serwerem OpenID ze swojego konta klikając \"Usuń\"."
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
-#: actions/imsettings.php:70
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 msgstr ""
-"Można wysyłać i odbierać wpisy przez [komunikator](%%doc.im%%) Jabber/GTalk. "
-"Skonfiguruj adres i ustawienia poniżej."
+"Możesz wysyłać i odbierać wpisy przez komunikator Jabber/GTalk (%%doc.im%%). "
+"Poniżej możesz skonfigurować swój adres i ustawienia IM."
 
-#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
+#: ../actions/profilesettings.php:27
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
-"Tutaj można zaktualizować osobiste informacje w profilu, aby inni mogli "
-"lepiej Cię poznać."
+"W tym miejscu możesz zaktualizować informacje zawarte w Twoim osobistym "
+"profilu, aby inni mogli lepiej Cię poznać."
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
 #: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
 msgid "You can use the local subscription!"
-msgstr "Można używać lokalnej subskrypcji!"
+msgstr "Możesz skorzystać z lokalnej subskrypcji!"
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43 actions/register.php:149
+#: actions/finishopenidlogin.php:43
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 "Nie możesz się zarejestrować, jeśli nie zgadzasz się z warunkami licencji."
 
 #: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67 actions/updateprofile.php:69
+#: actions/updateprofile.php:67
 msgid "You did not send us that profile"
-msgstr "Nie wysłałeś nam tego profilu"
+msgstr "Ten profil nie był wysłany przez Ciebie"
 
-#: ../lib/mail.php:147 lib/mail.php:289
+#: ../lib/mail.php:147
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -2802,132 +2663,122 @@ msgid ""
 "Faithfully yours,\n"
 "%4$s"
 msgstr ""
-"Posiadasz nowy adres wysyłania na %1$s.\n"
-"\n"
-"Wyślij wiadomość e-mail na %2$s, aby wysłać nowe wpisy.\n"
-"\n"
-"Więcej instrukcji dotyczących poczty e-mail można znaleźć na %3$s.\n"
-"\n"
-"Z poważaniem,\n"
-"%4$s"
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
+#: actions/twitapistatuses.php:463
 msgid "You may not delete another user's status."
-msgstr "Nie można usuwać statusów innych użytkowników."
+msgstr ""
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr ""
-"Należy być zalogowanym, aby zapraszać innych użytkowników do używania %s"
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
 msgstr ""
-"Zostaniesz powiadomiony, kiedy ktoś zaakceptuje zaproszenie i zarejestruje "
-"się na stronie. Dziękujemy za pomoc w zwiększaniu społeczności!"
 
-#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
+#: ../actions/recoverpassword.php:149
 msgid "You've been identified. Enter a  new password below. "
-msgstr "Zostałeś zidentyfikowany. Podaj poniżej nowe hasło. "
+msgstr "Identyfikacja pomyślna. Wprowadź poniżej nowe hasło."
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104 actions/openidlogin.php:113
+#: actions/openidlogin.php:104
 msgid "Your OpenID URL"
-msgstr "Twój adres URL OpenID"
+msgstr "URL Twojej usługi OpenID"
 
-#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
+#: ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
-msgstr "Twój pseudonim na tym serwerze lub zarejestrowany adres e-mail."
+msgstr ""
+"Twój pseudonim na tym serwerze lub adres e-mailowy użyty podczas rejestracji."
 
-#: ../actions/openidsettings.php:28 actions/openidsettings.php:70
+#: ../actions/openidsettings.php:28
 #, php-format
 msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
-"[OpenID](%%doc.openid%%) umożliwia logowanie się do wielu stron za pomocą "
-"tego samego konta użytkownika. Tu można zarządzać powiązanymi "
+"[OpenID](%%doc.openid%%) pozwala logować Ci się do wielu serwisów z "
+"wykorzystaniem jednego konta użytkownika. Tu możesz zarządzać swoimi "
 "identyfikatorami OpenID."
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
 msgid "a few seconds ago"
 msgstr "kilka sekund temu"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
 #, php-format
 msgid "about %d days ago"
 msgstr "około %d dni temu"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
 #, php-format
 msgid "about %d hours ago"
 msgstr "około %d godzin temu"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
 #, php-format
 msgid "about %d minutes ago"
 msgstr "około %d minut temu"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
 #, php-format
 msgid "about %d months ago"
 msgstr "około %d miesięcy temu"
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
 msgid "about a day ago"
 msgstr "blisko dzień temu"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
 msgid "about a minute ago"
-msgstr "około minutę temu"
+msgstr "blisko minutę temu"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
 msgid "about a month ago"
-msgstr "około miesiąc temu"
+msgstr "blisko miesiąc temu"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
 msgid "about a year ago"
-msgstr "około rok temu"
+msgstr "blisko rok temu"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
 msgid "about an hour ago"
-msgstr "około godzinę temu"
+msgstr "blisko godzinę temu"
 
 #: ../actions/showstream.php:423 ../lib/stream.php:132
 #: actions/showstream.php:441 lib/stream.php:99
 msgid "delete"
-msgstr "usuń"
+msgstr ""
 
 #: ../actions/noticesearch.php:130 ../actions/showstream.php:408
 #: ../lib/stream.php:117 actions/noticesearch.php:136
 #: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
 msgid "in reply to..."
-msgstr "w odpowiedzi na..."
+msgstr "w odpowiedzi na…"
 
 #: ../actions/noticesearch.php:137 ../actions/showstream.php:415
 #: ../lib/stream.php:124 actions/noticesearch.php:143
 #: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
 msgid "reply"
-msgstr "odpowiedz"
+msgstr "odpowiedź"
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
 #: actions/passwordsettings.php:106
 msgid "same as password above"
-msgstr "takie samo jak hasło powyżej"
+msgstr "takie samo hasło jak powyżej"
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
-#: actions/twitapistatuses.php:618
+#: actions/twitapistatuses.php:555
 msgid "unsupported file type"
-msgstr "nieobsługiwany typ pliku"
+msgstr ""
 
 #: ../lib/util.php:1309 lib/util.php:1443
+#, fuzzy
 msgid "« After"
-msgstr "« Następne"
+msgstr "« następne"
 
 #: actions/deletenotice.php:74 actions/disfavor.php:43
 #: actions/emailsettings.php:127 actions/favor.php:45
@@ -2942,80 +2793,68 @@ msgstr "« Następne"
 #: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
 #: actions/openidlogin.php:37 actions/recoverpassword.php:316
 #: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-#: actions/avatarsettings.php:251 actions/emailsettings.php:229
-#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
-#: actions/newmessage.php:133 actions/newnotice.php:96
-#: actions/openidsettings.php:188 actions/othersettings.php:136
-#: actions/passwordsettings.php:131 actions/profilesettings.php:172
-#: actions/register.php:113 actions/remotesubscribe.php:53
-#: actions/smssettings.php:216 actions/subedit.php:38 actions/tagother.php:166
-#: actions/twittersettings.php:294 actions/userauthorization.php:39
 msgid "There was a problem with your session token. Try again, please."
-msgstr "Wystąpił problem z tokenem sesji. Spróbuj ponownie."
+msgstr ""
 
 #: actions/disfavor.php:55 actions/disfavor.php:81
 msgid "This notice is not a favorite!"
-msgstr "Ten wpis nie jest ulubiony!"
+msgstr ""
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
 msgid "Could not delete favorite."
-msgstr "Nie można usunąć ulubionego wpisu."
+msgstr ""
 
 #: actions/disfavor.php:72 lib/favorform.php:140
 msgid "Favor"
-msgstr "Dodaj do ulubionych"
+msgstr ""
 
-#: actions/emailsettings.php:92 actions/emailsettings.php:157
+#: actions/emailsettings.php:92
 msgid "Send me email when someone adds my notice as a favorite."
-msgstr "Wyślij mi wiadomość e-mail, kiedy ktoś doda mój wpis jako ulubiony."
+msgstr ""
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
 msgid "Send me email when someone sends me a private message."
-msgstr "Wyślij mi wiadomość e-mail, kiedy ktoś wyśle mi prywatną wiadomość."
+msgstr ""
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
+#: actions/twitapifavorites.php:118
 msgid "This notice is already a favorite!"
-msgstr "Ten wpis jest już ulubiony!"
+msgstr ""
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
-#: actions/twitapifavorites.php:131 lib/command.php:152
 msgid "Could not create favorite."
-msgstr "Nie można utworzyć ulubionego wpisu."
+msgstr ""
 
 #: actions/favor.php:70
 msgid "Disfavor"
-msgstr "Usuń wpis z ulubionych"
+msgstr ""
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
-#: actions/favoritesrss.php:110
 #, php-format
 msgid "%s favorite notices"
-msgstr "Ulubione wpisy użytkownika %s"
+msgstr ""
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
-#: actions/favoritesrss.php:114
 #, php-format
 msgid "Feed of favorite notices of %s"
-msgstr "Kanał ulubionych wpisów użytkownika %s"
+msgstr ""
 
 #: actions/inbox.php:28 actions/inbox.php:59
 #, php-format
 msgid "Inbox for %s - page %d"
-msgstr "Odebrane wiadomości użytkownika %s - strona %d"
+msgstr ""
 
 #: actions/inbox.php:30 actions/inbox.php:62
 #, php-format
 msgid "Inbox for %s"
-msgstr "Odebrane wiadomości użytkownika %s"
+msgstr ""
 
 #: actions/inbox.php:53 actions/inbox.php:115
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
-"To jest skrzynka odbiorcza, która wyświetla przychodzące wiadomości prywatne."
 
 #: actions/invite.php:178 actions/invite.php:213
 #, php-format
@@ -3023,260 +2862,234 @@ msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
 "\n"
 msgstr ""
-"%1$s zaprosił się do dołączenia do %2$s (%3$s).\n"
-"\n"
 
 #: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
 #: actions/register.php:416
 msgid "Automatically login in the future; "
-msgstr "Automatyczne logowanie; "
+msgstr ""
 
 #: actions/login.php:122 actions/login.php:264
 msgid "For security reasons, please re-enter your "
-msgstr "Z powodów bezpieczeństwa ponownie podaj "
+msgstr ""
 
 #: actions/login.php:126 actions/login.php:268
 msgid "Login with your username and password. "
-msgstr "Zaloguj się za pomocą nazwy użytkownika i hasła. "
+msgstr ""
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
-#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:141
 msgid "That's too long. Max message size is 140 chars."
-msgstr "Wiadomość jest za długa. Maksymalna długość to 140 znaków."
+msgstr ""
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
-#: actions/newmessage.php:155
 msgid "No recipient specified."
-msgstr "Nie podano odbiorcy."
+msgstr ""
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
-#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
 msgid "You can't send a message to this user."
-msgstr "Nie można wysłać wiadomości do tego użytkownika."
+msgstr ""
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240 actions/newmessage.php:161
-#: actions/twitapidirect_messages.php:167 lib/command.php:240
+#: classes/Command.php:240
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "Nie wysyłaj wiadomości do siebie, po prostu powiedz to sobie po cichu."
+msgstr ""
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163 actions/newmessage.php:114
+#: actions/newmessage.php:163
 msgid "No such user"
-msgstr "Nie ma takiego użytkownika"
+msgstr ""
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
-#: actions/newmessage.php:71
 msgid "New message"
-msgstr "Nowa wiadomość"
+msgstr ""
 
 #: actions/noticesearch.php:95 actions/noticesearch.php:146
 msgid "Notice without matching profile"
-msgstr "Wpis bez odpowiadającego profilu"
+msgstr ""
 
 #: actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr "[OpenID](%%doc.openid%%) umożliwia logowanie się na wiele stron "
+msgstr ""
 
 #: actions/openidsettings.php:46 actions/openidsettings.php:96
 msgid "If you want to add an OpenID to your account, "
-msgstr "Jeśli chcesz dodać identyfikator OpenID do konta, "
+msgstr ""
 
 #: actions/openidsettings.php:74
 msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr "Usunięcie jedynego identyfikatora OpenID uniemożliwi zalogowanie się! "
+msgstr ""
 
 #: actions/openidsettings.php:87 actions/openidsettings.php:143
 msgid "You can remove an OpenID from your account "
-msgstr "Można usunąć identyfikator OpenID z konta "
+msgstr ""
 
 #: actions/outbox.php:28 actions/outbox.php:58
 #, php-format
 msgid "Outbox for %s - page %d"
-msgstr "Wysłane wiadomości użytkownika %s - strona %d"
+msgstr ""
 
 #: actions/outbox.php:30 actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
-msgstr "Wysłane wiadomości użytkownika %s"
+msgstr ""
 
 #: actions/outbox.php:53 actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
-msgstr "To są wiadomości wysłane, czyli prywatne wiadomości, które wysłałeś."
+msgstr ""
 
 #: actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 msgstr ""
-"Znajdź osoby na %%site.name%% według ich nazwiska, położenia lub "
-"zainteresowań. "
 
 #: actions/profilesettings.php:27 actions/profilesettings.php:69
 msgid "You can update your personal profile info here "
-msgstr "Można tutaj zaktualizować osobiste informacje profilu "
+msgstr ""
 
 #: actions/profilesettings.php:115 actions/remotesubscribe.php:320
 #: actions/userauthorization.php:159 actions/userrss.php:76
 #: actions/avatarsettings.php:104 actions/avatarsettings.php:179
 #: actions/grouplogo.php:177 actions/remotesubscribe.php:367
 #: actions/userauthorization.php:176 actions/userrss.php:82
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
-#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
 msgid "User without matching profile"
-msgstr "Użytkownik bez odpowiadającego profilu"
+msgstr ""
 
 #: actions/recoverpassword.php:91 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. "
-msgstr "Ten kod potwierdzający jest za stary. "
+msgstr ""
 
 #: actions/recoverpassword.php:141 actions/recoverpassword.php:152
 msgid "If you've forgotten or lost your"
-msgstr "Jeśli zapomniałeś lub zgubiłeś"
+msgstr ""
 
 #: actions/recoverpassword.php:154 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a "
-msgstr "Zostałeś zidentyfikowany. Podaj "
+msgstr ""
 
 #: actions/recoverpassword.php:169 actions/recoverpassword.php:188
 msgid "Your nickname on this server, "
-msgstr "Pseudonim na tym serwerze, "
+msgstr ""
 
 #: actions/recoverpassword.php:271 actions/recoverpassword.php:304
 msgid "Instructions for recovering your password "
-msgstr "Instrukcje przywracania hasła "
+msgstr ""
 
 #: actions/recoverpassword.php:327 actions/recoverpassword.php:361
 msgid "New password successfully saved. "
-msgstr "Pomyślnie zapisano nowe hasło. "
+msgstr ""
 
 #: actions/register.php:95 actions/register.php:180
-#: actions/passwordsettings.php:147
 msgid "Password must be 6 or more characters."
-msgstr "Hasło musi mieć sześć lub więcej znaków."
+msgstr ""
 
 #: actions/register.php:216
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
-msgstr "Gratulacje, %s! Witaj na %%%%site.name%%%%. Stąd możesz chcieć..."
+msgstr ""
 
 #: actions/register.php:227
 msgid "(You should receive a message by email momentarily, with "
-msgstr "(Powinieneś właśnie otrzymać wiadomość przez e-mail z "
+msgstr ""
 
 #: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
 #, php-format
 msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr "Aby zasubskrybować, można [zalogować się](%%action.login%%),"
+msgstr ""
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
-#: actions/showfavorites.php:147
 #, php-format
 msgid "Feed for favorites of %s"
-msgstr "Kanał ulubionych wpisów użytkownika %s"
+msgstr ""
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-#: actions/showfavorites.php:179
 msgid "Could not retrieve favorite notices."
-msgstr "Nie można odebrać ulubionych wpisów."
+msgstr ""
 
 #: actions/showmessage.php:33 actions/showmessage.php:81
 msgid "No such message."
-msgstr "Nie ma takiej wiadomości."
+msgstr ""
 
-#: actions/showmessage.php:42 actions/showmessage.php:98
+#: actions/showmessage.php:42
 msgid "Only the sender and recipient may read this message."
-msgstr "Tylko nadawca i odbiorca mogą przeczytać tę wiadomość."
+msgstr ""
 
 #: actions/showmessage.php:61 actions/showmessage.php:108
 #, php-format
 msgid "Message to %1$s on %2$s"
-msgstr "Wiadomość do użytkownika %1$s na %2$s"
+msgstr ""
 
 #: actions/showmessage.php:66 actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
-msgstr "Wiadomość od użytkownika %1$s na %2$s"
+msgstr ""
 
 #: actions/showstream.php:154
 msgid "Send a message"
-msgstr "Wyślij wiadomość"
+msgstr ""
 
 #: actions/smssettings.php:312 actions/smssettings.php:464
 #, php-format
 msgid "Mobile carrier for your phone. "
-msgstr "Operator komórkowy Twojego telefonu. "
+msgstr ""
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
-#: actions/twitapidirect_messages.php:67
 #, php-format
 msgid "Direct messages to %s"
-msgstr "Bezpośrednia wiadomość do użytkownika %s"
+msgstr ""
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
-#: actions/twitapidirect_messages.php:68
 #, php-format
 msgid "All the direct messages sent to %s"
-msgstr "Wszystkie bezpośrednie wiadomości wysłane do użytkownika %s"
+msgstr ""
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-#: actions/twitapidirect_messages.php:72
 msgid "Direct Messages You've Sent"
-msgstr "Wysłane bezpośrednie wiadomości"
+msgstr ""
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
-#: actions/twitapidirect_messages.php:73
 #, php-format
 msgid "All the direct messages sent from %s"
-msgstr "Wszystkie bezpośrednie wiadomości wysłane od użytkownika %s"
+msgstr ""
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
-#: actions/twitapidirect_messages.php:146
 msgid "No message text!"
-msgstr "Brak tekstu wiadomości!"
+msgstr ""
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
-#: actions/twitapidirect_messages.php:159
 msgid "Recipient user not found."
-msgstr "Nie znaleziono odbiorcy."
+msgstr ""
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
-#: actions/twitapidirect_messages.php:162
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
-"Nie można wysłać bezpośredniej wiadomości do użytkowników, którzy nie są "
-"Twoimi przyjaciółmi."
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
-#: actions/twitapifavorites.php:64
 #, php-format
 msgid "%s / Favorites from %s"
-msgstr "%s/ulubione wpisy od %s"
+msgstr ""
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
-#: actions/twitapifavorites.php:68
 #, php-format
 msgid "%s updates favorited by %s / %s."
-msgstr "Użytkownik %s aktualizuje ulubione według %s/%s."
+msgstr ""
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
 #: actions/twitapifavorites.php:164 lib/mail.php:553
-#: actions/twitapifavorites.php:170 lib/mail.php:554
 #, php-format
 msgid "%s added your notice as a favorite"
-msgstr "Użytkownik %s dodał Twój wpis jako ulubiony"
+msgstr ""
 
 #: actions/twitapifavorites.php:188 lib/mail.php:276
 #: actions/twitapifavorites.php:165
@@ -3285,251 +3098,230 @@ msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
 "\n"
 msgstr ""
-"Użytkownik %1$s właśnie dodał Twój wpis od %2$s jako jeden z jego "
-"ulubionych.\n"
-"\n"
 
 #: actions/twittersettings.php:27
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
-"Dodaj swoje konto Twittera, aby automatycznie wysyłać wpisy na Twittera, "
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
-#: actions/twittersettings.php:61
 msgid "Twitter settings"
-msgstr "Ustawienia Twittera"
+msgstr ""
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
-#: actions/twittersettings.php:106
 msgid "Twitter Account"
-msgstr "Konto Twittera"
+msgstr ""
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
-#: actions/twittersettings.php:114
 msgid "Current verified Twitter account."
-msgstr "Obecnie sprawdzone konto Twittera."
+msgstr ""
 
 #: actions/twittersettings.php:63
 msgid "Twitter Username"
-msgstr "Nazwa użytkownika Twitter"
+msgstr ""
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
-#: actions/twittersettings.php:126
 msgid "No spaces, please."
-msgstr "Bez spacji."
+msgstr ""
 
 #: actions/twittersettings.php:67
 msgid "Twitter Password"
-msgstr "Hasło Twittera"
+msgstr ""
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
-#: actions/twittersettings.php:142
 msgid "Automatically send my notices to Twitter."
-msgstr "Automatycznie wyślij moje wpisy na Twittera."
+msgstr ""
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
-#: actions/twittersettings.php:149
 msgid "Send local \"@\" replies to Twitter."
-msgstr "Wyślij lokalne odpowiedzi \"@\" na Twittera."
+msgstr ""
 
 #: actions/twittersettings.php:78 actions/twittersettings.php:153
-#: actions/twittersettings.php:156
 msgid "Subscribe to my Twitter friends here."
-msgstr "Zasubskrybuj tutaj moich przyjaciół z Twittera."
+msgstr ""
 
-#: actions/twittersettings.php:122 actions/twittersettings.php:331
+#: actions/twittersettings.php:122
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr ""
-"Nazwa użytkownika może zawierać tylko liczby, małe i wielkie litery oraz "
-"podkreślnik (_). Maksymalnie 15 znaków."
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
-#: actions/twittersettings.php:338
 msgid "Could not verify your Twitter credentials!"
-msgstr "Nie można sprawdzić danych uwierzytelniających Twittera!"
+msgstr ""
 
 #: actions/twittersettings.php:137
 #, php-format
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr "Nie można pobrać informacji o koncie \"%s\" z Twittera."
+msgstr ""
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
-#: actions/twittersettings.php:352 actions/twittersettings.php:372
 msgid "Unable to save your Twitter settings!"
-msgstr "Nie można zapisać ustawień Twittera!"
+msgstr ""
 
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
-#: actions/twittersettings.php:380
 msgid "Twitter settings saved."
-msgstr "Zapisano ustawienia Twittera."
+msgstr ""
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
-#: actions/twittersettings.php:399
 msgid "That is not your Twitter account."
-msgstr "To nie jest Twoje konto Twittera."
+msgstr ""
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403 actions/twittersettings.php:407
+#: actions/twittersettings.php:403
 msgid "Couldn't remove Twitter user."
-msgstr "Nie można usunąć użytkownika Twittera."
+msgstr ""
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
-#: actions/twittersettings.php:411
 msgid "Twitter account removed."
-msgstr "Usunięto użytkownika Twittera."
+msgstr ""
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
 #: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453 actions/twittersettings.php:432
-#: actions/twittersettings.php:443 actions/twittersettings.php:457
+#: actions/twittersettings.php:453
 msgid "Couldn't save Twitter preferences."
-msgstr "Nie można zapisać preferencji Twittera."
+msgstr ""
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
-#: actions/twittersettings.php:465
 msgid "Twitter preferences saved."
-msgstr "Zapisano preferencje Twittera."
+msgstr ""
 
 #: actions/userauthorization.php:84 actions/userauthorization.php:86
 msgid "Please check these details to make sure "
-msgstr "Sprawdź te szczegóły, aby upewnić się "
+msgstr ""
 
 #: actions/userauthorization.php:324 actions/userauthorization.php:340
 msgid "The subscription has been authorized, but no "
-msgstr "Subskrypcja została upoważniona, ale nie "
+msgstr ""
 
 #: actions/userauthorization.php:334 actions/userauthorization.php:351
 msgid "The subscription has been rejected, but no "
-msgstr "Subskrypcja została odrzucona, ale nie "
+msgstr ""
 
 #: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-#: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
-msgstr "Wyniki polecenia"
+msgstr ""
 
-#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
+#: classes/Channel.php:148 classes/Channel.php:204
 msgid "Command complete"
-msgstr "Zakończono polecenie"
+msgstr ""
 
-#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
+#: classes/Channel.php:158 classes/Channel.php:215
 msgid "Command failed"
-msgstr "Polecenie nie powiodło się"
+msgstr ""
 
-#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
+#: classes/Command.php:39 classes/Command.php:44
 msgid "Sorry, this command is not yet implemented."
-msgstr "Przepraszamy, te polecenie nie zostało jeszcze zaimplementowane."
+msgstr ""
 
 #: classes/Command.php:96 classes/Command.php:113
 #, php-format
 msgid "Subscriptions: %1$s\n"
-msgstr "Subskrypcje: %1$s\n"
+msgstr ""
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
+#: classes/Command.php:276
 msgid "User has no last notice"
-msgstr "Użytkownik nie posiada ostatniego wpisu"
+msgstr ""
 
-#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
+#: classes/Command.php:146 classes/Command.php:166
 msgid "Notice marked as fave."
-msgstr "Zaznaczono wpis jako ulubiony."
+msgstr ""
 
-#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
+#: classes/Command.php:166 classes/Command.php:189
 #, php-format
 msgid "%1$s (%2$s)"
-msgstr "%1$s (%2$s)"
+msgstr ""
 
-#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
+#: classes/Command.php:169 classes/Command.php:192
 #, php-format
 msgid "Fullname: %s"
-msgstr "Imię i nazwisko: %s"
+msgstr ""
 
-#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
+#: classes/Command.php:172 classes/Command.php:195
 #, php-format
 msgid "Location: %s"
-msgstr "Położenie: %s"
+msgstr ""
 
-#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
+#: classes/Command.php:175 classes/Command.php:198
 #, php-format
 msgid "Homepage: %s"
-msgstr "Strona domowa: %s"
+msgstr ""
 
-#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
+#: classes/Command.php:178 classes/Command.php:201
 #, php-format
 msgid "About: %s"
-msgstr "O mnie: %s"
+msgstr ""
 
-#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
+#: classes/Command.php:200 classes/Command.php:228
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
-msgstr "Wiadomość jest za długa - maksymalnie 140 znaków, wysłano %d"
+msgstr ""
 
-#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
+#: classes/Command.php:214 classes/Command.php:245
 #, php-format
 msgid "Direct message to %s sent"
-msgstr "Wysłano bezpośrednią wiadomość do użytkownika %s"
+msgstr ""
 
-#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
+#: classes/Command.php:216 classes/Command.php:247
 msgid "Error sending direct message."
-msgstr "Błąd podczas wysyłania bezpośredniej wiadomości."
+msgstr ""
 
-#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
+#: classes/Command.php:263 classes/Command.php:300
 msgid "Specify the name of the user to subscribe to"
-msgstr "Podaj nazwę użytkownika do zasubskrybowania"
+msgstr ""
 
-#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
+#: classes/Command.php:270 classes/Command.php:307
 #, php-format
 msgid "Subscribed to %s"
-msgstr "Zasubskrybowano użytkownika %s"
+msgstr ""
 
-#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
+#: classes/Command.php:288 classes/Command.php:328
 msgid "Specify the name of the user to unsubscribe from"
-msgstr "Podaj nazwę użytkownika do usunięcia subskrypcji"
+msgstr ""
 
-#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
+#: classes/Command.php:295 classes/Command.php:335
 #, php-format
 msgid "Unsubscribed from %s"
-msgstr "Usunięto subskrypcję użytkownika %s"
+msgstr ""
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
+#: classes/Command.php:376
 msgid "Command not yet implemented."
-msgstr "Nie zaimplementowano polecenia."
+msgstr ""
 
-#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
+#: classes/Command.php:313 classes/Command.php:356
 msgid "Notification off."
-msgstr "Wyłączono powiadomienia."
+msgstr ""
 
-#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
+#: classes/Command.php:315 classes/Command.php:358
 msgid "Can't turn off notification."
-msgstr "Nie można wyłączyć powiadomień."
+msgstr ""
 
-#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
+#: classes/Command.php:333 classes/Command.php:379
 msgid "Notification on."
-msgstr "Włączono powiadomienia."
+msgstr ""
 
-#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
+#: classes/Command.php:335 classes/Command.php:381
 msgid "Can't turn on notification."
-msgstr "Nie można włączyć powiadomień."
+msgstr ""
 
 #: classes/Command.php:344 classes/Command.php:392
 msgid "Commands:\n"
-msgstr "Polecenia:\n"
+msgstr ""
 
 #: classes/Message.php:53 classes/Message.php:56
 msgid "Could not insert message."
-msgstr "Nie można wprowadzić wiadomości."
+msgstr ""
 
 #: classes/Message.php:63 classes/Message.php:66
 msgid "Could not update message with new URI."
-msgstr "Nie można zaktualizować wiadomości za pomocą nowego adresu URL."
+msgstr ""
 
 #: lib/gallery.php:46
 msgid "User without matching profile in system."
-msgstr "Użytkownik bez odpowiadającego profilu w systemie."
+msgstr ""
 
 #: lib/mail.php:147 lib/mail.php:289
 #, php-format
@@ -3537,13 +3329,11 @@ msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgstr ""
-"Posiadasz nowy adres wysyłania na %1$s.\n"
-"\n"
 
-#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
+#: lib/mail.php:249 lib/mail.php:508
 #, php-format
 msgid "New private message from %s"
-msgstr "Nowa prywatna wiadomość od użytkownika %s"
+msgstr ""
 
 #: lib/mail.php:253 lib/mail.php:512
 #, php-format
@@ -3551,97 +3341,88 @@ msgid ""
 "%1$s (%2$s) sent you a private message:\n"
 "\n"
 msgstr ""
-"Użytkownik %1$s (%2$s) wysłał Ci prywatną wiadomość:\n"
-"\n"
 
-#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
+#: lib/mailbox.php:43 lib/mailbox.php:89
 msgid "Only the user can read their own mailboxes."
-msgstr "Tylko użytkownik może czytać swoje skrzynki pocztowe."
+msgstr ""
 
 #: lib/openid.php:195 lib/openid.php:203
 msgid "This form should automatically submit itself. "
-msgstr "Ten formularz powinien automatycznie się wysłać. "
+msgstr ""
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
 msgid "Favorites"
-msgstr "Ulubione"
+msgstr ""
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
 #, php-format
 msgid "%s's favorite notices"
-msgstr "Ulubione wpisy użytkownika %s"
+msgstr ""
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
 msgid "User"
-msgstr "Użytkownik"
+msgstr ""
 
 #: lib/personal.php:75 lib/personalgroupnav.php:123
 msgid "Inbox"
-msgstr "Odebrane"
+msgstr ""
 
 #: lib/personal.php:76 lib/personalgroupnav.php:124
 msgid "Your incoming messages"
-msgstr "Wiadomości przychodzące"
+msgstr ""
 
 #: lib/personal.php:80 lib/personalgroupnav.php:128
 msgid "Outbox"
-msgstr "Wysłane"
+msgstr ""
 
 #: lib/personal.php:81 lib/personalgroupnav.php:129
 msgid "Your sent messages"
-msgstr "Wysłane wiadomości"
+msgstr ""
 
 #: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
 msgid "Twitter"
-msgstr "Twitter"
+msgstr ""
 
 #: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
 msgid "Twitter integration options"
-msgstr "Opcje integracji z Twitterem"
+msgstr ""
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-#: lib/messageform.php:137 lib/noticelist.php:425
 msgid "To"
-msgstr "Do"
+msgstr ""
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
 msgid "Could not parse message."
-msgstr "Nie można przeanalizować wiadomości."
+msgstr ""
 
-#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
-#: actions/facebookhome.php:161
-#, php-format
+#: actions/all.php:63 actions/facebookhome.php:162
+#, fuzzy, php-format
 msgid "%s and friends, page %d"
-msgstr "Użytkownik %s i przyjaciele, strona %d"
+msgstr "%s i przyjaciele"
 
 #: actions/avatarsettings.php:76
 msgid "You can upload your personal avatar."
-msgstr "Można wysłać osobisty awatar."
+msgstr ""
 
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250 actions/avatarsettings.php:119
-#: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:250
+#, fuzzy
 msgid "Avatar settings"
-msgstr "Ustawienia awatara"
+msgstr "Ustawienia"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
-#: actions/grouplogo.php:204 actions/grouplogo.php:264
 msgid "Original"
-msgstr "Oryginał"
+msgstr ""
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
-#: actions/grouplogo.php:215 actions/grouplogo.php:276
 msgid "Preview"
-msgstr "Podgląd"
+msgstr ""
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
-#: actions/avatarsettings.php:228 actions/grouplogo.php:291
 msgid "Crop"
-msgstr "Przytnij"
+msgstr ""
 
 #: actions/avatarsettings.php:248 actions/deletenotice.php:133
 #: actions/emailsettings.php:224 actions/grouplogo.php:307
@@ -3653,567 +3434,594 @@ msgstr "Przytnij"
 #: actions/subedit.php:38 actions/twittersettings.php:290
 #: actions/userauthorization.php:39
 msgid "There was a problem with your session token. "
-msgstr "Wystąpił problem z tokenem sesji. "
+msgstr ""
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
-#: actions/avatarsettings.php:308
 msgid "Pick a square area of the image to be your avatar"
-msgstr "Wybierz kwadratowy obszar obrazu do awatara"
+msgstr ""
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
-#: actions/avatarsettings.php:323 actions/grouplogo.php:382
 msgid "Lost our file data."
-msgstr "Utracono dane pliku."
+msgstr ""
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112 lib/imagefile.php:112
+#: classes/User_group.php:112
+#, fuzzy
 msgid "Lost our file."
-msgstr "Utracono plik."
+msgstr "Brak takiego wpisu."
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
-#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
-#: lib/imagefile.php:191
+#: classes/User_group.php:129 classes/User_group.php:161
 msgid "Unknown file type"
-msgstr "Nieznany typ pliku"
+msgstr ""
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
 msgid "No profile specified."
-msgstr "Nie podano profilu."
+msgstr ""
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
 #: actions/unblock.php:75
 msgid "No profile with that ID."
-msgstr "Brak profilu o tym identyfikatorze."
+msgstr ""
 
 #: actions/block.php:111
+#, fuzzy
 msgid "Block user"
-msgstr "Zablokuj użytkownika"
+msgstr "Brak takiego użytkownika."
 
 #: actions/block.php:129
 msgid "Are you sure you want to block this user? "
-msgstr "Na pewno chcesz zablokować tego użytkownika? "
+msgstr ""
 
 #: actions/block.php:162
+#, fuzzy
 msgid "You have already blocked this user."
-msgstr "Ten użytkownik został już zablokowany."
+msgstr "Nie musisz ponownie się logować!"
 
 #: actions/block.php:167
 msgid "Failed to save block information."
-msgstr "Zapisanie informacji o blokadzie nie powiodło się."
+msgstr ""
 
 #: actions/confirmaddress.php:159
-#, php-format
+#, fuzzy, php-format
 msgid "The address \"%s\" has been "
-msgstr "Adres \"%s\" został "
+msgstr "Adres został usunięty."
 
 #: actions/deletenotice.php:73
 msgid "You are about to permanently delete a notice. "
-msgstr "Za chwilę wpis zostanie trwale usunięty. "
+msgstr ""
 
 #: actions/disfavor.php:94
 msgid "Add to favorites"
-msgstr "Dodaj do ulubionych"
+msgstr ""
 
 #: actions/editgroup.php:54
 #, php-format
 msgid "Edit %s group"
-msgstr "Edytuj grupę %s"
+msgstr ""
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-#: actions/grouplogo.php:70 actions/grouprss.php:80
 msgid "Inboxes must be enabled for groups to work"
-msgstr "Skrzynki odbiorcze grup muszą być włączone, aby działały"
+msgstr ""
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-#: actions/grouplogo.php:75
 msgid "You must be logged in to create a group."
-msgstr "Musisz być zalogowany, aby utworzyć grupę."
+msgstr ""
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/showgroup.php:121
+#, fuzzy
 msgid "No nickname"
-msgstr "Brak pseudonimu"
+msgstr "Brak pseudonimu."
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
-#: actions/showgroup.php:128 actions/grouplogo.php:104
-#: actions/grouprss.php:103
+#: actions/showgroup.php:128
+#, fuzzy
 msgid "No such group"
-msgstr "Nie ma takiej grupy"
+msgstr "Brak takiego wpisu."
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107 actions/grouplogo.php:111
+#: actions/grouplogo.php:107
 msgid "You must be an admin to edit the group"
-msgstr "Musisz być administratorem, aby zmodyfikować grupę"
+msgstr ""
 
 #: actions/editgroup.php:157
 msgid "Use this form to edit the group."
-msgstr "Użyj tego formularza, aby zmodyfikować grupę."
+msgstr ""
 
 #: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
+#, fuzzy
 msgid "Nickname must have only lowercase letters "
-msgstr "Pseudonim może zawierać tylko małe litery "
+msgstr "Pseudonim musi zawierać tylko małe litery i cyfry, bez znaków spacji."
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
+#, fuzzy
 msgid "description is too long (max 140 chars)."
-msgstr "opis jest za długi (maksymalnie 140 znaków)."
+msgstr "Wpis \"O mnie\" jest za długi (maks. 140 znaków)"
 
 #: actions/editgroup.php:218
+#, fuzzy
 msgid "Could not update group."
-msgstr "Nie można zaktualizować grupy."
+msgstr "Nie można zaktualizować użytkownika."
 
 #: actions/editgroup.php:226
+#, fuzzy
 msgid "Options saved."
-msgstr "Zapisano opcje."
+msgstr "Ustawienia zostały zapisane."
 
 #: actions/emailsettings.php:107 actions/imsettings.php:108
-#, php-format
+#, fuzzy, php-format
 msgid "Awaiting confirmation on this address. "
-msgstr "Oczekiwanie na potwierdzenie tego adresu. "
+msgstr "Błąd kodu potwierdzającego."
 
 #: actions/emailsettings.php:139 actions/smssettings.php:150
 msgid "Make a new email address for posting to; "
-msgstr "Utwórz nowy adres e-mail do wysyłania; "
+msgstr ""
 
 #: actions/emailsettings.php:157
 msgid "Send me email when someone "
-msgstr "Wyślij mi wiadomość e-mail, kiedy ktoś "
+msgstr ""
 
-#: actions/emailsettings.php:168 actions/emailsettings.php:173
+#: actions/emailsettings.php:168
 msgid "Allow friends to nudge me and send me an email."
-msgstr "Pozwól przyjaciołom na szturchanie mnie i wyślij mi wiadomość e-mail."
+msgstr ""
 
 #: actions/emailsettings.php:321
+#, fuzzy
 msgid "That email address already belongs "
-msgstr "Ten adres e-mail już należy "
+msgstr "Taki e-mail już istnieje"
 
 #: actions/emailsettings.php:343
+#, fuzzy
 msgid "A confirmation code was sent to the email address you added. "
-msgstr "Kod potwierdzający został wysłany na dodany adres e-mail. "
+msgstr ""
+"Na Twój adres komunikatora został wysłany kod potwierdzający. Musisz "
+"zaakceptować otrzymywanie wiadomości od %s."
 
 #: actions/facebookhome.php:110
 msgid "Server error - couldn't get user!"
-msgstr "Błąd serwera - nie można uzyskać użytkownika!"
+msgstr ""
 
 #: actions/facebookhome.php:196
 #, php-format
 msgid "If you would like the %s app to automatically update "
-msgstr "Jeśli chcesz, aby aplikacja %s automatycznie aktualizowała "
+msgstr ""
 
 #: actions/facebookhome.php:213 actions/facebooksettings.php:137
 #, php-format
 msgid "Allow %s to update my Facebook status"
-msgstr "Pozwól %s na aktualizowanie mojego statusu na Facebook"
+msgstr ""
 
-#: actions/facebookhome.php:218 actions/facebookhome.php:223
+#: actions/facebookhome.php:218
 msgid "Skip"
-msgstr "Pomiń"
+msgstr ""
 
-#: actions/facebookhome.php:235 lib/facebookaction.php:479
+#: actions/facebookhome.php:235
+#, fuzzy
 msgid "No notice content!"
-msgstr "Brak zawartości wpisu!"
+msgstr "Brak zawartości!"
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
-#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
 msgid "Pagination"
-msgstr "Paginacja"
+msgstr ""
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
+#, fuzzy
 msgid "After"
-msgstr "Następne"
+msgstr "« następne"
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
-#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#, fuzzy
 msgid "Before"
-msgstr "Wcześniej"
+msgstr "Wcześniej »"
 
 #: actions/facebookinvite.php:70
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
-msgstr "Dziękujemy za zaproszenie przyjaciół do używania %s"
+msgstr ""
 
 #: actions/facebookinvite.php:72
 msgid "Invitations have been sent to the following users:"
-msgstr "Zaproszenia zostały wysłane do następujących użytkowników:"
+msgstr ""
 
-#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
+#: actions/facebookinvite.php:96
 #, php-format
 msgid "You have been invited to %s"
-msgstr "Zostałeś zaproszony do %s"
+msgstr ""
 
-#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
-#, php-format
+#: actions/facebookinvite.php:105
+#, fuzzy, php-format
 msgid "Invite your friends to use %s"
-msgstr "Zaproś przyjaciół do używania %s"
+msgstr "Kanał dla znajomych użytkownika %s"
 
-#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
+#: actions/facebookinvite.php:113
 #, php-format
 msgid "Friends already using %s:"
-msgstr "Przyjaciele już używający %s:"
+msgstr ""
 
-#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
+#: actions/facebookinvite.php:130
 #, php-format
 msgid "Send invitations"
-msgstr "Wyślij zaproszenia"
+msgstr ""
 
 #: actions/facebookremove.php:56
+#, fuzzy
 msgid "Couldn't remove Facebook user."
-msgstr "Nie można usunąć użytkownika Facebook."
+msgstr "Nie można zaktualizować użytkownika."
 
 #: actions/facebooksettings.php:65
 msgid "There was a problem saving your sync preferences!"
-msgstr "Wystąpił problem podczas zapisywania preferencji synchronizacji!"
+msgstr ""
 
 #: actions/facebooksettings.php:67
+#, fuzzy
 msgid "Sync preferences saved."
-msgstr "Zapisano preferencje synchronizacji."
+msgstr "Preferencje zostały zapisane."
 
 #: actions/facebooksettings.php:90
 msgid "Automatically update my Facebook status with my notices."
-msgstr "Automatycznie aktualizuj status na Facebook moimi wpisami."
+msgstr ""
 
 #: actions/facebooksettings.php:97
 msgid "Send \"@\" replies to Facebook."
-msgstr "Wyślij odpowiedzi \"@\" do Facebook."
+msgstr ""
 
 #: actions/facebooksettings.php:106
+#, fuzzy
 msgid "Prefix"
-msgstr "Przedrostek"
+msgstr "Profil"
 
 #: actions/facebooksettings.php:108
 msgid "A string to prefix notices with."
-msgstr "Tekst do poprzedzenia wpisów."
+msgstr ""
 
 #: actions/facebooksettings.php:124
 #, php-format
 msgid "If you would like %s to automatically update "
-msgstr "Jeśli chcesz, aby %s automatycznie aktualizowało "
+msgstr ""
 
 #: actions/facebooksettings.php:147
+#, fuzzy
 msgid "Sync preferences"
-msgstr "Zsynchronizuj preferencje"
+msgstr "Preferencje"
 
 #: actions/favor.php:94 lib/disfavorform.php:140
 msgid "Disfavor favorite"
-msgstr "Usuń wpis z ulubionych"
+msgstr ""
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
-#: lib/publicgroupnav.php:93
+#: lib/publicgroupnav.php:91
+#, fuzzy
 msgid "Popular notices"
-msgstr "Popularne wpisy"
+msgstr "Brak takiego wpisu."
 
 #: actions/favorited.php:67
-#, php-format
+#, fuzzy, php-format
 msgid "Popular notices, page %d"
-msgstr "Popularne wpisy, strona %d"
+msgstr "Popularne ogłoszenia"
 
 #: actions/favorited.php:79
 msgid "The most popular notices on the site right now."
-msgstr "Najpopularniejsze wpisy na stronie w te chwili."
+msgstr "Najbardziej popularne ogłoszeńa na stronie w tej chwili."
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
+#: lib/publicgroupnav.php:87
 msgid "Featured users"
-msgstr "Znani użytkownicy"
+msgstr ""
 
 #: actions/featured.php:71
 #, php-format
 msgid "Featured users, page %d"
-msgstr "Znani użytkownicy, strona %d"
+msgstr ""
 
 #: actions/featured.php:99
 #, php-format
 msgid "A selection of some of the great users on %s"
-msgstr "Wybór znanych użytkowników na %s"
+msgstr ""
 
 #: actions/finishremotesubscribe.php:188
 msgid "That user has blocked you from subscribing."
-msgstr "Ten użytkownik zablokował Cię z subskrypcji."
+msgstr ""
 
 #: actions/groupbyid.php:79
 msgid "No ID"
-msgstr "Brak identyfikatora"
+msgstr ""
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
-#: actions/grouplogo.php:144 actions/grouplogo.php:197
 msgid "Group logo"
-msgstr "Logo grupy"
+msgstr ""
 
 #: actions/grouplogo.php:149
 msgid "You can upload a logo image for your group."
-msgstr "Można wysłać obraz logo dla grupy."
+msgstr ""
 
-#: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:448
+#, fuzzy
 msgid "Logo updated."
-msgstr "Zaktualizowano logo."
+msgstr "Awatar załadowany."
 
-#: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:450
+#, fuzzy
 msgid "Failed updating logo."
-msgstr "Zaktualizowanie logo nie powiodło się."
+msgstr "Uaktualnianie awatara nie powiodło się."
 
 #: actions/groupmembers.php:93 lib/groupnav.php:91
 #, php-format
 msgid "%s group members"
-msgstr "Członkowie grupy %s"
+msgstr ""
 
 #: actions/groupmembers.php:96
 #, php-format
 msgid "%s group members, page %d"
-msgstr "Członkowie grupy %s, strona %d"
+msgstr ""
 
 #: actions/groupmembers.php:111
 msgid "A list of the users in this group."
-msgstr "Lista użytkowników znajdujących się w tej grupie."
+msgstr ""
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:96
 msgid "Groups"
-msgstr "Grupy"
+msgstr ""
 
 #: actions/groups.php:64
 #, php-format
 msgid "Groups, page %d"
-msgstr "Grupy, strona %d"
+msgstr ""
 
 #: actions/groups.php:90
 #, php-format
 msgid "%%%%site.name%%%% groups let you find and talk with "
-msgstr "Grupy %%%%site.name%%%% pozwalają na szukanie i rozmawianie z "
+msgstr ""
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-#: actions/usergroups.php:125
+#, fuzzy
 msgid "Create a new group"
-msgstr "Utwórz nową grupę"
+msgstr "Załóż nowe konto"
 
 #: actions/groupsearch.php:57
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
-msgstr "Znajdź grupy na %%site.name%% według ich nazw, położenia lub opisu. "
+msgstr ""
+"Szukaj ludzi w serwisie %%site.name%%. Kryteriami mogą być imiona i "
+"nazwiska, miejscowości lub zainteresowania. Użyj spacji aby oddzielić "
+"elementy wyszukiwania. Słowa muszą mieć minimum 3 znaki."
 
 #: actions/groupsearch.php:63
+#, fuzzy
 msgid "Group search"
-msgstr "Znajdź grupę"
+msgstr "Szukaj ludzi"
 
 #: actions/imsettings.php:70
 msgid "You can send and receive notices through "
-msgstr "Można wysyłać i otrzymywać wpisy przez "
+msgstr ""
 
 #: actions/imsettings.php:120
 #, php-format
 msgid "Jabber or GTalk address, "
-msgstr "adres Jabbera lub GTalk, "
+msgstr ""
 
 #: actions/imsettings.php:147
+#, fuzzy
 msgid "Send me replies through Jabber/GTalk "
-msgstr "Wyślij mi odpowiedzi przez Jabbera/GTalk "
+msgstr "Wysyłaj mi wpisy przez Jabbera/GTalka"
 
 #: actions/imsettings.php:321
-#, php-format
+#, fuzzy, php-format
 msgid "A confirmation code was sent "
-msgstr "Kod potwierdzający został wysłany "
+msgstr "Brak kodu potwierdzającego."
 
 #: actions/joingroup.php:65
 msgid "You must be logged in to join a group."
-msgstr "Musisz być zalogowany, aby dołączyć do grupy."
+msgstr ""
 
 #: actions/joingroup.php:95
+#, fuzzy
 msgid "You are already a member of that group"
-msgstr "Jesteś już członkiem tej grupy"
+msgstr "Nie musisz ponownie się logować!"
 
 #: actions/joingroup.php:128
-#, php-format
+#, fuzzy, php-format
 msgid "Could not join user %s to group %s"
-msgstr "Nie można dołączyć użytkownika %s do grupy %s"
+msgstr "Nie można przekierować do serwera: %s"
 
 #: actions/joingroup.php:135
 #, php-format
 msgid "%s joined group %s"
-msgstr "Użytkownik %s dołączył do grupy %s"
+msgstr ""
 
 #: actions/leavegroup.php:60
 msgid "Inboxes must be enabled for groups to work."
-msgstr "Skrzynki odbiorcze dla grup muszą być włączone, aby działały."
+msgstr ""
 
 #: actions/leavegroup.php:65
 msgid "You must be logged in to leave a group."
-msgstr "Musisz być zalogowany, aby opuścić grupę."
+msgstr ""
 
 #: actions/leavegroup.php:88
+#, fuzzy
 msgid "No such group."
-msgstr "Nie ma takiej grupy."
+msgstr "Brak takiego wpisu."
 
 #: actions/leavegroup.php:95
+#, fuzzy
 msgid "You are not a member of that group."
-msgstr "Nie jesteś członkiem tej grupy."
+msgstr "Ten profil nie był wysłany przez Ciebie"
 
 #: actions/leavegroup.php:100
 msgid "You may not leave a group while you are its administrator."
-msgstr "Nie możesz opuścić grupy, kiedy jesteś jej administratorem."
+msgstr ""
 
-#: actions/leavegroup.php:130 actions/leavegroup.php:124
+#: actions/leavegroup.php:130
 msgid "Could not find membership record."
-msgstr "Nie można znaleźć wpisu członkostwa."
+msgstr ""
 
-#: actions/leavegroup.php:138 actions/leavegroup.php:132
-#, php-format
+#: actions/leavegroup.php:138
+#, fuzzy, php-format
 msgid "Could not remove user %s to group %s"
-msgstr "Nie można usunąć użytkownika %s z grupy %s"
+msgstr "Nie można utworzyć formularza OpenID: %s"
 
-#: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/leavegroup.php:145
 #, php-format
 msgid "%s left group %s"
-msgstr "Użytkownik %s opuścił grupę %s"
+msgstr ""
 
-#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
+#: actions/login.php:225 lib/facebookaction.php:304
 msgid "Login to site"
-msgstr "Zaloguj się na stronie"
+msgstr ""
 
 #: actions/microsummary.php:69
 msgid "No current status"
-msgstr "Brak obecnego statusu"
+msgstr ""
 
 #: actions/newgroup.php:53
 msgid "New group"
-msgstr "Nowa grupa"
+msgstr ""
 
 #: actions/newgroup.php:115
 msgid "Use this form to create a new group."
-msgstr "Użyj tego formularza, aby utworzyć nową grupę."
+msgstr ""
 
 #: actions/newgroup.php:177
+#, fuzzy
 msgid "Could not create group."
-msgstr "Nie można utworzyć grupy."
+msgstr "Nie można zapisać informacji o awatarze"
 
 #: actions/newgroup.php:191
+#, fuzzy
 msgid "Could not set group membership."
-msgstr "Nie można ustawić członkostwa w grupie."
+msgstr "Nie można obserwować."
 
 #: actions/newmessage.php:119 actions/newnotice.php:132
+#, fuzzy
 msgid "That's too long. "
-msgstr "Wiadomość jest za długa. "
+msgstr "Ten plik jest za duży."
 
 #: actions/newmessage.php:134
 msgid "Don't send a message to yourself; "
-msgstr "Nie wysyłaj wiadomości do siebie; "
+msgstr ""
 
-#: actions/newnotice.php:166 actions/newnotice.php:174
+#: actions/newnotice.php:166
+#, fuzzy
 msgid "Notice posted"
-msgstr "Wysłano wpis"
+msgstr "Wpisy"
 
-#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
-#: lib/channel.php:170
+#: actions/newnotice.php:200 classes/Channel.php:163
 msgid "Ajax Error"
-msgstr "Błąd AJAX"
+msgstr ""
 
 #: actions/nudge.php:85
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
-"Ten użytkownik nie pozwala na szturchnięcia lub nie potwierdził lub nie "
-"ustawił jeszcze swojego adresu e-mail."
 
 #: actions/nudge.php:94
 msgid "Nudge sent"
-msgstr "Wysłano szturchnięcie"
+msgstr ""
 
 #: actions/nudge.php:97
 msgid "Nudge sent!"
-msgstr "Wysłano szturchnięcie!"
+msgstr ""
 
-#: actions/openidlogin.php:97 actions/openidlogin.php:106
+#: actions/openidlogin.php:97
+#, fuzzy
 msgid "OpenID login"
-msgstr "Login OpenID"
+msgstr "Użytkownik OpenID"
 
 #: actions/openidsettings.php:128
+#, fuzzy
 msgid "Removing your only OpenID "
-msgstr "Usuwanie jedynego identyfikatora OpenID "
+msgstr "Usuń konto OpenID"
 
 #: actions/othersettings.php:60
+#, fuzzy
 msgid "Other Settings"
-msgstr "Inne ustawienia"
+msgstr "Ustawienia"
 
 #: actions/othersettings.php:71
 msgid "Manage various other options."
-msgstr "Zarządzaj różnymi innymi opcjami."
+msgstr ""
 
 #: actions/othersettings.php:93
 msgid "URL Auto-shortening"
-msgstr "Automatyczne skracanie adresów URL"
+msgstr ""
 
 #: actions/othersettings.php:112
+#, fuzzy
 msgid "Service"
-msgstr "Usługa"
+msgstr "Szukaj"
 
 #: actions/othersettings.php:113
 msgid "Automatic shortening service to use."
-msgstr "Używana automatyczna usługa skracania."
+msgstr ""
 
 #: actions/othersettings.php:144
+#, fuzzy
 msgid "URL shortening service is too long (max 50 chars)."
-msgstr "Adres URL usługi skracania jest za długi (maksymalnie 50 znaków)."
+msgstr "Lokalizacja jest za długa (max. 255 znaków)."
 
 #: actions/passwordsettings.php:69
+#, fuzzy
 msgid "Change your password."
-msgstr "Zmień hasło."
+msgstr "Zmień hasło"
 
 #: actions/passwordsettings.php:89
+#, fuzzy
 msgid "Password change"
-msgstr "Zmiana hasła"
+msgstr "Hasło zostało zapisane."
 
-#: actions/peopletag.php:35 actions/peopletag.php:70
-#, php-format
+#: actions/peopletag.php:35
+#, fuzzy, php-format
 msgid "Not a valid people tag: %s"
-msgstr "Nieprawidłowy znacznik osób: %s"
+msgstr "Niewłaściwy adres e-mailowy."
 
-#: actions/peopletag.php:47 actions/peopletag.php:144
+#: actions/peopletag.php:47
 #, php-format
 msgid "Users self-tagged with %s - page %d"
-msgstr "Użytkownicy używający znacznika %s - strona %d"
+msgstr ""
 
 #: actions/peopletag.php:91
 #, php-format
 msgid "These are users who have tagged themselves \"%s\" "
-msgstr "To są użytkownicy którzy nadali sobie znacznik \"%s\" "
+msgstr ""
 
 #: actions/profilesettings.php:91
+#, fuzzy
 msgid "Profile information"
-msgstr "Informacje o profilu"
+msgstr "Nieznany profil"
 
 #: actions/profilesettings.php:124
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
-"Znaczniki dla siebie (litery, liczby, -, . i _), oddzielone przecinkami lub "
-"spacjami"
 
 #: actions/profilesettings.php:144
 msgid "Automatically subscribe to whoever "
-msgstr "Automatycznie zasubskrybuj do każdego "
+msgstr ""
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
-#: actions/tagother.php:178
-#, php-format
+#, fuzzy, php-format
 msgid "Invalid tag: \"%s\""
-msgstr "Nieprawidłowy znacznik: \"%s\""
+msgstr "Błędna strona domowa '%s'"
 
 #: actions/profilesettings.php:311
+#, fuzzy
 msgid "Couldn't save tags."
-msgstr "Nie można zapisać znaczników."
+msgstr "Nie można zapisać profilu."
 
-#: actions/public.php:107 actions/public.php:110
-#, php-format
+#: actions/public.php:107
+#, fuzzy, php-format
 msgid "Public timeline, page %d"
-msgstr "Publiczna oś czasu, strona %d"
+msgstr "Publiczna oś czasu"
 
-#: actions/public.php:173 actions/public.php:184
+#: actions/public.php:173
 msgid "Could not retrieve public stream."
-msgstr "Nie można pobrać publicznego strumienia."
+msgstr ""
 
 #: actions/public.php:220
 #, php-format
@@ -4221,132 +4029,139 @@ msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service "
 msgstr ""
-"To jest %%site.name%%, usługa [mikroblogowania](http://en.wikipedia.org/wiki/"
-"Micro-blogging) "
 
 #: actions/publictagcloud.php:57
+#, fuzzy
 msgid "Public tag cloud"
-msgstr "Publiczna chmura znaczników"
+msgstr "Publiczny Kanał Strumieni"
 
 #: actions/publictagcloud.php:63
 #, php-format
 msgid "These are most popular recent tags on %s "
-msgstr "To są najpopularniejsze ostatnie znaczniki na %s "
+msgstr ""
 
 #: actions/publictagcloud.php:119
 msgid "Tag cloud"
-msgstr "Chmura znaczników"
+msgstr ""
 
 #: actions/register.php:139 actions/register.php:349
 msgid "Sorry, only invited people can register."
-msgstr "Przepraszamy, tylko zaproszone osoby mogą się rejestrować."
+msgstr ""
 
 #: actions/register.php:149
+#, fuzzy
 msgid "You can't register if you don't "
-msgstr "Nie możesz się zarejestrować, jeśli nie "
+msgstr ""
+"Nie możesz się zarejestrować, jeśli nie zgadzasz się z warunkami licencji."
 
 #: actions/register.php:286
 msgid "With this form you can create "
-msgstr "Za pomocą tego formularza można utworzyć "
+msgstr ""
 
 #: actions/register.php:368
+#, fuzzy
 msgid "1-64 lowercase letters or numbers, "
-msgstr "1-64 małe litery lub liczby, "
+msgstr "Max. 64 znaki alfanumeryczne, bez spacji i znaków przestankowych"
 
 #: actions/register.php:382 actions/register.php:386
+#, fuzzy
 msgid "Used only for updates, announcements, "
-msgstr "Używane tylko do aktualizacji, ogłoszeń, "
+msgstr "Używane tylko do aktualizacji, ogłoszeń i przywracania hasła"
 
 #: actions/register.php:398
+#, fuzzy
 msgid "URL of your homepage, blog, "
-msgstr "Adres URL strony domowej, bloga, "
+msgstr "URL Twojej strony domowej, bloga, lub profilu na innej stronie"
 
 #: actions/register.php:404
+#, fuzzy
 msgid "Describe yourself and your "
-msgstr "Opisz się i swoje "
+msgstr "Opisz się w 140 znakach"
 
 #: actions/register.php:410
+#, fuzzy
 msgid "Where you are, like \"City, "
-msgstr "Gdzie jesteś, np. \"miasto, "
+msgstr "Gdzie jesteś? (np. \"miasto, region, kraj\")"
 
 #: actions/register.php:432
+#, fuzzy
 msgid " except this private data: password, "
-msgstr " poza tymi prywatnymi danymi: hasło, "
+msgstr ""
+"z wyłączeniem tych prywatnych danych: e-maila, identyfikatora IM, numeru "
+"telefonu."
 
 #: actions/register.php:471
 #, php-format
 msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
-msgstr "Gratulacje, %s! Witaj na %%%%site.name%%%%. "
+msgstr ""
 
 #: actions/register.php:495
 msgid "(You should receive a message by email "
-msgstr "(Powinieneś otrzymać wiadomość przez e-mail "
+msgstr ""
 
 #: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
 msgid "That's a local profile! Login to subscribe."
-msgstr "To jest profil lokalny! Zaloguj się, aby zasubskrybować."
+msgstr ""
 
-#: actions/replies.php:118 actions/replies.php:120
-#, php-format
+#: actions/replies.php:118
+#, fuzzy, php-format
 msgid "Replies to %s, page %d"
-msgstr "Odpowiedzi na %s, strona %d"
+msgstr "Odpowiedzi na %s"
 
 #: actions/showfavorites.php:79
 #, php-format
 msgid "%s favorite notices, page %d"
-msgstr "Ulubione wpisy użytkownika %s, strona %d"
+msgstr ""
 
 #: actions/showgroup.php:77 lib/groupnav.php:85
 #, php-format
 msgid "%s group"
-msgstr "Grupa %s"
+msgstr ""
 
 #: actions/showgroup.php:79
 #, php-format
 msgid "%s group, page %d"
-msgstr "Grupa %s, strona %d"
+msgstr ""
 
-#: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:206
+#, fuzzy
 msgid "Group profile"
-msgstr "Profil grupy"
+msgstr "Brak takiego wpisu."
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
-#: actions/showgroup.php:253 actions/showstream.php:271
-#: actions/tagother.php:118 lib/profilelist.php:131
 msgid "URL"
-msgstr "Adres URL"
+msgstr ""
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
-#: actions/showgroup.php:264 actions/showstream.php:282
-#: actions/tagother.php:128 lib/profilelist.php:142
+#, fuzzy
 msgid "Note"
-msgstr "Wpis"
+msgstr "Wpisy"
 
-#: actions/showgroup.php:270 actions/showgroup.php:272
+#: actions/showgroup.php:270
 msgid "Group actions"
-msgstr "Działania grupy"
+msgstr ""
 
-#: actions/showgroup.php:323 actions/showgroup.php:304
-#, php-format
+#: actions/showgroup.php:323
+#, fuzzy, php-format
 msgid "Notice feed for %s group"
-msgstr "Kanał wpisów dla grupy %s"
+msgstr "Kanał wpisów dla %s"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
-#: actions/showgroup.php:384
+#: actions/showgroup.php:357 lib/groupnav.php:90
+#, fuzzy
 msgid "Members"
-msgstr "Członkowie"
+msgstr "W serwisie od"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71 actions/showgroup.php:344
+#: lib/tagcloudsection.php:71
 msgid "(None)"
-msgstr "(Brak)"
+msgstr ""
 
-#: actions/showgroup.php:370 actions/showgroup.php:350
+#: actions/showgroup.php:370
 msgid "All members"
-msgstr "Wszyscy członkowie"
+msgstr ""
 
 #: actions/showgroup.php:378
 #, php-format
@@ -4354,51 +4169,50 @@ msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
-"**%s** jest grupą użytkowników na %%%%site.name%%%%, usłudze "
-"[mikroblogowania](http://en.wikipedia.org/wiki/Micro-blogging) "
 
 #: actions/showmessage.php:98
 msgid "Only the sender and recipient "
-msgstr "Tylko nadawca i odbiorca "
+msgstr ""
 
 #: actions/showstream.php:73
 #, php-format
 msgid "%s, page %d"
-msgstr "%s, strona %d"
+msgstr ""
 
 #: actions/showstream.php:143
+#, fuzzy
 msgid "'s profile"
-msgstr " - profil"
+msgstr "Profil"
 
 #: actions/showstream.php:236 actions/tagother.php:77
-#: actions/showstream.php:220
+#, fuzzy
 msgid "User profile"
-msgstr "Profil użytkownika"
+msgstr "Użytkownik nie ma profilu."
 
 #: actions/showstream.php:240 actions/tagother.php:81
-#: actions/showstream.php:224
 msgid "Photo"
-msgstr "Zdjęcie"
+msgstr ""
 
-#: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:317
 msgid "User actions"
-msgstr "Działania użytkownika"
+msgstr ""
 
 #: actions/showstream.php:342
 msgid "Send a direct message to this user"
-msgstr "Wyślij bezpośrednią wiadomość do tego użytkownika"
+msgstr ""
 
 #: actions/showstream.php:343
 msgid "Message"
-msgstr "Wiadomość"
+msgstr ""
 
 #: actions/showstream.php:451
+#, fuzzy
 msgid "All subscribers"
-msgstr "Wszyscy subskrybenci"
+msgstr "Subskrybenci"
 
 #: actions/showstream.php:533
 msgid "All groups"
-msgstr "Wszystkie grupy"
+msgstr ""
 
 #: actions/showstream.php:542
 #, php-format
@@ -4406,416 +4220,442 @@ msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
-"**%s** posiada konto na %%%%site.name%%%%, usłudze [mikroblogowania](http://"
-"en.wikipedia.org/wiki/Micro-blogging) "
 
 #: actions/smssettings.php:128
+#, fuzzy
 msgid "Phone number, no punctuation or spaces, "
-msgstr "Numer telefonu, bez znaków przestankowych i spacji, "
+msgstr "Max. 64 znaki alfanumeryczne, bez spacji i znaków przestankowych"
 
 #: actions/smssettings.php:162
+#, fuzzy
 msgid "Send me notices through SMS; "
-msgstr "Wyślij mi wpisy przez SMS; "
+msgstr "Wysyłaj mi wpisy przez Jabbera/GTalka"
 
 #: actions/smssettings.php:335
+#, fuzzy
 msgid "A confirmation code was sent to the phone number you added. "
-msgstr "Kod potwierdzający został wysłany na dodany numer telefonu. "
+msgstr "Ten kod potwierdzający nie jest przeznaczony dla Ciebie!"
 
 #: actions/smssettings.php:453
 msgid "Mobile carrier"
-msgstr "Operator komórkowy"
+msgstr ""
 
 #: actions/subedit.php:70
+#, fuzzy
 msgid "You are not subscribed to that profile."
-msgstr "Nie jesteś zasubskrybowany do tego profilu."
+msgstr "Ten profil nie był wysłany przez Ciebie"
 
 #: actions/subedit.php:83
+#, fuzzy
 msgid "Could not save subscription."
-msgstr "Nie można zapisać subskrypcji."
+msgstr "Nie można obserwować."
 
 #: actions/subscribe.php:55
+#, fuzzy
 msgid "Not a local user."
-msgstr "Nie jest lokalnym użytkownikiem."
+msgstr "Brak takiego użytkownika."
 
 #: actions/subscribe.php:69
+#, fuzzy
 msgid "Subscribed"
-msgstr "Zasubskrybowano"
+msgstr "Subskrybuj"
 
 #: actions/subscribers.php:50
-#, php-format
+#, fuzzy, php-format
 msgid "%s subscribers"
-msgstr "Subskrybenci %s"
+msgstr "Subskrybenci"
 
 #: actions/subscribers.php:52
 #, php-format
 msgid "%s subscribers, page %d"
-msgstr "Subskrybenci %s, strona %d"
+msgstr ""
 
 #: actions/subscribers.php:63
+#, fuzzy
 msgid "These are the people who listen to "
-msgstr "Osoby obserwujące "
+msgstr "Ludzie obserwujący wpisy użytkownika %s."
 
 #: actions/subscribers.php:67
-#, php-format
+#, fuzzy, php-format
 msgid "These are the people who "
-msgstr "Osoby, które "
+msgstr "Ludzie obserwujący wpisy użytkownika %s."
 
 #: actions/subscriptions.php:52
-#, php-format
+#, fuzzy, php-format
 msgid "%s subscriptions"
-msgstr "Subskrypcje %s"
+msgstr "Wszyscy obserwowani"
 
 #: actions/subscriptions.php:54
-#, php-format
+#, fuzzy, php-format
 msgid "%s subscriptions, page %d"
-msgstr "Subskrypcje %s, strona %d"
+msgstr "Wszyscy obserwowani"
 
 #: actions/subscriptions.php:65
+#, fuzzy
 msgid "These are the people whose notices "
-msgstr "Osoby, których wpisy "
+msgstr "Ludzie, których wpisy obserwuje użytkownik %s."
 
 #: actions/subscriptions.php:69
-#, php-format
+#, fuzzy, php-format
 msgid "These are the people whose "
-msgstr "Osoby, których "
+msgstr "Ludzie obserwujący wpisy użytkownika %s."
 
-#: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:122
+#, fuzzy
 msgid "Jabber"
-msgstr "Jabber"
+msgstr "Brak identyfikatora Jabbera."
 
-#: actions/tag.php:43 actions/tag.php:51
-#, php-format
+#: actions/tag.php:43
+#, fuzzy, php-format
 msgid "Notices tagged with %s, page %d"
-msgstr "Wpisy ze znacznikiem %s, strona %d"
+msgstr "%s – mikroblog"
 
-#: actions/tag.php:66 actions/tag.php:73
+#: actions/tag.php:66
 #, php-format
 msgid "Messages tagged \"%s\", most recent first"
-msgstr "Wiadomości ze znacznikiem \"%s\", najpierw najnowsze"
+msgstr ""
 
 #: actions/tagother.php:33
+#, fuzzy
 msgid "Not logged in"
-msgstr "Nie zalogowano"
+msgstr "Niezalogowany."
 
 #: actions/tagother.php:39
+#, fuzzy
 msgid "No id argument."
-msgstr "Brak parametru identyfikatora."
+msgstr "Brak takiego dokumentu."
 
 #: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
-msgstr "Znacznik %s"
+msgstr ""
 
 #: actions/tagother.php:141
 msgid "Tag user"
-msgstr "Znacznik użytkownika"
+msgstr ""
 
-#: actions/tagother.php:149 actions/tagother.php:151
+#: actions/tagother.php:149
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 msgstr ""
-"Znaczniki dla tego użytkownika (litery, liczby, -, . i _), oddzielone "
-"przecinkami lub spacjami"
 
 #: actions/tagother.php:164
 msgid "There was a problem with your session token."
-msgstr "Wystąpił problem z tokenem sesji."
+msgstr ""
 
-#: actions/tagother.php:191 actions/tagother.php:193
+#: actions/tagother.php:191
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
-"Można nadawać znaczniki tylko osobom, których subskrybujesz lub którzy "
-"subskrybują Ciebie."
 
-#: actions/tagother.php:198 actions/tagother.php:200
+#: actions/tagother.php:198
+#, fuzzy
 msgid "Could not save tags."
-msgstr "Nie można zapisać znaczników."
+msgstr "Nie można zapisać informacji o awatarze"
 
-#: actions/tagother.php:233 actions/tagother.php:235
+#: actions/tagother.php:233
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
-"Użyj tego formularza, aby dodać znaczniki subskrybentom lub subskrypcjom."
 
 #: actions/tagrss.php:35
+#, fuzzy
 msgid "No such tag."
-msgstr "Nie ma takiego znacznika."
+msgstr "Brak takiego wpisu."
 
-#: actions/tagrss.php:66 actions/tagrss.php:64
-#, php-format
+#: actions/tagrss.php:66
+#, fuzzy, php-format
 msgid "Microblog tagged with %s"
-msgstr "Mikroblogi ze znacznikiem %s"
+msgstr "%s – mikroblog"
 
 #: actions/twitapiblocks.php:47
 msgid "Block user failed."
-msgstr "Zablokowanie użytkownika nie powiodło się."
+msgstr ""
 
 #: actions/twitapiblocks.php:69
 msgid "Unblock user failed."
-msgstr "Odblokowanie użytkownika nie powiodło się."
+msgstr ""
 
-#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:48
+#, fuzzy
 msgid "Not found."
-msgstr "Nie znaleziono."
+msgstr "Nie znaleziono żądania!"
 
 #: actions/twittersettings.php:71
 msgid "Add your Twitter account to automatically send "
-msgstr "Dodaj konto Twittera, aby automatycznie wysyłać "
+msgstr ""
 
-#: actions/twittersettings.php:119 actions/twittersettings.php:122
+#: actions/twittersettings.php:119
 msgid "Twitter user name"
-msgstr "Nazwa użytkownika Twittera"
+msgstr ""
 
-#: actions/twittersettings.php:126 actions/twittersettings.php:129
+#: actions/twittersettings.php:126
+#, fuzzy
 msgid "Twitter password"
-msgstr "Hasło Twittera"
+msgstr "Nowe hasło"
 
-#: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:228
 msgid "Twitter Friends"
-msgstr "Przyjaciele z Twittera"
+msgstr ""
 
 #: actions/twittersettings.php:327
 msgid "Username must have only numbers, "
-msgstr "Nazwa użytkownika może zawierać tylko liczby, "
+msgstr ""
 
 #: actions/twittersettings.php:341
-#, php-format
+#, fuzzy, php-format
 msgid "Unable to retrieve account information "
-msgstr "Nie można pobrać informacji o koncie "
+msgstr "Nie można skasować potwierdzenia adresu e-mail."
 
 #: actions/unblock.php:108
+#, fuzzy
 msgid "Error removing the block."
-msgstr "Błąd podczas usuwania blokady."
+msgstr "Błąd w zapisie użytkownika."
 
 #: actions/unsubscribe.php:50
+#, fuzzy
 msgid "No profile id in request."
-msgstr "Brak identyfikatora profilu w żądaniu."
+msgstr "Serwer nie zwrócił żadnego URL-a."
 
 #: actions/unsubscribe.php:57
+#, fuzzy
 msgid "No profile with that id."
-msgstr "Brak profilu z tym identyfikatorem."
+msgstr "Zdalny profil bez odpowiadającego profilu lokalnego"
 
 #: actions/unsubscribe.php:71
+#, fuzzy
 msgid "Unsubscribed"
-msgstr "Zrezygnowano z subskrypcji"
+msgstr "Zrezygnuj z subskrypcji"
 
 #: actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
-msgstr "Grupy %s"
+msgstr ""
 
 #: actions/usergroups.php:65
 #, php-format
 msgid "%s groups, page %d"
-msgstr "Grupy %s, strona %d"
+msgstr ""
 
-#: classes/Notice.php:104 classes/Notice.php:128
+#: classes/Notice.php:104
+#, fuzzy
 msgid "Problem saving notice. Unknown user."
-msgstr "Problem podczas zapisywania wpisu. Nieznany użytkownik."
+msgstr "Problem z zachowywaniem wpisu."
 
-#: classes/Notice.php:109 classes/Notice.php:133
+#: classes/Notice.php:109
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
-"Za dużo wpisów w za krótkim czasie, weź głęboki oddech i wyślij ponownie za "
-"kilka minut."
 
-#: classes/Notice.php:116 classes/Notice.php:145
+#: classes/Notice.php:116
 msgid "You are banned from posting notices on this site."
-msgstr "Zabroniono Ci wysyłania wpisów na tej stronie."
+msgstr ""
 
 #: lib/accountsettingsaction.php:108
+#, fuzzy
 msgid "Upload an avatar"
-msgstr "Wyślij awatar"
+msgstr "Uaktualnianie awatara nie powiodło się."
 
 #: lib/accountsettingsaction.php:119
 msgid "Other"
-msgstr "Inne"
+msgstr ""
 
 #: lib/accountsettingsaction.php:120
 msgid "Other options"
-msgstr "Inne opcje"
+msgstr ""
 
-#: lib/action.php:130 lib/action.php:132
+#: lib/action.php:130
 #, php-format
 msgid "%s - %s"
-msgstr "%s - %s"
+msgstr ""
 
-#: lib/action.php:145 lib/action.php:147
+#: lib/action.php:145
 msgid "Untitled page"
-msgstr "Strona bez nazwy"
+msgstr ""
 
-#: lib/action.php:316 lib/action.php:387
+#: lib/action.php:316
 msgid "Primary site navigation"
-msgstr "Główna nawigacja strony"
+msgstr ""
 
-#: lib/action.php:322 lib/action.php:393
+#: lib/action.php:322
 msgid "Personal profile and friends timeline"
-msgstr "Profil osobisty i oś czasu przyjaciół"
+msgstr ""
 
-#: lib/action.php:325 lib/action.php:396
+#: lib/action.php:325
 msgid "Search for people or text"
-msgstr "Znajdź osoby lub tekst"
+msgstr ""
 
-#: lib/action.php:328 lib/action.php:399
+#: lib/action.php:328
+#, fuzzy
 msgid "Account"
-msgstr "Konto"
+msgstr "O serwisie"
 
-#: lib/action.php:328 lib/action.php:399
+#: lib/action.php:328
 msgid "Change your email, avatar, password, profile"
-msgstr "Zmień adres e-mail, awatar, hasło, profil"
+msgstr ""
 
-#: lib/action.php:330 lib/action.php:403
+#: lib/action.php:330
 msgid "Connect to IM, SMS, Twitter"
-msgstr "Połącz z komunikatorem, SMS, Twitterem"
+msgstr ""
 
-#: lib/action.php:332 lib/action.php:409
+#: lib/action.php:332
 msgid "Logout from the site"
-msgstr "Wyloguj się ze strony"
+msgstr ""
 
-#: lib/action.php:335 lib/action.php:412
+#: lib/action.php:335
 msgid "Login to the site"
-msgstr "Zaloguj się na stronę"
+msgstr ""
 
-#: lib/action.php:338 lib/action.php:415
+#: lib/action.php:338
+#, fuzzy
 msgid "Create an account"
-msgstr "Utwórz konto"
+msgstr "Załóż nowe konto"
 
-#: lib/action.php:341 lib/action.php:418
+#: lib/action.php:341
+#, fuzzy
 msgid "Login with OpenID"
-msgstr "Zaloguj się za pomocą OpenID"
+msgstr "Brak takiego identyfikatora OpenID."
 
-#: lib/action.php:344 lib/action.php:421
+#: lib/action.php:344
+#, fuzzy
 msgid "Help me!"
-msgstr "Pomóż mi!"
+msgstr "Pomoc"
 
-#: lib/action.php:362 lib/action.php:441
+#: lib/action.php:362
+#, fuzzy
 msgid "Site notice"
-msgstr "Wpis strony"
+msgstr "Nowy wpis"
 
-#: lib/action.php:417 lib/action.php:504
+#: lib/action.php:417
 msgid "Local views"
-msgstr "Lokalne widoki"
+msgstr ""
 
-#: lib/action.php:472 lib/action.php:559
+#: lib/action.php:472
+#, fuzzy
 msgid "Page notice"
-msgstr "Wpis strony"
+msgstr "Nowy wpis"
 
-#: lib/action.php:562 lib/action.php:654
+#: lib/action.php:562
+#, fuzzy
 msgid "Secondary site navigation"
-msgstr "Druga nawigacja strony"
+msgstr "Subskrypcje"
 
-#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
+#: lib/action.php:602 lib/action.php:623
 msgid "Laconica software license"
-msgstr "Licencja oprogramowania Laconica"
+msgstr ""
 
-#: lib/action.php:630 lib/action.php:727
+#: lib/action.php:630
 msgid "All "
-msgstr "Wszystko "
+msgstr ""
 
-#: lib/action.php:635 lib/action.php:732
+#: lib/action.php:635
 msgid "license."
-msgstr "licencja."
+msgstr ""
 
 #: lib/blockform.php:123 lib/blockform.php:153
+#, fuzzy
 msgid "Block this user"
-msgstr "Zablokuj tego użytkownika"
+msgstr "Brak takiego użytkownika."
 
 #: lib/blockform.php:153
 msgid "Block"
-msgstr "Zablokuj"
+msgstr ""
 
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
 msgid "Disfavor this notice"
-msgstr "Usuń ten wpis z ulubionych"
+msgstr ""
 
 #: lib/facebookaction.php:268
 #, php-format
 msgid "To use the %s Facebook Application you need to login "
-msgstr "Aby używać aplikacji Facebook %s, musisz się zalogować "
+msgstr ""
 
-#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:271
+#, fuzzy
 msgid " a new account."
-msgstr " nowe konto."
+msgstr "Załóż nowe konto"
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#, fuzzy
 msgid "Published"
-msgstr "Opublikowano"
+msgstr "Publiczny"
 
 #: lib/favorform.php:114 lib/favorform.php:140
+#, fuzzy
 msgid "Favor this notice"
-msgstr "Dodaj ten wpis do ulubionych"
+msgstr "Brak takiego wpisu."
 
 #: lib/feedlist.php:64
 msgid "Export data"
-msgstr "Wyeksportuj dane"
+msgstr "Dane do exportowania"
 
 #: lib/galleryaction.php:121
 msgid "Filter tags"
-msgstr "Filtruj znaczniki"
+msgstr ""
 
 #: lib/galleryaction.php:131
 msgid "All"
-msgstr "Wszystko"
+msgstr ""
 
 #: lib/galleryaction.php:137
 msgid "Tag"
-msgstr "Znacznik"
+msgstr ""
 
 #: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
-msgstr "Wybierz znacznik do ograniczonej listy"
+msgstr ""
 
 #: lib/galleryaction.php:139
 msgid "Go"
-msgstr "Przejdź"
+msgstr ""
 
 #: lib/groupeditform.php:148
+#, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
-msgstr "Adres URL strony domowej lub bloga grupy, albo temat"
+msgstr "URL Twojej strony domowej, bloga, lub profilu na innej stronie"
 
 #: lib/groupeditform.php:151
+#, fuzzy
 msgid "Description"
-msgstr "Opis"
+msgstr "Subskrypcje"
 
 #: lib/groupeditform.php:153
+#, fuzzy
 msgid "Describe the group or topic in 140 chars"
-msgstr "Opisz grupę lub temat w 140 znakach"
+msgstr "Opisz się w 140 znakach"
 
 #: lib/groupeditform.php:158
+#, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr ""
-"Położenie grupy, jeśli istnieje, np. \"miasto, województwo (lub region), kraj"
-"\""
+msgstr "Gdzie jesteś? (np. \"miasto, region, kraj\")"
 
 #: lib/groupnav.php:84 lib/searchgroupnav.php:84
 msgid "Group"
-msgstr "Grupa"
+msgstr ""
 
 #: lib/groupnav.php:100
 msgid "Admin"
-msgstr "Administrator"
+msgstr ""
 
 #: lib/groupnav.php:101
 #, php-format
 msgid "Edit %s group properties"
-msgstr "Edytuj właściwości grupy %s"
+msgstr ""
 
 #: lib/groupnav.php:106
+#, fuzzy
 msgid "Logo"
-msgstr "Logo"
+msgstr "Wyloguj"
 
 #: lib/groupnav.php:107
 #, php-format
 msgid "Add or edit %s logo"
-msgstr "Dodaj lub edytuj logo grupy %s"
+msgstr ""
 
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
-msgstr "Grupy z największą liczbą członków"
+msgstr "Grupy z największą ilością członków"
 
 #: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
@@ -4824,31 +4664,37 @@ msgstr "Grupy z największą ilością wpisów"
 #: lib/grouptagcloudsection.php:56
 #, php-format
 msgid "Tags in %s group's notices"
-msgstr "Znaczniki we wpisach grupy %s"
+msgstr "Tagi we wpisach grupy %s"
 
 #: lib/htmloutputter.php:104
+#, fuzzy
 msgid "This page is not available in a "
-msgstr "Ta strona nie jest dostępna w "
+msgstr "Ta strona nie jest dostępna dla medium, którego typ akceptujesz"
 
+# aaa
 #: lib/joinform.php:114
+#, fuzzy
 msgid "Join"
-msgstr "Dołącz"
+msgstr "Dołacz"
 
 #: lib/leaveform.php:114
+#, fuzzy
 msgid "Leave"
-msgstr "Opuść"
+msgstr "Zapisz"
 
 #: lib/logingroupnav.php:76
+#, fuzzy
 msgid "Login with a username and password"
-msgstr "Zaloguj się za pomocą nazwy użytkownika i hasła"
+msgstr "Błędna nazwa użytkownika lub hasło."
 
 #: lib/logingroupnav.php:79
+#, fuzzy
 msgid "Sign up for a new account"
 msgstr "Załóż nowe konto"
 
 #: lib/logingroupnav.php:82
 msgid "Login or register with OpenID"
-msgstr "Zaloguj się lub zarejestruj za pomocą OpenID"
+msgstr "Zaloguj lub zarejestruj się z użyciem OpenID"
 
 #: lib/mail.php:175
 #, php-format
@@ -4856,21 +4702,21 @@ msgid ""
 "Hey, %s.\n"
 "\n"
 msgstr ""
-"Cześć, %s.\n"
+"Hej, %s,\n"
 "\n"
 
 #: lib/mail.php:236
-#, php-format
+#, fuzzy, php-format
 msgid "%1$s is now listening to "
-msgstr "%1$s obserwuje teraz "
+msgstr "%1$s obserwuje teraz Twoje wpisy na %2$s."
 
 #: lib/mail.php:254
-#, php-format
+#, fuzzy, php-format
 msgid "Location: %s\n"
-msgstr "Położenie: %s\n"
+msgstr "Lokalizacja: %s\n"
 
 #: lib/mail.php:256
-#, php-format
+#, fuzzy, php-format
 msgid "Homepage: %s\n"
 msgstr "Strona domowa: %s\n"
 
@@ -4880,103 +4726,100 @@ msgid ""
 "Bio: %s\n"
 "\n"
 msgstr ""
-"O mnie: %s\n"
-"\n"
 
-#: lib/mail.php:461 lib/mail.php:462
+#: lib/mail.php:461
 #, php-format
 msgid "You've been nudged by %s"
-msgstr "Zostałeś szturchnięty przez %s"
+msgstr ""
 
 #: lib/mail.php:465
 #, php-format
 msgid "%1$s (%2$s) is wondering what you are up to "
-msgstr "%1$s (%2$s) zastanawia się, co zamierzasz "
+msgstr ""
 
 #: lib/mail.php:555
-#, php-format
+#, fuzzy, php-format
 msgid "%1$s just added your notice from %2$s"
-msgstr "%1$s właśnie dodał Twój wpis z %2$s"
+msgstr "%1$s obserwuje teraz Twoje wpisy na %2$s."
 
-#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
-#: lib/noticelist.php:383
+#: lib/mailbox.php:229 lib/noticelist.php:380
 msgid "From"
 msgstr "Od"
 
-#: lib/messageform.php:110 lib/messageform.php:109
+#: lib/messageform.php:110
 msgid "Send a direct notice"
 msgstr "Wyślij bezpośredni wpis"
 
 #: lib/noticeform.php:125
+#, fuzzy
 msgid "Send a notice"
-msgstr "Wyślij wpis"
+msgstr "Nowy wpis"
 
 #: lib/noticeform.php:152
+#, fuzzy
 msgid "Available characters"
-msgstr "Dostępne znaki"
+msgstr "6 lub więcej znaków"
 
-#: lib/noticelist.php:426 lib/noticelist.php:429
+#: lib/noticelist.php:426
+#, fuzzy
 msgid "in reply to"
-msgstr "w odpowiedzi na"
+msgstr "w odpowiedzi na…"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
-#: lib/noticelist.php:454
+#: lib/noticelist.php:447 lib/noticelist.php:450
 msgid "Reply to this notice"
 msgstr "Odpowiedz na ten wpis"
 
-#: lib/noticelist.php:451 lib/noticelist.php:455
+#: lib/noticelist.php:451
+#, fuzzy
 msgid "Reply"
-msgstr "Odpowiedz"
+msgstr "Odpowiedź"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
-#: lib/noticelist.php:479
+#: lib/noticelist.php:471 lib/noticelist.php:474
 msgid "Delete this notice"
 msgstr "Usuń ten wpis"
 
-#: lib/noticelist.php:474 actions/avatarsettings.php:148
-#: lib/noticelist.php:479
+#: lib/noticelist.php:474
 msgid "Delete"
 msgstr "Usuń"
 
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
-msgstr "Szturchnij tego użytkownika"
+msgstr ""
 
 #: lib/nudgeform.php:128
 msgid "Nudge"
-msgstr "Szturchnij"
+msgstr ""
 
 #: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
-msgstr "Wyślij szturchnięcie do tego użytkownika"
+msgstr ""
 
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
-msgstr "Znaczniki we wpisach użytkownika %s"
+msgstr ""
 
-#: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/profilelist.php:182
 msgid "(none)"
-msgstr "(brak)"
+msgstr ""
 
-#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
+#: lib/publicgroupnav.php:76
 msgid "Public"
 msgstr "Publiczny"
 
-#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
+#: lib/publicgroupnav.php:80
 msgid "User groups"
-msgstr "Grupy użytkowników"
+msgstr ""
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
-msgstr "Ostatnie znaczniki"
+msgstr ""
 
-#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
+#: lib/publicgroupnav.php:86
 msgid "Featured"
-msgstr "Znane"
+msgstr "Wyróżnione"
 
-#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
+#: lib/publicgroupnav.php:90
 msgid "Popular"
 msgstr "Popularne"
 
@@ -4990,43 +4833,44 @@ msgstr "Znajdź grupy na tej stronie"
 
 #: lib/section.php:89
 msgid "Untitled section"
-msgstr "Sekcja bez nazwy"
+msgstr ""
 
 #: lib/subgroupnav.php:81
-#, php-format
+#, fuzzy, php-format
 msgid "People %s subscribes to"
-msgstr "Osoby %s zasubskrybowane do"
+msgstr "Zdalna subskrypcja"
 
 #: lib/subgroupnav.php:89
-#, php-format
+#, fuzzy, php-format
 msgid "People subscribed to %s"
-msgstr "Osoby zasubskrybowane do %s"
+msgstr "Zdalna subskrypcja"
 
 #: lib/subgroupnav.php:97
 #, php-format
 msgid "Groups %s is a member of"
-msgstr "Grupy %s są członkiem"
+msgstr ""
 
 #: lib/subgroupnav.php:104
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
-msgstr "Zaproś przyjaciół i kolegów do dołączenia do Ciebie na %s"
+msgstr "Zaproś przyjaciół i kolegów, by dołączyli do Ciebie na %s"
 
 #: lib/subs.php:53
 msgid "User has blocked you."
 msgstr "Użytkownik zablokował Cię."
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
+#, fuzzy
 msgid "Subscribe to this user"
-msgstr "Zasubskrybuj tego użytkownika"
+msgstr "Subskrypcja uwierzytelniona"
 
 #: lib/tagcloudsection.php:56
 msgid "None"
-msgstr "Brak"
+msgstr ""
 
 #: lib/topposterssection.php:74
 msgid "Top posters"
-msgstr "Najczęściej wysyłający wpisy"
+msgstr ""
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
 msgid "Unblock this user"
@@ -5038,625 +4882,25 @@ msgstr "Odblokuj"
 
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
-msgstr "Zrezygnuj z subskrypcji tego użytkownika"
-
-#: actions/all.php:77
-#, php-format
-msgid "Feed for friends of %s (RSS 1.0)"
-msgstr "Kanał dla znajomych użytkownika %s (RSS 1.0)"
-
-#: actions/all.php:82
-#, php-format
-msgid "Feed for friends of %s (RSS 2.0)"
-msgstr "Kanał dla znajomych użytkownika %s (RSS 2.0)"
-
-#: actions/all.php:87
-#, php-format
-msgid "Feed for friends of %s (Atom)"
-msgstr "Kanał dla znajomych użytkownika %s (Atom)"
-
-#: actions/all.php:112
-msgid "You and friends"
-msgstr "Ty i przyjaciele"
-
-#: actions/avatarsettings.php:78
-#, php-format
-msgid "You can upload your personal avatar. The maximum file size is %s."
-msgstr "Można wysłać swój osobisty awatar. Maksymalny rozmiar pliku to %s."
-
-#: actions/avatarsettings.php:373
-msgid "Avatar deleted."
-msgstr "Usunięto awatar."
-
-#: actions/block.php:129
-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 ""
-"Jesteś pewny, że chcesz zablokować tego użytkownika. Po tym jego subskrypcja "
-"do Ciebie zostanie usunięta, nie będzie mógł Cię zasubskrybować w "
-"przyszłości i nie będziesz powiadamiany o żadnych odpowiedziach @ od niego."
-
-#: actions/deletenotice.php:73
-msgid ""
-"You are about to permanently delete a notice. Once this is done, it cannot "
-"be undone."
-msgstr ""
-"Za chwilę wpis zostanie trwale usunięty. Kiedy to się stanie, to już się nie "
-"odstanie."
-
-#: actions/deletenotice.php:127
-msgid "There was a problem with your session token.  Try again, please."
-msgstr "Wystąpił problem z tokenem sesji. Spróbuj ponownie."
-
-#: actions/emailsettings.php:168
-msgid "Send me email when someone sends me an \"@-reply\"."
-msgstr "Wyślij mi wiadomość e-mail, kiedy ktoś wyśle mi odpowiedź \"@\"."
-
-#: actions/facebookhome.php:193
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-"Jeśli chcesz, aby aplikacja %s automatycznie aktualizowała status na "
-"Facebook najnowszym wpisem, musisz dać jej pozwolenie."
-
-#: actions/facebookhome.php:217
-#, php-format
-msgid "Okay, do it!"
-msgstr "OK, zrób to!"
-
-#: actions/facebooksettings.php:124
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
 msgstr ""
-"Jeśli chcesz, aby %s automatycznie aktualizowało status na Facebook "
-"najnowszym wpisem, musisz dać mu pozwolenie."
-
-#: actions/grouplogo.php:155
-#, 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:367
-msgid "Pick a square area of the image to be the logo."
-msgstr "Wybierz kwadratowy obszar obrazu, który będzie logo."
 
-#: actions/grouprss.php:136
-#, php-format
-msgid "Microblog by %s group"
-msgstr "Mikroblog grupy %s"
+#, fuzzy
+#~ msgid "Delete my account"
+#~ msgstr "Załóż nowe konto"
 
-#: actions/groupsearch.php:57
-#, 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 ""
-"Znajdź grupy na %%site.name%% według ich nazwy, położenia lub opisu. Oddziel "
-"terminy spacjami; muszą mieć trzy znaki lub więcej."
-
-#: 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 ""
-"Grupy %%%%site.name%%%% umożliwiają znalezienie i rozmawianie z osobami o "
-"podobnych zainteresowaniach. Po dołączeniu do grupy można wysyłać wiadomości "
-"do wszystkich członków używając składni \"!nazwagrupy\". Nie widzisz grupy, "
-"która Cię interesuje? Spróbuj ją [znaleźć](%%%%action.groupsearch%%%%) lub "
-"[założyć własną!](%%%%action.newgroup%%%%)"
-
-#: actions/newmessage.php:102
-msgid "Only logged-in users can send direct messages."
-msgstr "Tylko zalogowani użytkownicy mogą wysyłać bezpośrednie wiadomości."
-
-#: actions/noticesearch.php:91
-#, php-format
-msgid "Search results for \"%s\" on %s"
-msgstr "Wyniki wyszukiwania dla \"%s\" na %s"
-
-#: actions/openidlogin.php:66
-#, php-format
-msgid ""
-"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
-"before changing your settings."
-msgstr ""
-"Z powodów bezpieczeństwa przed zmienianiem ustawień zaloguj się ponownie za "
-"pomocą identyfikatora [OpenID](%%doc.openid%%)."
-
-#: actions/public.php:125
-msgid "Public Stream Feed (RSS 1.0)"
-msgstr "Kanał publicznego strumienia (RSS 1.0)"
-
-#: actions/public.php:130
-msgid "Public Stream Feed (RSS 2.0)"
-msgstr "Kanał publicznego strumienia (RSS 2.0)"
-
-#: actions/public.php:135
-msgid "Public Stream Feed (Atom)"
-msgstr "Kanał publicznego strumienia (Atom)"
-
-#: actions/public.php:210
-#, php-format
-msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service based on the Free Software [Laconica](http://laconi.ca/) "
-"tool. [Join now](%%action.register%%) to share notices about yourself with "
-"friends, family, and colleagues! ([Read more](%%doc.help%%))"
-msgstr ""
-"To jest %%site.name%%, usługa [mikroblogowania](http://en.wikipedia.org/wiki/"
-"Micro-blogging) oparta na wolnym narzędziu [Laconica](http://laconi.ca/). "
-"[Dołącz teraz](%%action.register%%), aby dzielić się wpisami o sobie z "
-"przyjaciółmi, rodziną i kolegami! ([Przeczytaj więcej](%%doc.help%%))"
-
-#: actions/register.php:286
-#, php-format
-msgid ""
-"With this form you can create  a new account. You can then post notices and "
-"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? "
-"Try our [OpenID registration](%%action.openidlogin%%)!)"
-msgstr ""
-"Za pomocą tego formularza można utworzyć nowe konto. Można wtedy wysyłać "
-"wpisy i połączyć się z przyjaciółmi i kolegami. (Posiadasz identyfikator "
-"[OpenID](http://openid.net/)? Wypróbuj [rejestracji OpenID](%%action."
-"openidlogin%%)!)"
-
-#: actions/register.php:432
-msgid "Creative Commons Attribution 3.0"
-msgstr "Creative Commons Uznanie Autorstwa 3.0"
-
-#: actions/register.php:433
-msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
-msgstr ""
-" poza tymi prywatnymi danymi: hasło, adres e-mail, adres komunikatora i "
-"numer telefonu."
+#~ msgid "Couldn't confirm email."
+#~ msgstr "Nie można potwierdzić e-maila."
 
-#: actions/showgroup.php:378
-msgid "Created"
-msgstr "Utworzono"
-
-#: actions/showgroup.php:393
-#, 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 "
-"[Laconica](http://laconi.ca/) 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 ""
-"**%s** jest grupą użytkowników na %%%%site.name%%%%, usłudze "
-"[mikroblogowania](http://en.wikipedia.org/wiki/Micro-blogging) opartej na "
-"wolnym narzędziu [Laconica](http://laconi.ca/). Jej członkowie dzielą się "
-"krótkimi wiadomościami o swoim życiu i zainteresowaniach. [Dołącz teraz](%%%%"
-"action.register%%%%), aby stać się częścią tej grupy i wiele więcej! "
-"([Przeczytaj więcej](%%%%doc.help%%%%))"
-
-#: actions/showstream.php:147
-msgid "Your profile"
-msgstr "Twój profil"
-
-#: actions/showstream.php:149
-#, php-format
-msgid "%s's profile"
-msgstr "Profil użytkownika %s"
-
-#: actions/showstream.php:163
-#, php-format
-msgid "Notice feed for %s (RSS 1.0)"
-msgstr "Kanał wpisów dla %s (RSS 1.0)"
-
-#: actions/showstream.php:170
-#, php-format
-msgid "Notice feed for %s (RSS 2.0)"
-msgstr "Kanał wpisów dla %s (RSS 2.0)"
-
-#: actions/showstream.php:177
-#, php-format
-msgid "Notice feed for %s (Atom)"
-msgstr "Kanał wpisów dla %s (Atom)"
-
-#: actions/showstream.php:182
-#, php-format
-msgid "FOAF for %s"
-msgstr "FOAF dla %s"
-
-#: actions/showstream.php:237
-msgid "Edit Avatar"
-msgstr "Edytuj awatar"
-
-#: actions/showstream.php:316
-msgid "Edit profile settings"
-msgstr "Edytuj ustawienia profilu"
-
-#: actions/showstream.php:317
-msgid "Edit"
-msgstr "Edytuj"
-
-#: actions/showstream.php:542
-#, 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 "
-"[Laconica](http://laconi.ca/) tool. [Join now](%%%%action.register%%%%) to "
-"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
-msgstr ""
-"**%s** posiada konto na %%%%site.name%%%%, usłudze [mikroblogowania](http://"
-"en.wikipedia.org/wiki/Micro-blogging) opartej na wolnym narzędziu [Laconica]"
-"(http://laconi.ca/). [Dołącz teraz](%%%%action.register%%%%), aby obserwować "
-"wpisy użytkownika **%s** i wiele więcej! ([Przeczytaj więcej](%%%%doc.help%%%"
-"%))"
-
-#: actions/smssettings.php:335
-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 ""
-"Kod potwierdzający został wysłany na dodany numer telefonu. Sprawdź telefon, "
-"czy otrzymałeś kod i instrukcje jak go użyć."
-
-#: actions/twitapifavorites.php:171 lib/mail.php:556
-#, php-format
-msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
-"In case you forgot, you can see the text of your notice here:\n"
-"\n"
-"%3$s\n"
-"\n"
-"You can see the list of %1$s's favorites here:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Faithfully yours,\n"
-"%5$s\n"
-msgstr ""
-"%1$s właśnie dodał Twój wpis z %2$s jako jeden ze swoich ulubionych.\n"
-"\n"
-"Jeśli go zapomniałeś, tutaj możesz zobaczyć tekst wpisu:\n"
-"\n"
-"%3$s\n"
-"\n"
-"Tutaj możesz zobaczyć listę ulubionych wpisów użytkownika %1$s:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Z poważaniem,\n"
-"%5$s\n"
-
-#: actions/twitapistatuses.php:124
-msgid "No such user!"
-msgstr "Nie ma takiego użytkownika!"
-
-#: actions/twittersettings.php:72
-msgid ""
-"Add your Twitter account to automatically send  your notices to Twitter, and "
-"subscribe to Twitter friends already here."
-msgstr ""
-"Dodaj konto Twittera, aby automatycznie wysyłać wpisy do Twittera i "
-"zasubskrybować przyjaciół z Twittera, którzy już tu są."
-
-#: actions/twittersettings.php:345
-#, php-format
-msgid "Unable to retrieve account information For \"%s\" from Twitter."
-msgstr "Nie można pobrać informacji o koncie dla \"%s\" z Twittera."
-
-#: actions/userauthorization.php:86
-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 ""
-"Sprawdź te szczegóły, aby upewnić się, czy na pewno chcesz zasubskrybować "
-"wpisy tego użytkownika. Jeżeli nie prosiłeś o subskrypcję czyichś wpisów, "
-"naciśnij \"Odrzuć\"."
-
-#: actions/usergroups.php:131
-msgid "Search for more groups"
-msgstr "Znajdź więcej grup"
-
-#: classes/Notice.php:138
-msgid ""
-"Too many duplicate messages too quickly; take a breather and post again in a "
-"few minutes."
-msgstr ""
-"Za dużo takich samych wiadomości w za krótkim czasie, weź głęboki oddech i "
-"wyślij ponownie za kilka minut."
-
-#: lib/action.php:406
-msgid "Connect to SMS, Twitter"
-msgstr "Połącz z SMS, Twitterem"
-
-#: lib/action.php:671
-msgid "Badge"
-msgstr "Odznaka"
-
-#: lib/command.php:113
-#, php-format
-msgid ""
-"Subscriptions: %1$s\n"
-"Subscribers: %2$s\n"
-"Notices: %3$s"
-msgstr ""
-"Subskrypcje: %1$s\n"
-"Subskrybenci: %2$s\n"
-"Wpisy: %3$s"
-
-#: lib/command.php:392
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\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"
-"fav <nickname> - add user's last notice as a 'fave'\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> - not yet implemented.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
-msgstr ""
-"Polecenia:\n"
-"on - włącza powiadomienia\n"
-"off - wyłącza powiadomienia\n"
-"help - wyświetla tę pomoc\n"
-"follow <pseudonim> - subskrybuje użytkownika\n"
-"leave <pseudonim> - rezygnuje z subskrypcji użytkownika\n"
-"d <pseudonim> <tekst> - bezpośrednia wiadomość do użytkownika\n"
-"get <pseudonim> - uzyskuje ostatni wpis użytkownika\n"
-"whois <pseudonim> - uzyskuje informacje o profilu użytkownika\n"
-"fav <pseudonim> - dodaje ostatni wpis użytkownika jako \"ulubiony\"\n"
-"stats - uzyskuje Twoje statystyki\n"
-"stop - to samo co \"off\"\n"
-"quit - to samo co \"off\"\n"
-"sub <pseudonim> - to samo co \"follow\"\n"
-"unsub <pseudonim> - to samo co \"leave\"\n"
-"last <pseudonim> - to samo co \"get\"\n"
-"on <pseudonim> - jeszcze nie zaimplementowano.\n"
-"off <pseudonim> - jeszcze nie zaimplementowano.\n"
-"nudge <pseudonim> - jeszcze nie zaimplementowano.\n"
-"invite <numer telefonu> - jeszcze nie zaimplementowano.\n"
-"track <słowo> - jeszcze nie zaimplementowano.\n"
-"untrack <słowo> - jeszcze nie zaimplementowano.\n"
-"track off - jeszcze nie zaimplementowano.\n"
-"untrack all - jeszcze nie zaimplementowano.\n"
-"tracks - jeszcze nie zaimplementowano.\n"
-"tracking - jeszcze nie zaimplementowano.\n"
-
-#: lib/dberroraction.php:60
-msgid "Database error"
-msgstr "Błąd bazy danych"
-
-#: lib/facebookaction.php:271
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet? "
-msgstr ""
-"Aby użyć aplikacji Facebook %s, musisz się zalogować za pomocą nazwy "
-"użytkownika i hasła. Nie masz jeszcze nazwy użytkownika? "
-
-#: lib/feed.php:85
-msgid "RSS 1.0"
-msgstr "RSS 1.0"
-
-#: lib/feed.php:87
-msgid "RSS 2.0"
-msgstr "RSS 2.0"
-
-#: lib/feed.php:89
-msgid "Atom"
-msgstr "Atom"
-
-#: lib/feed.php:91
-msgid "FOAF"
-msgstr "FOAF"
-
-#: lib/imagefile.php:75
-#, php-format
-msgid "That file is too big. The maximum file size is %d."
-msgstr "Ten plik jest za duży. Maksymalny rozmiar pliku to %d."
-
-#: lib/mail.php:175
-#, php-format
-msgid ""
-"Hey, %s.\n"
-"\n"
-"Someone just entered this email address on %s.\n"
-"\n"
-"If it was you, and you want to confirm your entry, use the URL below:\n"
-"\n"
-"\t%s\n"
-"\n"
-"If not, just ignore this message.\n"
-"\n"
-"Thanks for your time, \n"
-"%s\n"
-msgstr ""
-"Cześć, %s.\n"
-"\n"
-"Ktoś właśnie podał ten adres e-mail na %s.\n"
-"\n"
-"Jeśli to byłeś Ty, i chcesz potwierdzić swoje wejście, użyj poniższego "
-"adresu URL:\n"
-"\n"
-"\t%s\n"
-"\n"
-"Jeśli to nie ty, po prostu zignoruj tę wiadomość.\n"
-"\n"
-"Dziękujemy za Twój czas, \n"
-"%s\n"
-
-#: lib/mail.php:241
-#, 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"
-"%7$s.\n"
-"\n"
-"----\n"
-"Change your email address or notification options at %8$s\n"
-msgstr ""
-"Użytkownik %1$s obserwuje teraz Twoje wpisy na %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"%4$s%5$s%6$s\n"
-"Z poważaniem,\n"
-"%7$s.\n"
-"\n"
-"----\n"
-"Zmień adres e-mail lub opcje powiadamiania na %8$s\n"
-
-#: lib/mail.php:466
-#, 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 ""
-"Użytkownik %1$s (%2$s) zastanawia się, co się z Tobą dzieje w ostatnich "
-"dniach i zaprasza Cię do wysłania jakichś aktualności.\n"
-"\n"
-"Tak więc do usłyszenia. :)\n"
-"\n"
-"%3$s\n"
-"\n"
-"Nie odpowiadaj na tę wiadomość e-mail, nie dotrze ona do nich.\n"
-"\n"
-"Z poważaniem,\n"
-"%4$s\n"
-
-#: lib/mail.php:513
-#, 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 ""
-"Użytkownik %1$s (%2$s) wysłał Ci prywatną wiadomość:\n"
-"\n"
-"------------------------------------------------------\n"
-"%3$s\n"
-"------------------------------------------------------\n"
-"\n"
-"Tutaj możesz na nią odpowiedzieć:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Nie odpowiadaj na tę wiadomość e-mail, nie dotrze ona do nich.\n"
-"\n"
-"Z poważaniem,\n"
-"%5$s\n"
-
-#: lib/mail.php:598
-#, php-format
-msgid "%s sent a notice to your attention"
-msgstr "Użytkownik %s wysłał wpis wymagający Twojej uwagi"
-
-#: lib/mail.php:600
-#, php-format
-msgid ""
-"%1$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"
-"You can reply back here:\n"
-"\n"
-"\t%5$s\n"
-"\n"
-"The list of all @-replies for you here:\n"
-"\n"
-"%6$s\n"
-"\n"
-"Faithfully yours,\n"
-"%2$s\n"
-"\n"
-"P.S. You can turn off these email notifications here: %7$s\n"
-msgstr ""
-"Użytkownik %1$s właśnie wysłał wpis wymagający Twojej uwagi (odpowiedź \"@"
-"\") na %2$s.\n"
-"\n"
-"Twój wpis znajduje się tutaj:\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Zawiera tekst:\n"
-"\n"
-"\t%4$s\n"
-"\n"
-"Tutaj możesz odpowiedzieć:\n"
-"\n"
-"\t%5$s\n"
-"\n"
-"Lista wszystkich odpowiedzi \"@\" do Ciebie znajduje się tutaj:\n"
-"\n"
-"%6$s\n"
-"\n"
-"Z poważaniem,\n"
-"%2$s\n"
-"\n"
-"PS Tutaj możesz wyłączyć te powiadomienia przez e-mail: %7$s\n"
+#~ msgid "Email address"
+#~ msgstr "Adres e-mailowy"
 
-#: lib/searchaction.php:122
-msgid "Search site"
-msgstr "Znajdź stronę"
+#~ msgid "Error inserting notice"
+#~ msgstr "Błąd przy wprowadzaniu wpisu"
 
-#: lib/section.php:106
-msgid "More..."
-msgstr "Więcej..."
+#~ msgid ""
+#~ "If you've forgotten or lost your password, you can get a new one sent  "
+#~ "the email address you have stored  in your account."
+#~ msgstr ""
+#~ "Jeśli Twoje hasło gdzieś się zapodziało lub zostało zapomniane to możesz "
+#~ "wygenerować nowe. Zostanie ono wysłane na adres e-mailowy skojarzony z "
+#~ "Twoim kontem."
diff --git a/locale/pt/LC_MESSAGES/laconica.mo b/locale/pt/LC_MESSAGES/laconica.mo
index bbc7c368d..e6168a340 100644
--- a/locale/pt/LC_MESSAGES/laconica.mo
+++ b/locale/pt/LC_MESSAGES/laconica.mo
diff --git a/locale/pt/LC_MESSAGES/laconica.po b/locale/pt/LC_MESSAGES/laconica.po
index 6c81837b7..54d484ba8 100644
--- a/locale/pt/LC_MESSAGES/laconica.po
+++ b/locale/pt/LC_MESSAGES/laconica.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-02-02 03:45+0000\n"
-"Last-Translator: Tiago Faria <gouki@goukihq.org>\n"
+"PO-Revision-Date: 2009-05-28 14:56+0000\n"
+"Last-Translator: Rui de Brito Mendes <rbritomendes@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,7 +40,7 @@ msgstr "de"
 #: actions/twitapistatuses.php:347
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
-msgstr "%1$s / Actualizações respondendo a %2$s"
+msgstr "%1$s / Actualizações em resposta a %2$s"
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
 #, php-format
@@ -79,11 +79,11 @@ msgid ""
 msgstr ""
 "%1$s convidou-o a juntar-se a ele no %2$s (%3$s).\n"
 "\n"
-"%2$s é um serviço de micro-blogging que lhe permite deixar actualizado "
-"pessoas que conheço e que lhe interessam.\n"
+"%2$s é um serviço de micro-blogging que o deixa actualizado com pessoas que "
+"conhece e que lhe interessam.\n"
 "\n"
-"Também pode partilhar notícias suas, pensamentos or a sua vida online com "
-"pessoas que conheça. É também ideal para conhecer pessoas com interesses "
+"Também pode partilhar notícias suas, pensamentos, ou a sua vida online com "
+"pessoas que o conheça. É também ideal para conhecer pessoas com interesses "
 "semelhantes aos seus.\n"
 "\n"
 "%1$s disse:\n"
@@ -187,7 +187,7 @@ msgid ""
 "to confirm your email address.)"
 msgstr ""
 "(Deverá receber uma mensagem por email dentro de momentos, com instrucções "
-"como confirmar o seu endereço de email.)"
+"sobre como confirmar o seu endereço de email.)"
 
 #: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
 #, php-format
@@ -212,7 +212,7 @@ msgstr ". Os colaboradores devem ser citados usando nome completo ou apelido."
 #: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
 #: lib/groupeditform.php:139
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 letras ou números, sem pontuação ou espaços"
+msgstr "1-64 letras minúsculas ou números, sem pontuação ou espaços"
 
 #: ../actions/register.php:152 actions/register.php:166
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
@@ -248,8 +248,8 @@ msgid ""
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
 "Um código de confirmação foi enviado para o endereço de email fornecido. "
-"Procure na sua 'Caixa de Entrada' (e caixa de spam) a mensagem com o código "
-"e instrucções."
+"Procure na sua 'Caixa de Entrada' (e caixa de spam) pelo email com o código "
+"e instrucções de utilização."
 
 #: ../actions/smssettings.php:216 actions/smssettings.php:224
 msgid ""
@@ -459,13 +459,13 @@ msgstr "Não é possível remover a mensagem."
 #: actions/updateprofile.php:123
 #, php-format
 msgid "Can't read avatar URL '%s'"
-msgstr "Não é possível ler o avatar URL '%s'"
+msgstr "Não é possível ler o URL do avatar '%s'"
 
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 msgid "Can't save new password."
-msgstr "Não é possível salvar a nova password."
+msgstr "Não é possível guardar a nova password."
 
 #: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
 #: ../actions/smssettings.php:62 actions/emailsettings.php:58
@@ -497,7 +497,7 @@ msgstr "Modificar"
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
 #: lib/accountsettingsaction.php:114
 msgid "Change email handling"
-msgstr ""
+msgstr "Alterar email handling"
 
 #: ../actions/password.php:32 actions/profilesettings.php:36
 #: actions/passwordsettings.php:58
@@ -563,6 +563,19 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
+"Parabéns, %s! Bemvindo ao %%%%site.name%%%%. A partir de agora deverá...\n"
+"\n"
+"* Ir ao [seu perfil](%s) e enviar a primeira mensagem.\n"
+"* Adicionar uma [Endereço Jabber/GTalk](%%%%action.imsettings%%%%) de forma "
+"a poder enviar notações através de mensagens instantâneas.\n"
+"* [Procurar por pessoas](%%%%action.peoplesearch%%%%) que conheça ou "
+"partilhem os seus interesses. \n"
+"* Actualizar o seu perfil [Opções de perfil](%%%%action.profilesettings%%%%) "
+"para contar mais acerca de si aos outros. \n"
+"* Ler os [documentos online](%%%%doc.help%%%%) para conhecer todas as "
+"funcionalidades que tenha perdido. \n"
+"\n"
+"Obrigado por se registar e esperamos que se divirta usando este serviço."
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
 #: actions/finishopenidlogin.php:119 lib/action.php:330
@@ -581,38 +594,38 @@ msgstr "Contacto"
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
 #, php-format
 msgid "Could not create OpenID form: %s"
-msgstr ""
+msgstr "Não foi possível criar o formulário de OpenID: %s"
 
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
 #, php-format
 msgid "Could not follow user: %s is already on your list."
-msgstr ""
+msgstr "Não foi possível seguir utilizador: %s já está na sua lista."
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
 #: actions/twitapifriendships.php:41
 msgid "Could not follow user: User not found."
-msgstr ""
+msgstr "Não foi possível seguir utilizador: Utilizador não encontrado."
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
 #, php-format
 msgid "Could not redirect to server: %s"
-msgstr ""
+msgstr "Não foi possível redireccionar para o servidor: %s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
 #: actions/updateprofile.php:166
 msgid "Could not save avatar info"
-msgstr ""
+msgstr "Não foi possível guardar a info do avatar "
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
 #: actions/updateprofile.php:159
 msgid "Could not save new profile info"
-msgstr ""
+msgstr "Não foi possível guardar a nova info do perfil"
 
 #: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
 msgid "Could not subscribe other to you."
-msgstr ""
+msgstr "Não foi possível subscrever outros a si."
 
 #: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
 msgid "Could not subscribe."
@@ -622,11 +635,12 @@ msgstr "Não foi possível subscrever. "
 #: actions/recoverpassword.php:111
 msgid "Could not update user with confirmed email address."
 msgstr ""
+"Não foi possivel actualizar utilizador com endereço de email confirmado."
 
 #: ../actions/finishremotesubscribe.php:99
 #: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
 msgid "Couldn't convert request tokens to access tokens."
-msgstr ""
+msgstr "Não foi possível converter os tokens de requisição em tokens de acesso."
 
 #: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
 #: ../actions/imsettings.php:218 ../actions/smssettings.php:241
@@ -635,21 +649,21 @@ msgstr ""
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
 msgid "Couldn't delete email confirmation."
-msgstr ""
+msgstr "Não foi possível apagar a confirmação do email."
 
 #: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
 msgid "Couldn't delete subscription."
-msgstr ""
+msgstr "Não foi possível apagar a subscrição."
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
 #: actions/twitapistatuses.php:84
 msgid "Couldn't find any statuses."
-msgstr ""
+msgstr "Não foi possivel encontrar algum estado."
 
 #: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
 #: actions/remotesubscribe.php:178
 msgid "Couldn't get a request token."
-msgstr ""
+msgstr "Não foi possível obter um token de requisição."
 
 #: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
 #: ../actions/smssettings.php:206 actions/emailsettings.php:223
@@ -657,12 +671,12 @@ msgstr ""
 #: actions/emailsettings.php:337 actions/imsettings.php:311
 #: actions/smssettings.php:325
 msgid "Couldn't insert confirmation code."
-msgstr ""
+msgstr "Não foi possível inserir o código de confirmação."
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
 msgid "Couldn't insert new subscription."
-msgstr ""
+msgstr "Não foi possível inserir nova subscrição."
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 #: actions/profilesettings.php:299 actions/twitapiaccount.php:94
@@ -673,13 +687,13 @@ msgstr "Não foi possível salvar o perfil."
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
 #: actions/profilesettings.php:279
 msgid "Couldn't update user for autosubscribe."
-msgstr ""
+msgstr "Não foi possível actualizar o utilizador para auto-subscrição."
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 #: actions/emailsettings.php:298 actions/emailsettings.php:312
 #: actions/emailsettings.php:440 actions/emailsettings.php:462
 msgid "Couldn't update user record."
-msgstr ""
+msgstr "Não foi possível actualizar o registo do utilizador."
 
 #: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
 #: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
@@ -695,164 +709,164 @@ msgstr ""
 #: actions/profilesettings.php:259 actions/smssettings.php:266
 #: actions/smssettings.php:408
 msgid "Couldn't update user."
-msgstr ""
+msgstr "Não foi possível actualizar o utilizador."
 
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
 #: actions/finishopenidlogin.php:112
 msgid "Create"
-msgstr ""
+msgstr "Criar"
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
 #: actions/finishopenidlogin.php:98
 msgid "Create a new user with this nickname."
-msgstr ""
+msgstr "Criar um novo utilizador com esta alcunha."
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
 #: actions/finishopenidlogin.php:96
 msgid "Create new account"
-msgstr ""
+msgstr "Criar nova conta"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
 #: actions/finishopenidlogin.php:231
 msgid "Creating new account for OpenID that already has a user."
-msgstr ""
+msgstr "Criar nova conta para OpenID que já possui um utilizador."
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
 #: actions/imsettings.php:100
 msgid "Current confirmed Jabber/GTalk address."
-msgstr ""
+msgstr "Endereço do Jabber/GTalk já confirmado."
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
 #: actions/smssettings.php:100
 msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
+msgstr "Número de telefone com serviço SMS activo já confirmado."
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
 #: actions/emailsettings.php:99
 msgid "Current confirmed email address."
-msgstr ""
+msgstr "Endereço de email já confirmado."
 
 #: ../actions/showstream.php:356 actions/showstream.php:367
 msgid "Currently"
-msgstr ""
+msgstr "Actualmente"
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
 #, php-format
 msgid "DB error inserting hashtag: %s"
-msgstr ""
+msgstr "Ocorreu um erro na base de dados ao inserir a hashtag: %s"
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
 #, php-format
 msgid "DB error inserting reply: %s"
-msgstr ""
+msgstr "Ocorreu um erro na base de dados ao inserir a resposta: %s"
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
 #: actions/deletenotice.php:79
 msgid "Delete notice"
-msgstr ""
+msgstr "Apagar mensagem"
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
 #: actions/profilesettings.php:114
 msgid "Describe yourself and your interests in 140 chars"
-msgstr ""
+msgstr "Descreva-se e aos seus interesses em 140 caracteres"
 
 #: ../actions/register.php:158 ../actions/register.php:161
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
 #: actions/emailsettings.php:115
 msgid "Email Address"
-msgstr ""
+msgstr "Endereço de Email"
 
 #: ../actions/emailsettings.php:32 actions/emailsettings.php:32
 #: actions/emailsettings.php:60
 msgid "Email Settings"
-msgstr ""
+msgstr "Definições do Email"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
 msgid "Email address already exists."
-msgstr ""
+msgstr "Endereço de Email já existe."
 
 #: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
 msgid "Email address confirmation"
-msgstr ""
+msgstr "Confirmação do Endereço de Email"
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
 #: actions/emailsettings.php:117
 msgid "Email address, like \"UserName@example.org\""
-msgstr ""
+msgstr "Endereço de Email, como \"nomedeutilizador@exemplo.org\""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
 msgid "Email addresses"
-msgstr ""
+msgstr "Endereços de Email"
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 #: actions/recoverpassword.php:231
 msgid "Enter a nickname or email address."
-msgstr ""
+msgstr "Introduza uma alcunha ou um endereço de email"
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
 #: actions/smssettings.php:119
 msgid "Enter the code you received on your phone."
-msgstr ""
+msgstr "Introduza o código que recebeu no seu telefone."
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 #: actions/userauthorization.php:161
 msgid "Error authorizing token"
-msgstr ""
+msgstr "Erro ao autorizar token"
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
 #: actions/finishopenidlogin.php:297
 msgid "Error connecting user to OpenID."
-msgstr ""
+msgstr "Erro ao ligar utilizador ao OpenID."
 
 #: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
 #: actions/finishaddopenid.php:126
 msgid "Error connecting user."
-msgstr ""
+msgstr "Erro ao ligar utilizador."
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
 msgid "Error inserting avatar"
-msgstr ""
+msgstr "Erro ao inserir avatar"
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
 msgid "Error inserting new profile"
-msgstr ""
+msgstr "Erro ao inserir novo perfil"
 
 #: ../actions/finishremotesubscribe.php:167
 #: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
 msgid "Error inserting remote profile"
-msgstr ""
+msgstr "Erro ao inserir perfil remoto"
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
 #: actions/recoverpassword.php:280
 msgid "Error saving address confirmation."
-msgstr ""
+msgstr "Erro ao guardar confirmação do endereço."
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
 #: actions/userauthorization.php:164
 msgid "Error saving remote profile"
-msgstr ""
+msgstr "Erro ao guardar perfil remoto"
 
 #: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
 msgid "Error saving the profile."
-msgstr ""
+msgstr "Erro ao guardar o perfil."
 
 #: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
 msgid "Error saving the user."
-msgstr ""
+msgstr "Erro ao guardar o utilizador."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 #: actions/passwordsettings.php:164
 msgid "Error saving user; invalid."
-msgstr ""
+msgstr "Erro ao guardar utilizador; inválido."
 
 #: ../actions/login.php:47 ../actions/login.php:73
 #: ../actions/recoverpassword.php:307 ../actions/register.php:98
@@ -860,70 +874,72 @@ msgstr ""
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
 msgid "Error setting user."
-msgstr ""
+msgstr "Erro ao configurar utilizador."
 
 #: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
 #: actions/finishaddopenid.php:131
 msgid "Error updating profile"
-msgstr ""
+msgstr "Erro ao actualizar o perfil."
 
 #: ../actions/finishremotesubscribe.php:161
 #: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
 msgid "Error updating remote profile"
-msgstr ""
+msgstr "Erro ao actualizar o perfil remoto"
 
 #: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
 #: actions/recoverpassword.php:86
 msgid "Error with confirmation code."
-msgstr ""
+msgstr "Erro no código de confirmação."
 
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
 #: actions/finishopenidlogin.php:117
 msgid "Existing nickname"
-msgstr ""
+msgstr "Alcunha já existente"
 
 #: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
 msgid "FAQ"
-msgstr ""
+msgstr "FAQ"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397
 msgid "Failed updating avatar."
-msgstr ""
+msgstr "Falha ao actualizar avatar."
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
 #, php-format
 msgid "Feed for friends of %s"
-msgstr ""
+msgstr "Feed para os amigos de %s"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
 #: actions/repliesrss.php:71
 #, php-format
 msgid "Feed for replies to %s"
-msgstr ""
+msgstr "Feed para as respostas a %s"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
 #, php-format
 msgid "Feed for tag %s"
-msgstr ""
+msgstr "Feed para a tag %s"
 
 #: ../lib/searchaction.php:105 lib/searchaction.php:105
 #: lib/searchgroupnav.php:83
 msgid "Find content of notices"
-msgstr ""
+msgstr "Encontrar conteúdo dos mensagens"
 
 #: ../lib/searchaction.php:101 lib/searchaction.php:101
 #: lib/searchgroupnav.php:81
 msgid "Find people on this site"
-msgstr ""
+msgstr "Encontrar pessoas neste site"
 
 #: ../actions/login.php:122
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
+"Por razões de segurança, por favor reintroduza o seu nome de utilizador e "
+"palavra-passe antes de alterar as suas configurações."
 
 #: ../actions/profilesettings.php:44 ../actions/register.php:164
 #: actions/profilesettings.php:77 actions/register.php:178
@@ -931,7 +947,7 @@ msgstr ""
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
 msgid "Full name"
-msgstr ""
+msgstr "Nome Completo"
 
 #: ../actions/profilesettings.php:98 ../actions/register.php:79
 #: ../actions/updateprofile.php:93 actions/profilesettings.php:213
@@ -940,50 +956,50 @@ msgstr ""
 #: actions/profilesettings.php:202 actions/register.php:171
 #: actions/updateprofile.php:97
 msgid "Full name is too long (max 255 chars)."
-msgstr ""
+msgstr "Nome completo é demasiado longo (máx. 255 caracteres)."
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
 msgid "Help"
-msgstr ""
+msgstr "Ajuda"
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
 #: lib/facebookaction.php:200
 msgid "Home"
-msgstr ""
+msgstr "Início"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
 #: actions/profilesettings.php:107 actions/register.php:396
 #: lib/groupeditform.php:146
 msgid "Homepage"
-msgstr ""
+msgstr "Página Principal"
 
 #: ../actions/profilesettings.php:95 ../actions/register.php:76
 #: actions/profilesettings.php:210 actions/register.php:83
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
 msgid "Homepage is not a valid URL."
-msgstr ""
+msgstr "A Homepage inserida não é um URL válido."
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
 #: actions/emailsettings.php:173
 msgid "I want to post notices by email."
-msgstr ""
+msgstr "Quero postar mensagens por email."
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
 #: lib/connectsettingsaction.php:104
 msgid "IM"
-msgstr ""
+msgstr "IM"
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
 #: actions/imsettings.php:118
 msgid "IM Address"
-msgstr ""
+msgstr "Endereço IM"
 
 #: ../actions/imsettings.php:33 actions/imsettings.php:33
 #: actions/imsettings.php:59
 msgid "IM Settings"
-msgstr ""
+msgstr "Definições de IM"
 
 #: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
 #: actions/finishopenidlogin.php:116
@@ -991,104 +1007,113 @@ msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
 msgstr ""
+"Se já tem uma conta, inicie sessão com o seu nome de utilizador e palavra-"
+"passe para a ligar ao seu OpenID."
 
 #: ../actions/openidsettings.php:45
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
 msgstr ""
+"Se quiser adicionar um OpenID à sua conta, introduza-o na caixa a baixo e "
+"clique em \"Adicionar\"."
 
 #: ../actions/recoverpassword.php:137
 msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
 msgstr ""
+"Se você se esqueceu ou perdeu a sua palavra-passe, você pode receber uma "
+"nova que será enviada para o endereço de email que tem configurado na sua "
+"conta."
 
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
 msgid "Incoming email"
-msgstr ""
+msgstr "Email a receber"
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
 #: actions/emailsettings.php:443
 msgid "Incoming email address removed."
-msgstr ""
+msgstr "O endereço de email de recepção removido."
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
 #: actions/passwordsettings.php:153
 msgid "Incorrect old password"
-msgstr ""
+msgstr "Palavra-passe antiga incorrecta"
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
 #: actions/login.php:132
 msgid "Incorrect username or password."
-msgstr ""
+msgstr "Nome de utilizador ou palavra-passe incorrecta"
 
 #: ../actions/recoverpassword.php:265
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
+"As instruções para a recuperação da palavra-passe foram enviadas para o "
+"endereço de email registado na sua conta."
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
 #: actions/updateprofile.php:118
 #, php-format
 msgid "Invalid avatar URL '%s'"
-msgstr ""
+msgstr "URL do avatar inválido '%s'"
 
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
 #, php-format
 msgid "Invalid email address: %s"
-msgstr ""
+msgstr "Endereço de email inválido: %s"
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #: actions/updateprofile.php:102
 #, php-format
 msgid "Invalid homepage '%s'"
-msgstr ""
+msgstr "Página principal inválida '%s'"
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
 #: actions/updateprofile.php:86
 #, php-format
 msgid "Invalid license URL '%s'"
-msgstr ""
+msgstr "URL de licença inválido '%s'"
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
 #: actions/postnotice.php:66
 msgid "Invalid notice content"
-msgstr ""
+msgstr "Conteúdo da mensagem inválido"
 
 #: ../actions/postnotice.php:67 actions/postnotice.php:68
 #: actions/postnotice.php:72
 msgid "Invalid notice uri"
-msgstr ""
+msgstr "URI da mensagem inválido"
 
 #: ../actions/postnotice.php:72 actions/postnotice.php:73
 #: actions/postnotice.php:77
 msgid "Invalid notice url"
-msgstr ""
+msgstr "URL da mensagem inválido"
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
 #: actions/updateprofile.php:91
 #, php-format
 msgid "Invalid profile URL '%s'."
-msgstr ""
+msgstr "URL do perfil inválido '%s'."
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
 #: actions/remotesubscribe.php:135
 msgid "Invalid profile URL (bad format)"
-msgstr ""
+msgstr "URL de perfil inválido (formato incorrecto)"
 
 #: ../actions/finishremotesubscribe.php:77
 #: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
 msgid "Invalid profile URL returned by server."
-msgstr ""
+msgstr "URL do perfil devolvido pelo servidor inválido."
 
 #: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 #: actions/avatarbynickname.php:69
 msgid "Invalid size."
-msgstr ""
+msgstr "Tamanho inválido."
 
 #: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
 #: ../actions/register.php:111 actions/finishopenidlogin.php:241
@@ -1096,24 +1121,24 @@ msgstr ""
 #: actions/finishopenidlogin.php:279 actions/register.php:193
 #: actions/register.php:211
 msgid "Invalid username or password."
-msgstr ""
+msgstr "Nome de utilizador ou palavra-passe inválido."
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
 msgid "Invitation(s) sent"
-msgstr ""
+msgstr "Contive(s) enviado(s)"
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
 msgid "Invitation(s) sent to the following people:"
-msgstr ""
+msgstr "Convite(s) enviado(s) para as seguintes pessoas:"
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
 #: lib/subgroupnav.php:103
 msgid "Invite"
-msgstr ""
+msgstr "Convidar"
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
 msgid "Invite new users"
-msgstr ""
+msgstr "Convidar novos utilizadores"
 
 #: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
 #, php-format
@@ -1126,7 +1151,7 @@ msgstr ""
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
 #: actions/imsettings.php:296
 msgid "Jabber ID already belongs to another user."
-msgstr ""
+msgstr "O Jabber ID introduzido já pertence a outro utilizador."
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
 #, php-format
@@ -1138,12 +1163,12 @@ msgstr ""
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
 #: actions/profilesettings.php:128
 msgid "Language"
-msgstr ""
+msgstr "Linguagem"
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
 #: actions/profilesettings.php:217
 msgid "Language is too long (max 50 chars)."
-msgstr ""
+msgstr "Linguagem introduzida é muito longa (máx. 50 caracteres)."
 
 #: ../actions/profilesettings.php:52 ../actions/register.php:173
 #: actions/profilesettings.php:85 actions/register.php:187
@@ -1152,7 +1177,7 @@ msgstr ""
 #: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
 #: lib/profilelist.php:125
 msgid "Location"
-msgstr ""
+msgstr "Localidade"
 
 #: ../actions/profilesettings.php:104 ../actions/register.php:85
 #: ../actions/updateprofile.php:108 actions/profilesettings.php:219
@@ -1161,7 +1186,7 @@ msgstr ""
 #: actions/profilesettings.php:208 actions/register.php:177
 #: actions/updateprofile.php:112
 msgid "Location is too long (max 255 chars)."
-msgstr ""
+msgstr "Localidade é muito longa (máx. 255 caracteres)."
 
 #: ../actions/login.php:97 ../actions/login.php:106
 #: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
@@ -1171,13 +1196,13 @@ msgstr ""
 #: lib/facebookaction.php:315 lib/logingroupnav.php:75
 #, php-format
 msgid "Login"
-msgstr ""
+msgstr "Entrar"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
 #: actions/openidlogin.php:62
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr ""
+msgstr "Entrar com conta [OpenID](%%doc.openid%%)"
 
 #: ../actions/login.php:126
 #, php-format
@@ -1186,10 +1211,13 @@ msgid ""
 "(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
 "%). "
 msgstr ""
+"Entrar com o seu nome de utilizador e palavra passe. Não está registado "
+"ainda?[Registe-se](%%action.register%%), ou tente entrar com "
+"[OpenID](%%action.openidlogin%%). "
 
 #: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
 msgid "Logout"
-msgstr ""
+msgstr "Sair"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393
@@ -1199,7 +1227,7 @@ msgstr ""
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
 #: lib/facebookaction.php:320
 msgid "Lost or forgotten password?"
-msgstr ""
+msgstr "Perdeu ou esqueceu-se da palavra-passe?"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
@@ -1215,12 +1243,12 @@ msgstr ""
 #: ../actions/showstream.php:300 actions/showstream.php:315
 #: actions/showstream.php:480
 msgid "Member since"
-msgstr ""
+msgstr "Membro desde"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
 #, php-format
 msgid "Microblog by %s"
-msgstr ""
+msgstr "Microblog por %s"
 
 #: ../actions/smssettings.php:304
 #, php-format
@@ -1239,7 +1267,7 @@ msgstr ""
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
 msgid "New"
-msgstr ""
+msgstr "Novo"
 
 #: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
 #, php-format
@@ -1254,7 +1282,7 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
 #: actions/finishopenidlogin.php:99
 msgid "New nickname"
-msgstr ""
+msgstr "Nova alcunha"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
 #: actions/newnotice.php:68
@@ -1265,11 +1293,11 @@ msgstr ""
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
 #: actions/passwordsettings.php:101 actions/recoverpassword.php:219
 msgid "New password"
-msgstr ""
+msgstr "Nova palavra-passe"
 
 #: ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
-msgstr ""
+msgstr "Nova palavra-passe foi guardada com sucesso. Está agora conectado."
 
 #: ../actions/login.php:101 ../actions/profilesettings.php:41
 #: ../actions/register.php:151 actions/login.php:101
@@ -1279,7 +1307,7 @@ msgstr ""
 #: actions/showstream.php:251 actions/tagother.php:95
 #: lib/facebookaction.php:308 lib/groupeditform.php:137
 msgid "Nickname"
-msgstr ""
+msgstr "Alcunha"
 
 #: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
 #: ../actions/register.php:69 actions/finishopenidlogin.php:181
@@ -1288,7 +1316,7 @@ msgstr ""
 #: actions/newgroup.php:134 actions/profilesettings.php:214
 #: actions/register.php:159
 msgid "Nickname already in use. Try another one."
-msgstr ""
+msgstr "Alcunha já em uso. Tente outra diferente."
 
 #: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
 #: ../actions/register.php:67 ../actions/updateprofile.php:77
@@ -1297,27 +1325,27 @@ msgstr ""
 #: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
 #: actions/updateprofile.php:81
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
+msgstr "Alcunha só deve conter letras minúsculas e números. Sem espaços."
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
 #: actions/finishopenidlogin.php:210
 msgid "Nickname not allowed."
-msgstr ""
+msgstr "Alcunha não permitida."
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
 #: actions/remotesubscribe.php:106
 msgid "Nickname of the user you want to follow"
-msgstr ""
+msgstr "Alcunha do utilizador que pretende seguir"
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
 #: actions/recoverpassword.php:186
 msgid "Nickname or email"
-msgstr ""
+msgstr "Alcunha ou email"
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
 msgid "No"
-msgstr ""
+msgstr "Não"
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
 #: actions/imsettings.php:279
@@ -1337,7 +1365,7 @@ msgstr ""
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
 #: actions/smssettings.php:486
 msgid "No code entered"
-msgstr ""
+msgstr "Nenhum código introduzido"
 
 #: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 #: actions/confirmaddress.php:75
@@ -1367,12 +1395,12 @@ msgstr ""
 #: ../actions/finishremotesubscribe.php:65
 #: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
 msgid "No nickname provided by remote server."
-msgstr ""
+msgstr "Nenhuma alcunha fornecida pelo servidor remoto."
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
 msgid "No nickname."
-msgstr ""
+msgstr "Nenhuma alcunha."
 
 #: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
 #: ../actions/smssettings.php:229 actions/emailsettings.php:240
@@ -1380,12 +1408,12 @@ msgstr ""
 #: actions/emailsettings.php:363 actions/imsettings.php:345
 #: actions/smssettings.php:358
 msgid "No pending confirmation to cancel."
-msgstr ""
+msgstr "Nenhuma confirmação pendente para cancelar."
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
 #: actions/smssettings.php:294
 msgid "No phone number."
-msgstr ""
+msgstr "Nenhum numero de telefone."
 
 #: ../actions/finishremotesubscribe.php:72
 #: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
@@ -1395,19 +1423,19 @@ msgstr ""
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
 #: actions/recoverpassword.php:266
 msgid "No registered email address for that user."
-msgstr ""
+msgstr "Nenhum endereço de email registado para esse utilizador."
 
 #: ../actions/userauthorization.php:49 actions/userauthorization.php:55
 #: actions/userauthorization.php:57
 msgid "No request found!"
-msgstr ""
+msgstr "Nenhum pedido encontrado!"
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 #: actions/noticesearch.php:69 actions/peoplesearch.php:69
 #: actions/groupsearch.php:81 actions/noticesearch.php:104
 #: actions/peoplesearch.php:85
 msgid "No results"
-msgstr ""
+msgstr "Nenhum resultado"
 
 #: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
 #: actions/avatarbynickname.php:64
@@ -1418,12 +1446,12 @@ msgstr ""
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
 #: actions/twitapistatuses.php:446
 msgid "No status found with that ID."
-msgstr ""
+msgstr "Nenhum estado encontrado com esse ID."
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
 #: actions/twitapistatuses.php:418
 msgid "No status with that ID found."
-msgstr ""
+msgstr "Nenhum estado com esse ID encontrado."
 
 #: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 #: actions/openidsettings.php:222
@@ -4710,19 +4738,19 @@ msgstr "O utilizador bloqueou-o."
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
 msgid "Subscribe to this user"
-msgstr ""
+msgstr "Subscrever este utilizador"
 
 #: lib/tagcloudsection.php:56
 msgid "None"
-msgstr ""
+msgstr "Nenhum"
 
 #: lib/topposterssection.php:74
 msgid "Top posters"
-msgstr ""
+msgstr "Top posters"
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
 msgid "Unblock this user"
-msgstr ""
+msgstr "Desbloquear este utilizador"
 
 #: lib/unblockform.php:150
 msgid "Unblock"
@@ -4730,4 +4758,4 @@ msgstr "Desbloquear"
 
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
-msgstr ""
+msgstr "Des-Subscrever deste utilizador"
diff --git a/locale/pt_BR/LC_MESSAGES/laconica.mo b/locale/pt_BR/LC_MESSAGES/laconica.mo
index 0f9487e67..1f4c5fe27 100644
--- a/locale/pt_BR/LC_MESSAGES/laconica.mo
+++ b/locale/pt_BR/LC_MESSAGES/laconica.mo
diff --git a/locale/pt_BR/LC_MESSAGES/laconica.po b/locale/pt_BR/LC_MESSAGES/laconica.po
index 613e5dbba..ad20e89f6 100644
--- a/locale/pt_BR/LC_MESSAGES/laconica.po
+++ b/locale/pt_BR/LC_MESSAGES/laconica.po
@@ -5,8 +5,8 @@ msgstr ""
 "Project-Id-Version: laconica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-02-11 12:53+0000\n"
-"Last-Translator: Frederico Gonçalves Guimarães <frederico@teia.bio.br>\n"
+"PO-Revision-Date: 2009-07-14 11:24+0000\n"
+"Last-Translator: Jose Martinho <martinho.com@gmail.com>\n"
 "Language-Team: Português do Brasil\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,8 +25,8 @@ msgstr " Procurar por \"%s\" no fluxo de mensagens"
 msgid ""
 " except this private data: password, email address, IM address, phone number."
 msgstr ""
-" exceto estes dados privados: senha, endereço de e-mail, endereço de "
-"mensageiro instantâneo, número de telefone."
+" exceto estes dados privados: senha, endereço de e-mail, endereço de IM, "
+"número de telefone."
 
 #: ../actions/showstream.php:400 ../lib/stream.php:109
 #: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
@@ -146,7 +146,7 @@ msgstr "%s (%s)"
 #: actions/publicrss.php:90
 #, php-format
 msgid "%s Public Stream"
-msgstr "Fluxo público de %s"
+msgstr "Fluxo Público de %s"
 
 #: ../actions/all.php:47 ../actions/allrss.php:60
 #: ../actions/twitapistatuses.php:238 ../lib/stream.php:51 actions/all.php:47
@@ -216,22 +216,23 @@ msgstr "1-64 letras minúsculas ou números, sem pontuações ou espaços"
 
 #: ../actions/register.php:152 actions/register.php:166
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64 letras ou números, sem pontuação ou espaços. Obrigatório."
+msgstr ""
+"1-64 letras minúsculas ou números, sem pontuação ou espaços. Obrigatório."
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
 #: actions/passwordsettings.php:102
 msgid "6 or more characters"
-msgstr "6 ou mais caracteres"
+msgstr "No mínimo 6 caracteres"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
 #: actions/recoverpassword.php:220
 msgid "6 or more characters, and don't forget it!"
-msgstr "6 ou mais caracteres. E não se esqueça dela!"
+msgstr "No mínimo 6 caracteres. E não se esqueça dela!"
 
 #: ../actions/register.php:154 actions/register.php:168
 #: actions/register.php:373
 msgid "6 or more characters. Required."
-msgstr "6 ou mais caracteres. Obrigatório."
+msgstr "No mínimo 6 caracteres. Obrigatório."
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, php-format
@@ -239,8 +240,8 @@ msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
 "s for sending messages to you."
 msgstr ""
-"Um código de confirmação foi enviado para o endereço de mensagem instantânea "
-"que você informou. Você deve permitir que %s envie mensagens para você."
+"Um código de confirmação foi enviado para o endereço de IM que você "
+"informou. Você deve permitir que %s envie mensagens para você."
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
 msgid ""
@@ -370,7 +371,7 @@ msgstr "Todas as atualizações correspondentes ao termo \"%s\""
 #: actions/finishopenidlogin.php:34 actions/login.php:77
 #: actions/openidlogin.php:30 actions/register.php:92
 msgid "Already logged in."
-msgstr "Já está autenticado."
+msgstr "Já está logado."
 
 #: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
 msgid "Already subscribed!."
@@ -396,7 +397,7 @@ msgstr ""
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr "Assinar automaticamente à quem me assinar (melhor para não humanos)"
+msgstr "Assinar automaticamente à quem me assinar"
 
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
@@ -505,7 +506,7 @@ msgstr "Alterar a senha"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
 msgid "Change your password"
-msgstr "Altera a sua senha"
+msgstr "Altere a sua senha"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
 #: lib/accountsettingsaction.php:105
@@ -532,7 +533,7 @@ msgstr "Confirme o endereço"
 #: actions/emailsettings.php:379 actions/imsettings.php:361
 #: actions/smssettings.php:374
 msgid "Confirmation cancelled."
-msgstr "A confirmação foi cancelada."
+msgstr "Confirmação cancelada."
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
 #: actions/smssettings.php:118
@@ -570,12 +571,12 @@ msgstr ""
 "que você possa publicar via mensagens instantâneas.\n"
 "* [Procurar por pessoas](%%%%action.peoplesearch%%%%) que você conheça ou "
 "que tenham os mesmos interesses que você. \n"
-"* Atualizar suas [preferências de perfil](%%%%action.profilesettings%%%%) "
+"* Atualizar suas [configurações de perfil](%%%%action.profilesettings%%%%) "
 "para que outras pessoas saibam mais sobre você. \n"
 "* Ler a [documentação on-line](%%%%doc.help%%%%) para conhecer os recursos "
 "disponíveis. \n"
 "\n"
-"Obrigado por se cadastrar e esperamos que você aproveite o serviço."
+"Obrigado por se registrar e esperamos que você aproveite o serviço."
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
 #: actions/finishopenidlogin.php:119 lib/action.php:330
@@ -601,12 +602,12 @@ msgstr "Não foi possível criar o formulário OpenID: %s"
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
 #, php-format
 msgid "Could not follow user: %s is already on your list."
-msgstr "Não é possível acompanhar o usuário: %s já está na sua lista."
+msgstr "Não é possível seguir o usuário: %s já está na sua lista."
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
 #: actions/twitapifriendships.php:41
 msgid "Could not follow user: User not found."
-msgstr "Não é possível acompanhar o usuário: Usuário não encontrado."
+msgstr "Não é possível seguir o usuário: Usuário não encontrado."
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
 #, php-format
@@ -625,7 +626,7 @@ msgstr "Não foi possível salvar as novas informações do perfil"
 
 #: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
 msgid "Could not subscribe other to you."
-msgstr "Não é possível que outros o assinem."
+msgstr "Não foi possível fazer com que o outros o sigam."
 
 #: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
 msgid "Could not subscribe."
@@ -754,7 +755,7 @@ msgstr "Neste momento"
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
 #, php-format
 msgid "DB error inserting hashtag: %s"
-msgstr "Erro no banco de dados durante a inserção da etiqueta: %s"
+msgstr "Erro no banco de dados durante a inserção de hashtag: %s"
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
 #, php-format
@@ -800,7 +801,7 @@ msgstr "Confirmação do endereço de e-mail"
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
 #: actions/emailsettings.php:117
 msgid "Email address, like \"UserName@example.org\""
-msgstr "Endereço de e-mail, ex: \"usuário@exemplo.org\""
+msgstr "Endereço de e-mail, ex: \"usuario@exemplo.org\""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
 msgid "Email addresses"
@@ -809,7 +810,7 @@ msgstr "Endereços de e-mail"
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 #: actions/recoverpassword.php:231
 msgid "Enter a nickname or email address."
-msgstr "Informe um apelido ou endereço de e-mail."
+msgstr "Entre com o apelido ou endereço de e-mail."
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
 #: actions/smssettings.php:119
@@ -849,25 +850,25 @@ msgstr "Erro na inserção do perfil remoto"
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
 #: actions/recoverpassword.php:280
 msgid "Error saving address confirmation."
-msgstr "Erro no salvamento do endereço de confirmação"
+msgstr "Erro ao salvar o endereço de confirmação"
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
 #: actions/userauthorization.php:164
 msgid "Error saving remote profile"
-msgstr "Erro no salvamento do perfil remoto"
+msgstr "Erro ao salvar o perfil remoto"
 
 #: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
 msgid "Error saving the profile."
-msgstr "Erro no salvamento do perfil."
+msgstr "Erro ao salvar o perfil."
 
 #: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
 msgid "Error saving the user."
-msgstr "Erro no salvamento do usuário."
+msgstr "Erro ao salvar o usuário."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 #: actions/passwordsettings.php:164
 msgid "Error saving user; invalid."
-msgstr "Erro no salvamento do usuário; inválido."
+msgstr "Erro ao salvar usuário; inválido."
 
 #: ../actions/login.php:47 ../actions/login.php:73
 #: ../actions/recoverpassword.php:307 ../actions/register.php:98
@@ -895,7 +896,7 @@ msgstr "Erro com o código de confirmação."
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
 #: actions/finishopenidlogin.php:117
 msgid "Existing nickname"
-msgstr "Apelido já existente"
+msgstr "Apelido já existe"
 
 #: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
 msgid "FAQ"
@@ -910,29 +911,29 @@ msgstr "Não foi possível atualizar o avatar."
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
 #, php-format
 msgid "Feed for friends of %s"
-msgstr "Mensagens dos amigos de %s"
+msgstr "Feed para os amigos de %s"
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
 #: actions/repliesrss.php:71
 #, php-format
 msgid "Feed for replies to %s"
-msgstr "Respostas de %s"
+msgstr "Feed para respostas para %s"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
 #, php-format
 msgid "Feed for tag %s"
-msgstr "Mensagens com a etiqueta %s"
+msgstr "Feed para tag %s"
 
 #: ../lib/searchaction.php:105 lib/searchaction.php:105
 #: lib/searchgroupnav.php:83
 msgid "Find content of notices"
-msgstr "Procurar no conteúdo das mensagens"
+msgstr "Procure no conteúdo das mensagens"
 
 #: ../lib/searchaction.php:101 lib/searchaction.php:101
 #: lib/searchgroupnav.php:81
 msgid "Find people on this site"
-msgstr "Procurar por pessoas neste site"
+msgstr "Procure por pessoas neste site"
 
 #: ../actions/login.php:122
 msgid ""
@@ -980,7 +981,7 @@ msgstr "Site"
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
 msgid "Homepage is not a valid URL."
-msgstr "A URL informada não é válida."
+msgstr "A URL do site informada não é válida."
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
 #: actions/emailsettings.php:173
@@ -990,17 +991,17 @@ msgstr "Eu quero publicar mensagens por e-mail."
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
 #: lib/connectsettingsaction.php:104
 msgid "IM"
-msgstr "MI"
+msgstr "IM"
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
 #: actions/imsettings.php:118
 msgid "IM Address"
-msgstr "Endereço do mensageiro instantâneo"
+msgstr "Endereço do IM"
 
 #: ../actions/imsettings.php:33 actions/imsettings.php:33
 #: actions/imsettings.php:59
 msgid "IM Settings"
-msgstr "Configurações do mensageiro instantâneo"
+msgstr "Configurações do IM"
 
 #: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
 #: actions/finishopenidlogin.php:116
@@ -1016,7 +1017,7 @@ msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
 msgstr ""
-"Se você quer adicionar uma OpenID à sua conta, informe-a na caixa abaixo e "
+"Se você quer adicionar um OpenID à sua conta, informe-a na caixa abaixo e "
 "clique em \"Adicionar\"."
 
 #: ../actions/recoverpassword.php:137
@@ -1025,7 +1026,7 @@ msgid ""
 "email address you have stored  in your account."
 msgstr ""
 "Se você esqueceu ou perdeu sua senha, você pode receber uma nova no endereço "
-"de e-mail informado em seu cadastro."
+"de e-mail que armazenou em sua conta."
 
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
@@ -1163,8 +1164,8 @@ msgid ""
 "add %s to your buddy list in your IM client or on GTalk."
 msgstr ""
 "Endereço de Jabber ou GTalk, ex: \"usuario@exemplo.org\". Primeiro, "
-"certifique-se de adicionar %s à sua lista de contatos no seu cliente de "
-"mensagens instantâneas ou no GTalk."
+"certifique-se de adicionar %s à sua lista de contatos no seu cliente de IM "
+"ou no GTalk."
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
 #: actions/profilesettings.php:128
@@ -1202,13 +1203,13 @@ msgstr "A localização é muito extensa (máx. 255 caracteres)."
 #: lib/facebookaction.php:315 lib/logingroupnav.php:75
 #, php-format
 msgid "Login"
-msgstr "Autenticação"
+msgstr "Logar"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
 #: actions/openidlogin.php:62
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Autentique-se com uma conta [OpenID](%%doc.openid%%)."
+msgstr "Logar-se com uma conta [OpenID](%%doc.openid%%)."
 
 #: ../actions/login.php:126
 #, php-format
@@ -1217,9 +1218,9 @@ msgid ""
 "(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
 "%). "
 msgstr ""
-"Autentique-se com seus nome de usuário e senha. Não tem um usuário ainda? "
-"[Registre](%%action.register%%) uma nova conta, ou use uma [OpenID](%%action."
-"openidlogin%%)."
+"Logar-se com seu nome de usuário e senha. Não tem um nome de usuário ainda? "
+"[Registre](%%action.register%%) uma nova conta, ou use uma "
+"[OpenID](%%action.openidlogin%%)."
 
 #: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
 msgid "Logout"
@@ -1228,7 +1229,7 @@ msgstr "Sair"
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393
 msgid "Longer name, preferably your \"real\" name"
-msgstr "Nome completo, de preferência seu nome \"real\""
+msgstr "Nome completo (nome e sobrenome), de preferência seu nome \"real\""
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
 #: lib/facebookaction.php:320
@@ -1281,7 +1282,7 @@ msgstr "Novo"
 #: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
 #, php-format
 msgid "New email address for posting to %s"
-msgstr "Novo endereço de e-mail para publicar no %s"
+msgstr "Novo endereço de e-mail para postar para %s"
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
 #: actions/emailsettings.php:465
@@ -1308,8 +1309,7 @@ msgstr "Nova senha"
 #: ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
-"A nova senha foi salva com sucesso. A partir de agora você já está "
-"autenticado."
+"A nova senha foi salva com sucesso. A partir de agora você já está logado."
 
 #: ../actions/login.php:101 ../actions/profilesettings.php:41
 #: ../actions/register.php:151 actions/login.php:101
@@ -1339,7 +1339,7 @@ msgstr "Este apelido já está em uso. Tente outro."
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "O apelido deve conter apenas letras minúsculas e/ou números e não pode ter "
-"espaços."
+"acentuação e espaços."
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
 #: actions/finishopenidlogin.php:210
@@ -1349,7 +1349,7 @@ msgstr "Este apelido não é permitido."
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
 #: actions/remotesubscribe.php:106
 msgid "Nickname of the user you want to follow"
-msgstr "Apelido do usuário que você quer acompanhar"
+msgstr "Apelido do usuário que você quer seguir"
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
 #: actions/recoverpassword.php:186
@@ -1449,7 +1449,7 @@ msgstr "Não foi encontrada nenhuma requisição!"
 #: actions/groupsearch.php:81 actions/noticesearch.php:104
 #: actions/peoplesearch.php:85
 msgid "No results"
-msgstr "Não foi encontrado nenhum resultado"
+msgstr "Nenhum resultado"
 
 #: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
 #: actions/avatarbynickname.php:64
@@ -1460,12 +1460,12 @@ msgstr "Sem tamanho definido."
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
 #: actions/twitapistatuses.php:446
 msgid "No status found with that ID."
-msgstr "Não foi encontrado nenhum status esse ID."
+msgstr "Não foi encontrado nenhum status com esse ID."
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
 #: actions/twitapistatuses.php:418
 msgid "No status with that ID found."
-msgstr "Não foi encontrado nenhum status esse ID."
+msgstr "Não foi encontrado nenhum status com esse ID."
 
 #: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 #: actions/openidsettings.php:222
@@ -1552,7 +1552,7 @@ msgstr "Formato de dados não suportado."
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
 #: actions/imsettings.php:290
 msgid "Not a valid Jabber ID"
-msgstr "Não é uma ID válida de Jabber"
+msgstr "Não é uma ID de Jabber válida"
 
 #: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
 msgid "Not a valid OpenID."
@@ -1623,11 +1623,11 @@ msgstr "Não encontrado"
 #: actions/unsubscribe.php:27 lib/deleteaction.php:66
 #: lib/settingsaction.php:72
 msgid "Not logged in."
-msgstr "Você não está autenticado"
+msgstr "Você não está logado."
 
 #: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
 msgid "Not subscribed!."
-msgstr "Não é assinado!"
+msgstr "Não é seguido!"
 
 #: ../actions/opensearch.php:35 actions/opensearch.php:35
 #: actions/opensearch.php:67
@@ -1639,7 +1639,7 @@ msgstr "Procurar mensagem"
 #: actions/showstream.php:192
 #, php-format
 msgid "Notice feed for %s"
-msgstr "Mensagens de %s"
+msgstr "Feed de mensagens de %s"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
 #: actions/shownotice.php:94
@@ -1683,7 +1683,7 @@ msgstr "Submissão automática da OpenID"
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 #: actions/finishaddopenid.php:170 actions/openidlogin.php:80
 msgid "OpenID Login"
-msgstr "Autenticar-se via OpenID"
+msgstr "Logar-se via OpenID"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
@@ -1702,7 +1702,7 @@ msgstr "A autenticação pela OpenID foi cancelada."
 #: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
 #, php-format
 msgid "OpenID authentication failed: %s"
-msgstr "Não foi possível autenticar via OpenID: %s"
+msgstr "Não foi possível logar via OpenID: %s"
 
 #: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
 #, php-format
@@ -1773,7 +1773,7 @@ msgstr "Pessoas"
 #: ../actions/opensearch.php:33 actions/opensearch.php:33
 #: actions/opensearch.php:64
 msgid "People Search"
-msgstr "Procurar pessoas"
+msgstr "Procurar Pessoas"
 
 #: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
 #: actions/peoplesearch.php:58
@@ -1798,14 +1798,14 @@ msgid ""
 "user's notices. If you didn't just ask to subscribe to someone's notices, "
 "click \"Cancel\"."
 msgstr ""
-"Por favor, verifique estes detalhes para ter certeza que você quer assinar "
-"as mensagens deste usuário. Se você não solicitou a assinatura das mensagens "
-"de ninguém, clique em \"Cancelar\"."
+"Por favor, verifique estes detalhes para ter certeza que você quer seguir as "
+"mensagens deste usuário. Se você não solicitou seguir as mensagens de "
+"alguém, clique em \"Cancelar\"."
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
 #: actions/imsettings.php:142
 msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "Publicar uma mensagem quando eu mudar de estado no Jabber/GTalk."
+msgstr "Publicar uma mensagem quando eu mudar de status no Jabber/GTalk."
 
 #: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
 #: ../actions/smssettings.php:94 actions/emailsettings.php:86
@@ -1836,7 +1836,7 @@ msgstr "Privacidade"
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
 msgid "Problem saving notice."
-msgstr "Problema no salvamento da mensagem."
+msgstr "Problema ao salvar a mensagem."
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
@@ -1862,8 +1862,9 @@ msgstr "Perfil desconhecido"
 
 #: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
 msgid "Public Stream Feed"
-msgstr "Fluxo de mensagens públicas"
+msgstr "Feed de mensagens públicas"
 
+# Just for me.
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
 #: lib/publicgroupnav.php:77
 msgid "Public timeline"
@@ -1882,7 +1883,7 @@ msgstr "Publique um MicroID para meu endereço de e-mail."
 #: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
 #: actions/tag.php:76
 msgid "Recent Tags"
-msgstr "Etiquetas recentes"
+msgstr "Tags recentes"
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
 #: actions/recoverpassword.php:190
@@ -1925,7 +1926,7 @@ msgstr "Recusar"
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
 #: actions/register.php:414
 msgid "Remember me"
-msgstr "Lembrar minha autenticação nesse computador"
+msgstr "Lembrar neste computador"
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
 #: actions/updateprofile.php:74
@@ -1960,9 +1961,8 @@ msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 msgstr ""
-"Remover a sua única OpenID pode fazer com que seja impossível você se "
-"autenticar novamente! Se deseja realmente removê-la, adicione outra OpenID "
-"antes."
+"Remover a sua única OpenID pode fazer com que seja impossível você logar-se "
+"novamente! Se deseja realmente removê-la, adicione outra OpenID antes."
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
 msgid "Replies"
@@ -2090,14 +2090,14 @@ msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
-"Envie-me mensagens via SMS. Eu compreendo que isso pode gerar "
-"cobrançasexorbitantes da minha operadora."
+"Envie-me mensagens via SMS. Eu compreendo que isso pode gerar cobranças "
+"exorbitantes da minha operadora."
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
 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."
+"Envie-me respostas de pessoas que eu não estou seguindo através do "
+"Jabber/GTalk."
 
 #: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
 msgid "Settings"
@@ -2110,7 +2110,7 @@ msgstr "As configurações foram salvas."
 
 #: ../actions/tag.php:60 actions/tag.php:60
 msgid "Showing most popular tags from the last week"
-msgstr "Exibindo as etiquetas mais populares da última semana"
+msgstr "Exibindo as tags mais populares da última semana"
 
 #: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 #: actions/finishaddopenid.php:114
@@ -2131,7 +2131,7 @@ msgstr "Desculpe-me, mas não é permitido o recebimento de emails."
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
 #: scripts/maildaemon.php:57
 msgid "Sorry, that is not your incoming email address."
-msgstr "Desculpe-me, mas este não é seu endereço de e-mail para publicação."
+msgstr "Desculpe-me, mas este não é seu endereço de e-mail para recebimento."
 
 #: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
 msgid "Source"
@@ -2191,7 +2191,7 @@ msgstr "Erro no sistema durante o envio do arquivo."
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
 #: lib/profilelist.php:164
 msgid "Tags"
-msgstr "Etiquetas"
+msgstr "Tags"
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
 msgid "Text"
@@ -2260,12 +2260,12 @@ msgstr "Esse não é seu número de telefone."
 #: actions/emailsettings.php:244 actions/imsettings.php:218
 #: actions/emailsettings.php:367 actions/imsettings.php:349
 msgid "That is the wrong IM address."
-msgstr "Esse endereço de comunicador instantâneo está incorreto."
+msgstr "Isso é um endereço de IM errado."
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
 #: actions/smssettings.php:362
 msgid "That is the wrong confirmation number."
-msgstr "O código de confirmação informado está incorreto."
+msgstr "Isso é um número de confirmação errado."
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
 #: actions/smssettings.php:309
@@ -2337,7 +2337,7 @@ msgstr "Estas são as pessoas cujas mensagens você acompanha."
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
-msgstr "Estas pessoas já são usuárias e você as assinou automaticamente:"
+msgstr "Estas pessoas já são usuárias e você as acompanha automaticamente:"
 
 #: ../actions/recoverpassword.php:88
 msgid "This confirmation code is too old. Please start again."
@@ -2368,7 +2368,7 @@ msgstr ""
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
 msgid "This method requires a POST or DELETE."
-msgstr "Este método requer POST ou DELETE."
+msgstr "Este método requer POSTAGEM ou EXCLUSÃO."
 
 #: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
 #: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
@@ -2400,10 +2400,10 @@ msgid ""
 "register%%) a new  account. If you already have an account  on a [compatible "
 "microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
-"Para assinar, você pode [autenticar-se](%%action.login%%), ou [registrar](%%"
-"action.register%%) uma nova conta. Se você já tem uma conta em um [site de "
-"microblogagem compatível](%%doc.openmublog%%), informe a URL do seu perfil "
-"abaixo."
+"Para assinar, você pode [autenticar-se](%%action.login%%), ou "
+"[registrar](%%action.register%%) uma nova conta. Se você já tem uma conta em "
+"um [site de microblogagem compatível](%%doc.openmublog%%), informe a URL do "
+"seu perfil abaixo."
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132
@@ -2414,12 +2414,12 @@ msgstr "Duas IDs de usuário ou screen_names devem ser informados."
 #: actions/profilesettings.php:81 actions/register.php:183
 #: actions/profilesettings.php:109
 msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL para seu site, blog ou perfil em outro site"
+msgstr "URL do seu site, blog ou perfil em outro site"
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
 #: actions/remotesubscribe.php:110
 msgid "URL of your profile on another compatible microblogging service"
-msgstr "URL para seu perfil em outro serviço de microblogagem compatível"
+msgstr "URL do seu perfil em outro serviço de microblogagem compatível"
 
 #: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
 #: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
@@ -2484,7 +2484,7 @@ msgstr "Atualizações via SMS"
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
 #: lib/connectsettingsaction.php:105
 msgid "Updates by instant messenger (IM)"
-msgstr "Atualizações via mensageiro instantâneo (MI)"
+msgstr "Atualizações via instant messenger (IM)"
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
 #: actions/twitapistatuses.php:129
@@ -2512,7 +2512,7 @@ msgid ""
 msgstr ""
 "Envie um novo \"avatar\" (imagem do usuário) aqui. Você não poderá editar a "
 "imagem depois que enviar, então certifique-se que o formato dela esteja mais "
-"ou menos quadrado. Ela deve estar sob a mesma licença do site. Use uma "
+"ou menos quadrada. Ela deve estar sob a mesma licença do site. Use uma "
 "imagem que pertença a você e que você queira compartilhar."
 
 #: ../lib/settingsaction.php:91
@@ -2589,7 +2589,7 @@ msgstr "Tipo de imagem errado para '%s'"
 #: actions/updateprofile.php:127
 #, php-format
 msgid "Wrong size image at '%s'"
-msgstr "Tamanho da imagem errado em '%s'"
+msgstr "Tamanho da imagem errada em '%s'"
 
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 #: actions/deletenotice.php:64 actions/deletenotice.php:79
@@ -2614,7 +2614,7 @@ msgstr ""
 #: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
 #: actions/recoverpassword.php:36
 msgid "You are already logged in!"
-msgstr "Você já está autenticado!"
+msgstr "Você já está logado!"
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
 msgid "You are already subscribed to these users:"
@@ -2637,7 +2637,7 @@ msgstr "Você pode criar uma nova conta para começar a publicar mensagens."
 #: actions/smssettings.php:69
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "Você pode receber mensagens SMS do %%site.name%% através de e-mail."
+msgstr "Você pode receber mensagens SMS do %%site.name%% através do e-mail."
 
 #: ../actions/openidsettings.php:86
 msgid ""
@@ -2652,8 +2652,8 @@ msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 msgstr ""
-"Você pode enviar e receber mensagens através dos [mensageiros instantâneos](%"
-"%doc.im%%) Jabber/GTalk. Configure seu endereço e opções abaixo."
+"Você pode enviar e receber mensagens através dos [instant "
+"messages](%%doc.im%%) Jabber/GTalk. Configure seu endereço e opções abaixo."
 
 #: ../actions/profilesettings.php:27
 msgid ""
@@ -2709,8 +2709,7 @@ msgstr "Você não pode apagar o status de outro usuário."
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
-msgstr ""
-"Você deve estar autenticado para convidar outros usuários para usar o %s"
+msgstr "Você deve estar logado para convidar outros usuários para usar o %s"
 
 #: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
 msgid ""
@@ -2744,47 +2743,47 @@ msgstr ""
 
 #: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
 msgid "a few seconds ago"
-msgstr "a poucos segundos atrás"
+msgstr "segundos atrás"
 
 #: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
 #, php-format
 msgid "about %d days ago"
-msgstr "aproximadamente %d dias atrás"
+msgstr "%d dias atrás"
 
 #: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
 #, php-format
 msgid "about %d hours ago"
-msgstr "aproximadamente %d horas atrás"
+msgstr "%d horas atrás"
 
 #: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
 #, php-format
 msgid "about %d minutes ago"
-msgstr "aproximadamente %d minutos atrás"
+msgstr "%d mins atrás"
 
 #: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
 #, php-format
 msgid "about %d months ago"
-msgstr "aproximadamente %d meses atrás"
+msgstr "%d meses atrás"
 
 #: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
 msgid "about a day ago"
-msgstr "aproximadamente um dia atrás"
+msgstr "1 dia atrás"
 
 #: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
 msgid "about a minute ago"
-msgstr "aproximadamente um minuto atrás"
+msgstr "1 min atrás"
 
 #: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
 msgid "about a month ago"
-msgstr "aproximadamente um mês atrás"
+msgstr "1 mês atrás"
 
 #: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
 msgid "about a year ago"
-msgstr "aproximadamente um ano atrás"
+msgstr "1 ano atrás"
 
 #: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
 msgid "about an hour ago"
-msgstr "aproximadamente uma hora atrás"
+msgstr "1 hora atrás"
 
 #: ../actions/showstream.php:423 ../lib/stream.php:132
 #: actions/showstream.php:441 lib/stream.php:99
@@ -2815,7 +2814,7 @@ msgstr "tipo de arquivo não suportado"
 
 #: ../lib/util.php:1309 lib/util.php:1443
 msgid "« After"
-msgstr "« Seguintes"
+msgstr "« Posteriores"
 
 #: actions/deletenotice.php:74 actions/disfavor.php:43
 #: actions/emailsettings.php:127 actions/favor.php:45
@@ -2859,7 +2858,7 @@ msgstr "Envie-me um e-mail quando alguém enviar-me uma mensagem particular."
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
 #: actions/twitapifavorites.php:118
 msgid "This notice is already a favorite!"
-msgstr "Essa mensagem já é favorita!"
+msgstr "Essa mensagem já é uma favorita!"
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
@@ -2880,7 +2879,7 @@ msgstr "Mensagens favoritas de %s"
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
 #, php-format
 msgid "Feed of favorite notices of %s"
-msgstr "Mensagens favoritas de %s"
+msgstr "Feed de mensagens favoritas de %s"
 
 #: actions/inbox.php:28 actions/inbox.php:59
 #, php-format
@@ -2904,13 +2903,13 @@ msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
 "\n"
 msgstr ""
-"%1$s convidou você para se associar a %2$s (%3$s).\n"
+"%1$s convidou você para unir-se a %2$s (%3$s).\n"
 "\n"
 
 #: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
 #: actions/register.php:416
 msgid "Automatically login in the future; "
-msgstr "Autenticar-se automaticamente no futuro; "
+msgstr "Logar-se automaticamente no futuro; "
 
 #: actions/login.php:122 actions/login.php:264
 msgid "For security reasons, please re-enter your "
@@ -2918,7 +2917,7 @@ msgstr "Por questões de segurança, por favor, redigite seu "
 
 #: actions/login.php:126 actions/login.php:268
 msgid "Login with your username and password. "
-msgstr "Autentique-se com o seu nome de usuário e senha. "
+msgstr "Logue-se com o seu nome de usuário e senha. "
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
 #: actions/twitapidirect_messages.php:141
@@ -2960,8 +2959,7 @@ msgstr "Mensagem sem um perfil correspondente"
 #: actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
 msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr ""
-"A [OpenID](%%doc.openid%%) permite que você autentique-se em vários sites"
+msgstr "A [OpenID](%%doc.openid%%) permite que você logue-se em vários sites"
 
 #: actions/openidsettings.php:46 actions/openidsettings.php:96
 msgid "If you want to add an OpenID to your account, "
@@ -2969,7 +2967,7 @@ msgstr "Se você quiser adicionar uma OpenID à sua conta, "
 
 #: actions/openidsettings.php:74
 msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr "Será impossível autenticar-se caso você remova a sua única OpenID! "
+msgstr "Será impossível logar-se caso você remova a sua única OpenID! "
 
 #: actions/openidsettings.php:87 actions/openidsettings.php:143
 msgid "You can remove an OpenID from your account "
@@ -2978,12 +2976,12 @@ msgstr "Você pode remover uma OpenID da sua conta "
 #: actions/outbox.php:28 actions/outbox.php:58
 #, php-format
 msgid "Outbox for %s - page %d"
-msgstr "Enviadas por %s - pág. %d"
+msgstr "Enviadas para %s - pág. %d"
 
 #: actions/outbox.php:30 actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
-msgstr "Envidas por %s"
+msgstr "Envidas para %s"
 
 #: actions/outbox.php:53 actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
@@ -3055,12 +3053,12 @@ msgstr "(Você receberá uma mensagem por e-mail a qualquer momento, com "
 #: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
 #, php-format
 msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr "Para assinar, você pode [autenticar-se](%%action.login%%),"
+msgstr "Para seguir alguem, você pode [autenticar-se](%%action.login%%),"
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
 #, php-format
 msgid "Feed for favorites of %s"
-msgstr "Mensagens favoritas de %s"
+msgstr "Feed para favoritas de %s"
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
@@ -3138,13 +3136,13 @@ msgstr "%s / Favoritas de %s"
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
 #, php-format
 msgid "%s updates favorited by %s / %s."
-msgstr "%s updates favorited by %s / %s."
+msgstr "%s atualizações de favoritas por %s / %s."
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
 #: actions/twitapifavorites.php:164 lib/mail.php:553
 #, php-format
 msgid "%s added your notice as a favorite"
-msgstr "%s marcara(m) sua mensagem como favorita"
+msgstr "%s marcaram sua mensagem como favorita"
 
 #: actions/twitapifavorites.php:188 lib/mail.php:276
 #: actions/twitapifavorites.php:165
@@ -3556,7 +3554,7 @@ msgstr "Você está prestes a apagar permanentemente uma mensagem. "
 
 #: actions/disfavor.php:94
 msgid "Add to favorites"
-msgstr "Adicionar às favoritas"
+msgstr "Adicionar aos favoritos"
 
 #: actions/editgroup.php:54
 #, php-format
@@ -3570,7 +3568,7 @@ msgstr ""
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
 msgid "You must be logged in to create a group."
-msgstr "Você deve estar autenticado para criar um grupo."
+msgstr "Você deve estar logado para criar um grupo."
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
@@ -4350,14 +4348,14 @@ msgid "These are the people who "
 msgstr "Estas são as pessoas que acompanham as mensagens de %s."
 
 #: actions/subscriptions.php:52
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscriptions"
-msgstr "Todas as assinaturas"
+msgstr "%s assinaturas"
 
 #: actions/subscriptions.php:54
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscriptions, page %d"
-msgstr "Todas as assinaturas"
+msgstr "%s assinaturas, página %d"
 
 #: actions/subscriptions.php:65
 #, fuzzy
@@ -4392,9 +4390,9 @@ msgid "No id argument."
 msgstr "Nenhum argumento de ID."
 
 #: actions/tagother.php:65
-#, fuzzy, php-format
+#, php-format
 msgid "Tag %s"
-msgstr "Etiquetas"
+msgstr "Tag %s"
 
 #: actions/tagother.php:141
 #, fuzzy
@@ -4410,7 +4408,6 @@ msgstr ""
 "ou espaços"
 
 #: actions/tagother.php:164
-#, fuzzy
 msgid "There was a problem with your session token."
 msgstr ""
 "Ocorreu um problema com o seu token de sessão. Tente novamente, por favor."
@@ -4452,7 +4449,6 @@ msgid "Not found."
 msgstr "Não encontrado."
 
 #: actions/twittersettings.php:71
-#, fuzzy
 msgid "Add your Twitter account to automatically send "
 msgstr ""
 "Adicione a sua conta do Twitter para enviar suas mensagens para lá "
@@ -4472,12 +4468,12 @@ msgstr "Amigos do Twitter"
 
 #: actions/twittersettings.php:327
 msgid "Username must have only numbers, "
-msgstr ""
+msgstr "Nome de usuário deve ter números,"
 
 #: actions/twittersettings.php:341
-#, fuzzy, php-format
+#, php-format
 msgid "Unable to retrieve account information "
-msgstr "Não foi possível obter as informações da conta \"%s\" no Twitter."
+msgstr "Não foi possível obter informações da conta"
 
 #: actions/unblock.php:108
 msgid "Error removing the block."
@@ -4542,52 +4538,46 @@ msgid "Untitled page"
 msgstr "Página sem título"
 
 #: lib/action.php:316
-#, fuzzy
 msgid "Primary site navigation"
 msgstr "Navegação primária no site"
 
 #: lib/action.php:322
 msgid "Personal profile and friends timeline"
-msgstr ""
+msgstr "Perfil pessoal e mensagens dos amigos"
 
 #: lib/action.php:325
 msgid "Search for people or text"
-msgstr ""
+msgstr "Pesquisar por pessoa ou texto"
 
 #: lib/action.php:328
-#, fuzzy
 msgid "Account"
-msgstr "Sobre"
+msgstr "Conta"
 
 #: lib/action.php:328
-#, fuzzy
 msgid "Change your email, avatar, password, profile"
-msgstr "Altera a sua senha"
+msgstr "Alterar email, avatar, senha, perfil"
 
 #: lib/action.php:330
 msgid "Connect to IM, SMS, Twitter"
-msgstr ""
+msgstr "Conectar por IM, SMS, Twitter"
 
 #: lib/action.php:332
 msgid "Logout from the site"
-msgstr ""
+msgstr "Sair deste site"
 
 #: lib/action.php:335
 msgid "Login to the site"
-msgstr ""
+msgstr "Entrar"
 
 #: lib/action.php:338
-#, fuzzy
 msgid "Create an account"
 msgstr "Criar uma nova conta"
 
 #: lib/action.php:341
-#, fuzzy
 msgid "Login with OpenID"
-msgstr "Essa OpenID não existe."
+msgstr "Entrar com OpenID"
 
 #: lib/action.php:344
-#, fuzzy
 msgid "Help me!"
 msgstr "Ajuda"
 
@@ -4678,48 +4668,43 @@ msgid "Go"
 msgstr "Ir"
 
 #: lib/groupeditform.php:148
-#, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "URL para seu site, blog ou perfil em outro site"
 
 #: lib/groupeditform.php:151
-#, fuzzy
 msgid "Description"
-msgstr "Assinaturas"
+msgstr "Descrição"
 
 #: lib/groupeditform.php:153
-#, fuzzy
 msgid "Describe the group or topic in 140 chars"
-msgstr "Descreva a si mesmo e seus interesses em 140 caracteres."
+msgstr "Descreva o grupo ou tópico em 140 caracteres."
 
 #: lib/groupeditform.php:158
-#, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr "Onde você está, ex: \"cidade, estado (ou região), país\""
 
 #: lib/groupnav.php:84 lib/searchgroupnav.php:84
 msgid "Group"
-msgstr ""
+msgstr "Grupo"
 
 #: lib/groupnav.php:100
 msgid "Admin"
-msgstr ""
+msgstr "Admin"
 
 #: lib/groupnav.php:101
 #, php-format
 msgid "Edit %s group properties"
-msgstr ""
+msgstr "Editar propriedades do grupo %s"
 
 #: lib/groupnav.php:106
-#, fuzzy
 msgid "Logo"
-msgstr "Sair"
+msgstr "Logo"
 
 #: lib/groupnav.php:107
 #, php-format
 msgid "Add or edit %s logo"
-msgstr ""
+msgstr "Adicionar ou editar logo de %s"
 
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
@@ -4877,7 +4862,7 @@ msgstr "Etiquetas recentes"
 
 #: lib/publicgroupnav.php:86
 msgid "Featured"
-msgstr "Destaque"
+msgstr "Destacada"
 
 #: lib/publicgroupnav.php:90
 msgid "Popular"
diff --git a/locale/ru_RU/LC_MESSAGES/laconica.mo b/locale/ru_RU/LC_MESSAGES/laconica.mo
index 9bfd550b4..6ebd0713a 100644
--- a/locale/ru_RU/LC_MESSAGES/laconica.mo
+++ b/locale/ru_RU/LC_MESSAGES/laconica.mo
diff --git a/locale/ru_RU/LC_MESSAGES/laconica.po b/locale/ru_RU/LC_MESSAGES/laconica.po
index 55b908d2e..8735bacd3 100644
--- a/locale/ru_RU/LC_MESSAGES/laconica.po
+++ b/locale/ru_RU/LC_MESSAGES/laconica.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-03-12 16:26+0000\n"
-"Last-Translator: Evan Prodromou <evan@controlyourself.ca>\n"
+"PO-Revision-Date: 2009-04-01 16:09+0000\n"
+"Last-Translator: motherfuker <meelana@list.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +23,7 @@ msgstr ""
 #: actions/noticesearchrss.php:88
 #, php-format
 msgid " Search Stream for \"%s\""
-msgstr "Поиск для \"%s\""
+msgstr ""
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 #: actions/finishopenidlogin.php:88 actions/register.php:205
@@ -31,23 +31,22 @@ msgstr "Поиск для \"%s\""
 msgid ""
 " except this private data: password, email address, IM address, phone number."
 msgstr ""
-", за исключением моих частных данных: пароля, почты, мессенджера, телефона."
 
 #: ../actions/showstream.php:400 ../lib/stream.php:109
 #: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
 msgid " from "
-msgstr " из"
+msgstr ""
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
 #: actions/twitapistatuses.php:347
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
-msgstr "%1$s / Обновлены ответы для %2$s"
+msgstr ""
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s приглашает тебя записаться на %2$s"
+msgstr ""
 
 #: ../actions/invite.php:170
 #, php-format
@@ -79,37 +78,11 @@ msgid ""
 "\n"
 "Sincerely, %2$s\n"
 msgstr ""
-"%1$s приглашает тебя записаться на %2$s (%3$s).\n"
-"\n"
-"%2$s — это открытый сервис, который позволяет быть в курсе последних событий "
-"из жизни людей, которых ты знаешь или которые тебя интересуют.\n"
-"\n"
-"Ты также можешь рассказывать другим о себе: о твоих делах, мыслях и "
-"впечатлениях. У нас ты сможешь завести новые знакомства с людьми, которые "
-"разделяют твои интересы.\n"
-"\n"
-"%1$s сказал(а):\n"
-"\n"
-"%4$s\n"
-"\n"
-"Профиль %1$s на %2$s можно посмотреть здесь:\n"
-"\n"
-"%5$s\n"
-"\n"
-"Если ты хочешь попробовать наш сервис, нажми на нижнюю ссылку, чтобы принять "
-"приглашение.\n"
-"\n"
-"%6$s\n"
-"\n"
-"Если нет, просто проигнорируй это письмо. Спасибо за твоё терпение и время.\n"
-"\n"
-"С уважением,\n"
-"%2$s\n"
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s теперь просматривает твои записи на %2$s."
+msgstr ""
 
 #: ../lib/mail.php:126
 #, php-format
@@ -121,30 +94,24 @@ msgid ""
 "Faithfully yours,\n"
 "%4$s.\n"
 msgstr ""
-"%1$s слушает твои заметки на %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"С уважением,\n"
-"%4$s.\n"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
 #: actions/twitapistatuses.php:350
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "%1$s обновил ответы обновленные для %2$s / %3$s."
+msgstr ""
 
 #: ../actions/shownotice.php:45 actions/shownotice.php:45
 #: actions/shownotice.php:161
 #, php-format
 msgid "%1$s's status on %2$s"
-msgstr "%1$s статус на %2$s"
+msgstr ""
 
 #: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
 #, php-format
 msgid "%s (%s)"
-msgstr "%s (%s)"
+msgstr ""
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
 #: actions/publicrss.php:90
@@ -165,7 +132,7 @@ msgstr "%s и друзья"
 #: actions/twitapistatuses.php:33
 #, php-format
 msgid "%s public timeline"
-msgstr "%s публичная хронология"
+msgstr "%s общая лента"
 
 #: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
 #, php-format
@@ -383,7 +350,7 @@ msgstr "Уже подписан!"
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
 #: actions/deletenotice.php:113
 msgid "Are you sure you want to delete this notice?"
-msgstr "Вы уверены, что хотите удалить эту заметку?"
+msgstr "Вы уверены, что хотите удалить эту запись?"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 #: actions/userauthorization.php:81
@@ -393,14 +360,12 @@ msgstr "Авторизованная подписка"
 #: ../actions/login.php:104 ../actions/register.php:178
 #: actions/register.php:192
 msgid "Automatically login in the future; not for shared computers!"
-msgstr "Автоматическая повторная авторизация. Не для публичных компьютеров!"
+msgstr "Автоматический повторный вход. Не для публичных компьютеров!"
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr ""
-"Автоматически подписываться на всех, кто подписался на меня (самое "
-"подходящее для ботов)"
+msgstr "Автоматически подписываться на всех, кто подписался на меня"
 
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
@@ -419,8 +384,8 @@ 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 в Ваш "
+"В ожидании подтверждения этого адреса. Проверьте Ваш Jabber/GTalk - аккаунт "
+"на предмет сообщения с дальнейшими инструкциями. (Вы включили %s в Ваш "
 "контактный список?)"
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
@@ -444,7 +409,7 @@ msgstr "Ранее »"
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
 msgid "Bio"
-msgstr "Биография"
+msgstr "Био"
 
 #: ../actions/profilesettings.php:101 ../actions/register.php:82
 #: ../actions/updateprofile.php:103 actions/profilesettings.php:216
@@ -452,11 +417,11 @@ msgstr "Биография"
 #: actions/profilesettings.php:205 actions/register.php:174
 #: actions/updateprofile.php:107
 msgid "Bio is too long (max 140 chars)."
-msgstr "Слишком длинная биография (не более 140 символов)."
+msgstr "Слишком длинное био (максимум 140 символов)."
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
 msgid "Can't delete this notice."
-msgstr "Не удаётся удалить эту заметку."
+msgstr "Не удаётся удалить эту запись."
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #: actions/updateprofile.php:123
@@ -566,16 +531,22 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
-"Наши поздравления, %s! И добро пожаловать на %%site.name%%%%. Здесь Вы "
+"Наши поздравления, %s! И добро пожаловать на %%%%site.name%%%%. Здесь вы "
 "можете ...\n"
-"* Перейти на [your profile](%s) и запостить Ваше первое сообщение.* Добавить "
-"Ваш [Jabber/GTalk - адрес](%%%%action.imsettings%%%%) так что Вы сможете "
-"после этого отправлять посты через мессенджеры.* [Искать людей](%%%%action."
-"peoplesearch%%%%) который вы возможно знаете или с которыми разделяете одни "
-"и те же интересы. * Обновить Ваши [профильные установки](%%%%action."
-"profilesettings%%%%) чтобы больше рассказать другим о себе. * Прочитать "
-"[онлайн-документацию](%%%%doc.help%%%%) чтобы узнать об особенностях данного "
-"сервиса. Спасибо за то, что присоединились к нам и надеемся, что вы получите "
+"\n"
+"* Перейти на [ваш микроблог](%s) и запостить вашу первую запись.\n"
+"* Добавить ваш [Jabber/GTalk - аккаунт](%%%%action.imsettings%%%%) так что "
+"вы сможете после этого отправлять записи через мессенджеры.\n"
+"* [Искать людей](%%%%action.peoplesearch%%%%), которых вы возможно знаете "
+"или с которыми разделяете одни и те же интересы.\n"
+"* Не нашли друзей или знакомых? [Пригласите их](%%%%action.invite%%%%) на "
+"%%%%site.name%%%%, подпишитесь на них и будьте всегда в курсе.\n"
+"* Обновить ваши [профильные настройки](%%%%action.profilesettings%%%%) чтобы "
+"больше рассказать другим о себе.\n"
+"* Прочитать [документацию](%%%%doc.help%%%%) чтобы поподробнее узнать об "
+"особенностях данного вэб сервиса и о том как его использовать.\n"
+"\n"
+"Спасибо за то, что присоединились к нам и надеемся, что вы получите "
 "удовольствие от использования данного сервиса!"
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
@@ -590,7 +561,7 @@ msgstr "Соединить с существующей записью"
 
 #: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
 msgid "Contact"
-msgstr "Контактная информация"
+msgstr "Контакты"
 
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
 #, php-format
@@ -766,7 +737,7 @@ msgstr "Ошибка баз данных при вставке ответа дл
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
 #: actions/deletenotice.php:79
 msgid "Delete notice"
-msgstr "Удалить заметку"
+msgstr "Удалить запись"
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
@@ -779,7 +750,7 @@ msgstr "Опиши себя и свои увлечения при помощи 1
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
 msgid "Email"
-msgstr "Электронный адрес"
+msgstr "Email"
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
 #: actions/emailsettings.php:115
@@ -901,7 +872,7 @@ msgstr "Существующее имя"
 
 #: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
 msgid "FAQ"
-msgstr "ЧАВО"
+msgstr "ЧаВо"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397
@@ -929,7 +900,7 @@ msgstr "Лента тегов %s"
 #: ../lib/searchaction.php:105 lib/searchaction.php:105
 #: lib/searchgroupnav.php:83
 msgid "Find content of notices"
-msgstr "Найти заметку по содержимому"
+msgstr "Найти запись по содержимому"
 
 #: ../lib/searchaction.php:101 lib/searchaction.php:101
 #: lib/searchgroupnav.php:81
@@ -987,7 +958,7 @@ msgstr "URL Главной страницы неверен."
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
 #: actions/emailsettings.php:173
 msgid "I want to post notices by email."
-msgstr "Я хочу отправлять заметки по электронной почте."
+msgstr "Я хочу отправлять записи по электронной почте."
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
 #: lib/connectsettingsaction.php:104
@@ -1010,24 +981,24 @@ msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
 msgstr ""
-"Если у Вас уже есть счёт, то авторизуйтесь с Вашим именем и паролем, чтобы "
-"соединить их с Вашим OpenID."
+"Если у вас уже есть аккаунт, то авторизуйтесь с вашим ником и паролем, чтобы "
+"соединить их с вашим OpenID."
 
 #: ../actions/openidsettings.php:45
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
 msgstr ""
-"Если Вы хотите добавить OpenID к Вашему счёту, то введите его в поле ниже и "
-"нажмите на кнопку \"Добавить\""
+"Если вы хотите добавить OpenID к вашему аккаунту, то введите его в поле ниже "
+"и нажмите на кнопку \"Добавить\""
 
 #: ../actions/recoverpassword.php:137
 msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
 msgstr ""
-"Если Вы забыли или потеряли пароль, то вы можете получить новый, послав "
-"запрос на тот электронный адрес, который вы указали в Вашем счёте."
+"Если вы забыли или потеряли пароль, то вы можете получить новый, послав "
+"запрос на тот электронный адрес, который вы указали в вашем аккаунте."
 
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
@@ -1056,7 +1027,7 @@ msgid ""
 "address registered to your account."
 msgstr ""
 "Инструкции по восстановлению пароля посланы на электронный адрес, который Вы "
-"указали при регистрации Вашего счёта."
+"указали при регистрации вашего аккаунта."
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
 #: actions/updateprofile.php:118
@@ -1084,17 +1055,17 @@ msgstr "Неверный URL лицензии для '%s'"
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
 #: actions/postnotice.php:66
 msgid "Invalid notice content"
-msgstr "Неверный контент заметки"
+msgstr "Неверный контент записи"
 
 #: ../actions/postnotice.php:67 actions/postnotice.php:68
 #: actions/postnotice.php:72
 msgid "Invalid notice uri"
-msgstr "Неверный URI заметки"
+msgstr "Неверный URI записи"
 
 #: ../actions/postnotice.php:72 actions/postnotice.php:73
 #: actions/postnotice.php:77
 msgid "Invalid notice url"
-msgstr "Неверный URL заметки"
+msgstr "Неверный URL записи"
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
 #: actions/updateprofile.php:91
@@ -1186,7 +1157,7 @@ msgstr "Слишком длинный язык (более 50 символов).
 #: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
 #: lib/profilelist.php:125
 msgid "Location"
-msgstr "Место жительства"
+msgstr "Месторасположение"
 
 #: ../actions/profilesettings.php:104 ../actions/register.php:85
 #: ../actions/updateprofile.php:108 actions/profilesettings.php:219
@@ -1195,7 +1166,7 @@ msgstr "Место жительства"
 #: actions/profilesettings.php:208 actions/register.php:177
 #: actions/updateprofile.php:112
 msgid "Location is too long (max 255 chars)."
-msgstr "Слишком длинное место жительства (более 255 знаков)."
+msgstr "Слишком длинное месторасположение (максимум 255 знаков)."
 
 #: ../actions/login.php:97 ../actions/login.php:106
 #: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
@@ -1205,13 +1176,13 @@ msgstr "Слишком длинное место жительства (боле�
 #: lib/facebookaction.php:315 lib/logingroupnav.php:75
 #, php-format
 msgid "Login"
-msgstr "Авторизация"
+msgstr "Вход"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
 #: actions/openidlogin.php:62
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Авторизация при помощи [OpenID](%%doc.openid%%)."
+msgstr "Вход при помощи [OpenID](%%doc.openid%%)."
 
 #: ../actions/login.php:126
 #, php-format
@@ -1220,8 +1191,8 @@ msgid ""
 "(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
 "%). "
 msgstr ""
-"Авторизация с Вашим именем и паролем. Ещё не имеете пользовательского имени "
-"здесь?[Зарегистрируйте](%%action.register%%) новую запись, или попробуйте "
+"Вход с вашим ником и паролем. Нет аккаунта? "
+"[Зарегистрируйте](%%action.register%%) новый аккаунт, или попробуйте "
 "авторизоваться при помощи [OpenID](%%action.openidlogin%%). "
 
 #: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
@@ -1300,7 +1271,7 @@ msgstr "Новое имя"
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
 #: actions/newnotice.php:68
 msgid "New notice"
-msgstr "Новая заметка"
+msgstr "Новая запись"
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 #: actions/profilesettings.php:180 actions/recoverpassword.php:185
@@ -1481,7 +1452,7 @@ msgstr "Нет такого документа."
 #: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
 #: lib/deleteaction.php:51
 msgid "No such notice."
-msgstr "Нет такой заметки."
+msgstr "Нет такой записи."
 
 #: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
 #: actions/recoverpassword.php:62
@@ -1630,31 +1601,31 @@ msgstr "Не подписан!"
 #: ../actions/opensearch.php:35 actions/opensearch.php:35
 #: actions/opensearch.php:67
 msgid "Notice Search"
-msgstr "Поиск в заметках"
+msgstr "Поиск в записях"
 
 #: ../actions/showstream.php:82 actions/showstream.php:82
 #: actions/showstream.php:180 actions/showstream.php:187
 #: actions/showstream.php:192
 #, php-format
 msgid "Notice feed for %s"
-msgstr "Лента заметок для %s"
+msgstr "Лента записей для %s"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
 #: actions/shownotice.php:94
 msgid "Notice has no profile"
-msgstr "Заметка без профиля"
+msgstr "Запись без профиля"
 
 #: ../actions/showstream.php:316 actions/showstream.php:331
 #: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
 #: lib/noticelist.php:87
 msgid "Notices"
-msgstr "Заметки"
+msgstr "Записи"
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
 #: actions/tag.php:81 actions/tag.php:41
 #, php-format
 msgid "Notices tagged with %s"
-msgstr "Заметки, помеченные %s"
+msgstr "Записи, помеченные %s"
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
 #: actions/passwordsettings.php:97
@@ -1681,7 +1652,7 @@ msgstr "Автоподдержка OpenID"
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 #: actions/finishaddopenid.php:170 actions/openidlogin.php:80
 msgid "OpenID Login"
-msgstr "Авторизация OpenID"
+msgstr "OpenID вход"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
@@ -1693,14 +1664,14 @@ msgstr "URL для OpenID"
 #: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 #: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
 msgid "OpenID authentication cancelled."
-msgstr "Авторизация при помощи OpenID отменена."
+msgstr "Вход при помощи OpenID отменён."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
 #, php-format
 msgid "OpenID authentication failed: %s"
-msgstr "Авторизация при помощи OpenID неудачна: %s"
+msgstr "Вход при помощи OpenID неудачен: %s"
 
 #: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
 #, php-format
@@ -1796,14 +1767,14 @@ msgid ""
 "user's notices. If you didn't just ask to subscribe to someone's notices, "
 "click \"Cancel\"."
 msgstr ""
-"Пожалуйста, отметьте эти подробности, чтобы быть уверенным, что Вы хотите "
-"подписаться на эти заметки. Если Вы этого не хотите делать, то выберите "
-"пункт \"Отказ\"."
+"Пожалуйста, отметьте эти подробности, чтобы быть уверенным, что вы хотите "
+"подписаться на эти записи. Если Вы этого не хотите делать, то нажмите "
+"\"Отказ\"."
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
 #: actions/imsettings.php:142
 msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "Публиковать заметку, когда мой Jabber/GTalk - статус изменяется."
+msgstr "Публиковать запись, когда мой Jabber/GTalk - статус изменяется."
 
 #: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
 #: ../actions/smssettings.php:94 actions/emailsettings.php:86
@@ -1829,12 +1800,12 @@ msgstr "Любимый язык"
 
 #: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
 msgid "Privacy"
-msgstr "Частное"
+msgstr "Пользовательское соглашение"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
 msgid "Problem saving notice."
-msgstr "Проблемы с сохранением заметки."
+msgstr "Проблемы с сохранением записи."
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
@@ -1865,7 +1836,7 @@ msgstr "Лента публичного потока"
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
 #: lib/publicgroupnav.php:77
 msgid "Public timeline"
-msgstr "Публичная хронология"
+msgstr "Общая лента"
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
 #: actions/imsettings.php:153
@@ -1933,7 +1904,7 @@ msgstr "Удаление профиля как несоответствующе�
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
 #: actions/remotesubscribe.php:88
 msgid "Remote subscribe"
-msgstr "Удалить подписку"
+msgstr "Подписаться на пользователя"
 
 #: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
@@ -2042,8 +2013,8 @@ msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
 "by spaces; they must be 3 characters or more."
 msgstr ""
-"Поиск по содержанию заметок на %%site.name%%. Между терминами ставь пробелы. "
-"Минимальная длина слова — 3 буквы."
+"Поиск по содержанию записей на %%site.name%%. Между ключевыми словами "
+"ставьте пробелы. Минимальная длина слова — 3 буквы."
 
 #: ../actions/peoplesearch.php:28
 #, php-format
@@ -2051,8 +2022,8 @@ 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 ""
-"Поиск людей на %%site.name%% по имени, жительству или интересам. Разделяйте "
-"термины пробелами. Минимальная длина слова — 3 буквы."
+"Поиск людей на %%site.name%% по имени, месторасположению или интересам. "
+"Разделяйте ключевые слова пробелами. Минимальная длина слова — 3 буквы."
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
 #: actions/smssettings.php:457
@@ -2069,7 +2040,7 @@ msgstr "ОК"
 #: actions/emailsettings.php:74 actions/smssettings.php:82
 #: actions/emailsettings.php:132 actions/smssettings.php:145
 msgid "Send email to this address to post new notices."
-msgstr "Посылать электронные письма на этот адрес для постинга новых заметок."
+msgstr "Посылать электронные письма на этот адрес для постинга новых записей."
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
 #: actions/emailsettings.php:152
@@ -2079,15 +2050,15 @@ msgstr "Уведомлять меня о новых подписчиках по
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
 #: actions/imsettings.php:137
 msgid "Send me notices through Jabber/GTalk."
-msgstr "Посылать мне заметки через Jabber/GTalk."
+msgstr "Посылать мне записи через Jabber/GTalk."
 
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
-"Посылать мне заметки через СМС; я понимаю, что это может привести к "
-"чрезмерным расходам по пересылке."
+"Посылать мне записи через СМС; я понимаю, что это может привести к расходам "
+"по пересылке."
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
@@ -2271,17 +2242,17 @@ msgstr "Этот телефонный номер уже задействован
 #: actions/newnotice.php:49 actions/twitapistatuses.php:330
 #: actions/facebookhome.php:243 actions/twitapistatuses.php:276
 msgid "That's too long. Max notice size is 140 chars."
-msgstr "Слишком длинная заметка. Максимальная длина - 140 знаков."
+msgstr "Слишком длинная запись. Максимальная длина - 140 знаков."
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
 #: actions/twitapiaccount.php:62
 msgid "That's too long. Max notice size is 255 chars."
-msgstr "Слишком длинная заметка. Максимальная длина - 255 знаков."
+msgstr "Слишком длинная запись. Максимальная длина - 255 знаков."
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
-msgstr "Адрес \"%s\" подтвержден для Вашего счёта."
+msgstr "Адрес \"%s\" подтвержден для вашего аккаунта."
 
 #: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
 #: ../actions/smssettings.php:274 actions/emailsettings.php:282
@@ -2312,20 +2283,20 @@ msgstr ""
 #: ../actions/subscribers.php:35 actions/subscribers.php:35
 #, php-format
 msgid "These are the people who listen to %s's notices."
-msgstr "Это пользователи, которые читают заметки %s."
+msgstr "Это пользователи, которые читают записи %s."
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
 msgid "These are the people who listen to your notices."
-msgstr "Это пользователи, которые читают Ваши заметки."
+msgstr "Это пользователи, которые читают ваши записи."
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
-msgstr "Это пользователи, заметки которых читает %s."
+msgstr "Это пользователи, записи которых читает %s."
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
 msgid "These are the people whose notices you listen to."
-msgstr "Это пользователи, заметки которых Вы читаете."
+msgstr "Это пользователи, записи которых вы читаете."
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
 msgid ""
@@ -2354,9 +2325,9 @@ msgid ""
 "to a local account. You can either create a new account, or connect with "
 "your existing account, if you have one."
 msgstr ""
-"Вы впервые вошли под именем %s, так что нам нужно привязать Ваш OpenID к "
-"Вашим локальным установкам. Вы должны или создать новый счёт или привязаться "
-"к уже имеющемуся счёту, если хотя бы один счёт у Вас уже есть. "
+"Вы впервые вошли под именем %s, так что нам нужно привязать ваш OpenID к "
+"вашим локальным установкам. Вы должны создать новый аккаунт или привязаться "
+"к уже имеющемуся аккаунту, если он есть. "
 
 #: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
@@ -2396,9 +2367,7 @@ msgid ""
 "microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
 "Чтобы подписаться, необходимо [авторизоваться](%%action.login%%) или "
-"[зарегистрироваться](%%action.register%%) с новым счётом. Если Вы уже имеет "
-"счёт на [подходящем сайте микроблогинга](%%doc.openmublog%%),  то введите "
-"URL Вашего профиля ниже."
+"[зарегистрировать](%%action.register%%) новый аккаунт."
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132
@@ -2458,7 +2427,7 @@ msgstr "Нераспознанный тип адреса %s"
 #: ../actions/showstream.php:209 actions/showstream.php:219
 #: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
-msgstr "Аннулировать подписку"
+msgstr "Отписаться"
 
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
 #: actions/postnotice.php:45 actions/updateprofile.php:46
@@ -2570,7 +2539,7 @@ msgstr "Что нового, %s?"
 #: actions/profilesettings.php:87 actions/register.php:189
 #: actions/profilesettings.php:119
 msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Где Вы находитесь, например «Город, штат (или область), страна»"
+msgstr "Где вы находитесь, например «Город, область, страна»"
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
 #: actions/updateprofile.php:132
@@ -2601,7 +2570,7 @@ msgid ""
 "You are about to permanently delete a notice.  Once this is done, it cannot "
 "be undone."
 msgstr ""
-"Вы окончательно удаляете заметку. После того, как это будет сделано, "
+"Вы окончательно удаляете запись. После того, как это будет сделано, "
 "восстановление будет невозможно."
 
 #: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
@@ -2624,7 +2593,9 @@ msgstr "Вы можете поменять Ваш пароль здесь. Вы�
 
 #: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
-msgstr "Вы можете создать новую учётную запись, чтобы начать писать заметки."
+msgstr ""
+"Вы можете создать новый аккаунт, чтобы начать писать записи в вашем "
+"микроблоге."
 
 #: ../actions/smssettings.php:28 actions/smssettings.php:28
 #: actions/smssettings.php:69
@@ -2637,9 +2608,7 @@ msgstr ""
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
-msgstr ""
-"Вы можете удалить OpenID из своего счёта, нажав на клавишу, помеченную "
-"словом \"Убрать\". "
+msgstr "Вы можете удалить OpenID из своего аккаунта, нажав на кнопку \"Убрать\". "
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
 #, php-format
@@ -2647,15 +2616,15 @@ msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 msgstr ""
-"Вы можете отправлять и получать заметки через Jabber/GTalk [онлайн-"
-"мессенджер](%%doc.im%%). Настройте Ваш адрес и установки ниже."
+"Вы можете отправлять и получать записи через Jabber/GTalk "
+"[онлайн-мессенджер](%%doc.im%%). Настройте ваш аккаунт и предпочтения ниже."
 
 #: ../actions/profilesettings.php:27
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
-"Вы можете подновить Ваш профиль ниже, так что люди узнают о Вас немного "
-"больше. "
+"Вы можете обновить ваш профиль ниже, так что люди узнают о вас немного "
+"больше."
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
@@ -2690,8 +2659,13 @@ msgid ""
 "%4$s"
 msgstr ""
 "У Вас новый адрес постинга на %1$s.\n"
-"Посылайте электронные письма на %2$s для постинга новых заметок.Инструкции "
-"по электронным публикациям заметок на %3$s.Искренне Ваш,%4$s"
+"\n"
+"Посылайте электронные письма на %2$s для постинга новых записей.\n"
+"\n"
+"Инструкции по электронным публикациям записей на %3$s.\n"
+"\n"
+"Искренне Ваш,\n"
+"%4$s"
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
 #: actions/twitapistatuses.php:463
@@ -2732,9 +2706,9 @@ msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
-"[OpenID](%%doc.openid%%) позволяет Вам авторизоваться на многих сайтах при "
-"помощи только лишь одной записи.  Управляйте Вашим ассоциированным счётом "
-"OpenIDs отсюда."
+"[OpenID](%%doc.openid%%) позволяет вам авторизоваться на многих сайтах при "
+"помощи только лишь одного аккаунта.  Управляйте вашим ассоциированным "
+"аккаунтом OpenIDs отсюда."
 
 #: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
 msgid "a few seconds ago"
@@ -2808,9 +2782,8 @@ msgid "unsupported file type"
 msgstr "неподдерживаемый тип файла"
 
 #: ../lib/util.php:1309 lib/util.php:1443
-#, fuzzy
 msgid "« After"
-msgstr "« Ранее"
+msgstr "Сюда"
 
 #: actions/deletenotice.php:74 actions/disfavor.php:43
 #: actions/emailsettings.php:127 actions/favor.php:45
@@ -2830,11 +2803,11 @@ msgstr "Проблема с Вашей сессией. Попробуйте ещ
 
 #: actions/disfavor.php:55 actions/disfavor.php:81
 msgid "This notice is not a favorite!"
-msgstr "Эта заметка не входит в число Ваших любимых заметок!"
+msgstr "Эта запись не входит в число ваших любимых записей!"
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
 msgid "Could not delete favorite."
-msgstr "Не удаётся удалить любимую заметку."
+msgstr "Не удаётся удалить любимую запись."
 
 #: actions/disfavor.php:72 lib/favorform.php:140
 msgid "Favor"
@@ -2844,7 +2817,7 @@ msgstr "Пометить"
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Посылать мне сообщение по электронной почте, если кто-нибудь добавит мою "
-"заметку в число любимых."
+"запись в число любимых."
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
 msgid "Send me email when someone sends me a private message."
@@ -2855,13 +2828,13 @@ msgstr ""
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
 #: actions/twitapifavorites.php:118
 msgid "This notice is already a favorite!"
-msgstr "Эта заметка уже входит в число любимых!"
+msgstr "Эта запись уже входит в число любимых!"
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
 msgid "Could not create favorite."
-msgstr "Не удаётся создать любимую заметку."
+msgstr "Не удаётся создать любимую запись."
 
 #: actions/favor.php:70
 msgid "Disfavor"
@@ -2871,12 +2844,12 @@ msgstr "Нелюбимое"
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
 #, php-format
 msgid "%s favorite notices"
-msgstr "%s любимые заметки"
+msgstr "Любимые записи %s"
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
 #, php-format
 msgid "Feed of favorite notices of %s"
-msgstr "Лента любимых заметок %s"
+msgstr "Лента любимых записей %s"
 
 #: actions/inbox.php:28 actions/inbox.php:59
 #, php-format
@@ -2913,7 +2886,7 @@ msgstr "По причинам безопасности повторите, по�
 
 #: actions/login.php:126 actions/login.php:268
 msgid "Login with your username and password. "
-msgstr "Авторизация с Вашим именем и паролем."
+msgstr "Вход с вашим ником и паролем."
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
 #: actions/twitapidirect_messages.php:141
@@ -2948,7 +2921,7 @@ msgstr "Новое сообщение"
 
 #: actions/noticesearch.php:95 actions/noticesearch.php:146
 msgid "Notice without matching profile"
-msgstr "Заметка без соответствующего профиля"
+msgstr "Запись без соответствующего профиля"
 
 #: actions/openidsettings.php:28 actions/openidsettings.php:70
 #, php-format
@@ -2957,7 +2930,7 @@ msgstr "[OpenID](%%doc.openid%%) позволяет Вам авторизова�
 
 #: actions/openidsettings.php:46 actions/openidsettings.php:96
 msgid "If you want to add an OpenID to your account, "
-msgstr "Если Вы хотите добавить OpenID к Вашему счёту,"
+msgstr "Если вы хотите добавить OpenID к вашему аккаунту,"
 
 #: actions/openidsettings.php:74
 msgid "Removing your only OpenID would make it impossible to log in! "
@@ -2966,7 +2939,7 @@ msgstr ""
 
 #: actions/openidsettings.php:87 actions/openidsettings.php:143
 msgid "You can remove an OpenID from your account "
-msgstr "Вы можете удалить OpenID из Вашего счёта"
+msgstr "Вы можете удалить OpenID из вашего аккаунта"
 
 #: actions/outbox.php:28 actions/outbox.php:58
 #, php-format
@@ -3046,17 +3019,17 @@ msgstr "(Вы получили электронное сообщение, от "
 #: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
 #, php-format
 msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr "чтобы подписаться, Вы должны [авторизоваться](%%action.login%%),"
+msgstr "Чтобы подписаться, вы должны [авторизоваться](%%action.login%%),"
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
 #, php-format
 msgid "Feed for favorites of %s"
-msgstr "Лента любимых заметок от %s"
+msgstr "Лента любимых записей от %s"
 
 #: actions/showfavorites.php:84 actions/twitapifavorites.php:85
 #: actions/showfavorites.php:202 actions/twitapifavorites.php:59
 msgid "Could not retrieve favorite notices."
-msgstr "Не удаётся восстановить любимые заметки."
+msgstr "Не удаётся восстановить любимые записи."
 
 #: actions/showmessage.php:33 actions/showmessage.php:81
 msgid "No such message."
@@ -3129,13 +3102,13 @@ msgstr "%s / Любимое от %s"
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
 #, php-format
 msgid "%s updates favorited by %s / %s."
-msgstr "%s обновлённые любимые заметки от %s / %s."
+msgstr "%s обновлённые любимые записи от %s / %s."
 
 #: actions/twitapifavorites.php:187 lib/mail.php:275
 #: actions/twitapifavorites.php:164 lib/mail.php:553
 #, php-format
 msgid "%s added your notice as a favorite"
-msgstr "%s добавил Вашу заметку в состав своих любимых"
+msgstr "%s добавил вашу запись в состав своих любимых"
 
 #: actions/twitapifavorites.php:188 lib/mail.php:276
 #: actions/twitapifavorites.php:165
@@ -3144,15 +3117,15 @@ msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
 "\n"
 msgstr ""
-"%1$s добавил Вашу заметку от %2$s в состав своих любимых.\n"
+"%1$s добавил вашу запись от %2$s в состав своих любимых.\n"
 "\n"
 
 #: actions/twittersettings.php:27
 msgid ""
 "Add your Twitter account to automatically send your notices to Twitter, "
 msgstr ""
-"Добавьте Ваш счёт на Твиттере для автоматической отправки Ваших заметок на "
-"Твиттер,"
+"Добавьте ваш аккаунт на Твиттере для автоматической отправки ваших записей "
+"на Твиттер,"
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
 msgid "Twitter settings"
@@ -3160,11 +3133,11 @@ msgstr "Установки Твиттера"
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
 msgid "Twitter Account"
-msgstr "Счёт на Твиттере"
+msgstr "Твиттер аккаунт"
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
 msgid "Current verified Twitter account."
-msgstr "Текущий проверенный счёт на Твиттере."
+msgstr "Текущий проверенный аккаунт на Твиттере."
 
 #: actions/twittersettings.php:63
 msgid "Twitter Username"
@@ -3180,7 +3153,7 @@ msgstr "Пароль на Твиттере"
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
 msgid "Automatically send my notices to Twitter."
-msgstr "Автоматически отправлять мои заметки на Твиттер."
+msgstr "Автоматически отправлять мои записи на Твиттер."
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
 msgid "Send local \"@\" replies to Twitter."
@@ -3205,7 +3178,7 @@ msgstr "Не удаётся подтвердить Ваши данные по Т
 #: actions/twittersettings.php:137
 #, php-format
 msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr "Не удаётся подтвердить данные по счёту от \"%s\" из Твитера."
+msgstr "Не удаётся подтвердить данные по аккаунту \"%s\" из Твитера."
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
@@ -3218,7 +3191,7 @@ msgstr "Установки Твиттера сохранены."
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
 msgid "That is not your Twitter account."
-msgstr "Это не Ваш счёт Твиттера."
+msgstr "Это не ваш аккаунт на Твиттере."
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
 #: actions/twittersettings.php:403
@@ -3227,7 +3200,7 @@ msgstr "Не удаётся удалить Твиттер-пользовател
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
 msgid "Twitter account removed."
-msgstr "Твиттер-счёт удалён."
+msgstr "Твиттер аккаунт удалён."
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
 #: actions/twittersettings.php:428 actions/twittersettings.php:439
@@ -3275,11 +3248,11 @@ msgstr "Подписки: %1$s\n"
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
 #: classes/Command.php:276
 msgid "User has no last notice"
-msgstr "У пользователя нет заметок"
+msgstr "У пользователя нет записей"
 
 #: classes/Command.php:146 classes/Command.php:166
 msgid "Notice marked as fave."
-msgstr "Заметка помечена как любимая."
+msgstr "Запись помечена как любимая."
 
 #: classes/Command.php:166 classes/Command.php:189
 #, php-format
@@ -3294,7 +3267,7 @@ msgstr "Полное имя: %s"
 #: classes/Command.php:172 classes/Command.php:195
 #, php-format
 msgid "Location: %s"
-msgstr "Место жительства: %s"
+msgstr "Месторасположение: %s"
 
 #: classes/Command.php:175 classes/Command.php:198
 #, php-format
@@ -3413,7 +3386,7 @@ msgstr "Любимое"
 #: lib/personal.php:66 lib/personalgroupnav.php:114
 #, php-format
 msgid "%s's favorite notices"
-msgstr "%s's любимые заметки"
+msgstr "Любимые записи %s"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
 msgid "User"
@@ -3452,34 +3425,32 @@ msgid "Could not parse message."
 msgstr "Сообщение не удаётся разобрать."
 
 #: actions/all.php:63 actions/facebookhome.php:162
-#, fuzzy, php-format
+#, php-format
 msgid "%s and friends, page %d"
-msgstr "%s и друзья"
+msgstr "%s и друзья, страница %d"
 
 #: actions/avatarsettings.php:76
-#, fuzzy
 msgid "You can upload your personal avatar."
-msgstr "Вы можете обновить здесь Вашу личную профильную информацию"
+msgstr "Тут вы можете загрузить свой аватар."
 
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
 #: actions/grouplogo.php:250
-#, fuzzy
 msgid "Avatar settings"
-msgstr "Установки Твиттера"
+msgstr "Настройки аватара"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
 msgid "Original"
-msgstr ""
+msgstr "Оригинал"
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
 msgid "Preview"
-msgstr ""
+msgstr "Просмотр"
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
 msgid "Crop"
-msgstr ""
+msgstr "Обрезать"
 
 #: actions/avatarsettings.php:248 actions/deletenotice.php:133
 #: actions/emailsettings.php:224 actions/grouplogo.php:307
@@ -3490,30 +3461,27 @@ msgstr ""
 #: actions/remotesubscribe.php:53 actions/smssettings.php:216
 #: actions/subedit.php:38 actions/twittersettings.php:290
 #: actions/userauthorization.php:39
-#, fuzzy
 msgid "There was a problem with your session token. "
 msgstr "Проблема с Вашей сессией. Попробуйте ещё раз, пожалуйста."
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
 msgid "Pick a square area of the image to be your avatar"
-msgstr ""
+msgstr "Подберите нужный квадратный ракурс дла вашего аватара"
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
 msgid "Lost our file data."
-msgstr ""
+msgstr "Потеряна информация о файле."
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
 #: classes/User_group.php:112
-#, fuzzy
 msgid "Lost our file."
-msgstr "Неудача при блокировке пользователя."
+msgstr "Потерян файл."
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
 #: classes/User_group.php:129 classes/User_group.php:161
-#, fuzzy
 msgid "Unknown file type"
-msgstr "неподдерживаемый тип файла"
+msgstr "Неподдерживаемый тип файла"
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
 msgid "No profile specified."
@@ -3541,15 +3509,14 @@ msgid "Failed to save block information."
 msgstr "Не удаётся сохранить информацию о блокировании."
 
 #: actions/confirmaddress.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "The address \"%s\" has been "
-msgstr "Адрес удалён."
+msgstr "Адрес %s был успешно подтверждён для вашего аккаунта."
 
 #: actions/deletenotice.php:73
-#, fuzzy
 msgid "You are about to permanently delete a notice. "
 msgstr ""
-"Вы окончательно удаляете заметку. После того, как это будет сделано, "
+"Вы окончательно удаляете запись. После того, как это будет сделано, "
 "восстановление будет невозможно."
 
 #: actions/disfavor.php:94
@@ -3559,7 +3526,7 @@ msgstr "Добавить в любимые"
 #: actions/editgroup.php:54
 #, php-format
 msgid "Edit %s group"
-msgstr ""
+msgstr "Изменить информацию о группе %s"
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
@@ -3567,75 +3534,62 @@ msgid "Inboxes must be enabled for groups to work"
 msgstr "Входящие должны быть включены для работы групп"
 
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
-#, fuzzy
 msgid "You must be logged in to create a group."
-msgstr ""
-"Вы должны авторизоваться, чтобы приглашать других пользователей следовать за "
-"%s"
+msgstr "Вы должны авторизоваться, чтобы создать новую группу."
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
 #: actions/showgroup.php:121
-#, fuzzy
 msgid "No nickname"
-msgstr "Нет имени."
+msgstr "Нет названия группы"
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
 #: actions/showgroup.php:128
-#, fuzzy
 msgid "No such group"
-msgstr "Нет такого пользователя"
+msgstr "Нет такой группы"
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
 #: actions/grouplogo.php:107
-#, fuzzy
 msgid "You must be an admin to edit the group"
-msgstr ""
-"Вы должны авторизоваться, чтобы приглашать других пользователей следовать за "
-"%s"
+msgstr "Вы должны быть администратором, чтобы изменять информацию о группе"
 
 #: actions/editgroup.php:157
 msgid "Use this form to edit the group."
-msgstr ""
+msgstr "Заполните информацию о группе в следующие поля"
 
 #: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
-#, fuzzy
 msgid "Nickname must have only lowercase letters "
 msgstr ""
-"Имя должно состоять только из прописных букв и цифр и не иметь пробелов."
+"Имя должно состоять только из прописных латинских букв и цифр и не иметь "
+"пробелов"
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
-#, fuzzy
 msgid "description is too long (max 140 chars)."
-msgstr "Слишком длинная биография (не более 140 символов)."
+msgstr "Слишком длинное описание (максимум 140 символов)"
 
 #: actions/editgroup.php:218
-#, fuzzy
 msgid "Could not update group."
-msgstr "Не удаётся обновить пользователя."
+msgstr "Не удаётся обновить информацию о группе"
 
 #: actions/editgroup.php:226
-#, fuzzy
 msgid "Options saved."
-msgstr "Настройки сохранены."
+msgstr "Настройки сохранены"
 
 #: actions/emailsettings.php:107 actions/imsettings.php:108
-#, fuzzy, php-format
+#, php-format
 msgid "Awaiting confirmation on this address. "
-msgstr "В ожидании подтверждения данного номера телефона."
+msgstr "В ожидании подтверждения данного адреса."
 
 #: actions/emailsettings.php:139 actions/smssettings.php:150
-#, fuzzy
 msgid "Make a new email address for posting to; "
 msgstr "Новый электронный адрес для постинга %s"
 
 #: actions/emailsettings.php:157
-#, fuzzy
 msgid "Send me email when someone "
 msgstr ""
-"Посылать мне сообщение по электронной почте, если кто-нибудь пошлёт мне "
-"приватное сообщение."
+"Посылать мне сообщение по электронной почте, если кто-нибудь добавит мою "
+"запись в число любимых."
 
 #: actions/emailsettings.php:168
 msgid "Allow friends to nudge me and send me an email."
@@ -3643,145 +3597,137 @@ msgstr ""
 "Разрешить друзьям \"подталкивать\" меня и посылать мне электронные сообщения."
 
 #: actions/emailsettings.php:321
-#, fuzzy
 msgid "That email address already belongs "
-msgstr "Этот электронный адрес уже задействован другим пользователем."
+msgstr "Этот электронный адрес уже используется другим пользователем."
 
 #: actions/emailsettings.php:343
-#, fuzzy
 msgid "A confirmation code was sent to the email address you added. "
 msgstr ""
-"Код подтверждения выслан на Ваш IM-адрес, который Вы добавили. Вы должны "
-"подтвердить %s для рассылки сообщений Вам."
+"Код подтверждения выслан на ваш электронный адрес, который Вы добавили. "
+"Проверьте входящие (а так же папку для спама)."
 
 #: actions/facebookhome.php:110
 msgid "Server error - couldn't get user!"
-msgstr ""
+msgstr "Ошибка сервера - невозможно достать пользователя!"
 
 #: actions/facebookhome.php:196
 #, php-format
 msgid "If you would like the %s app to automatically update "
 msgstr ""
+"Если вы хотите чтобы приложение %s автоматически обновляло ваш Facebook "
+"статус вашими последними записями, вы должны дать своё разрешение на это."
 
 #: actions/facebookhome.php:213 actions/facebooksettings.php:137
 #, php-format
 msgid "Allow %s to update my Facebook status"
-msgstr ""
+msgstr "Разрешить %s обновлять мой Facebook статус"
 
 #: actions/facebookhome.php:218
 msgid "Skip"
-msgstr ""
+msgstr "Пропустить"
 
 #: actions/facebookhome.php:235
-#, fuzzy
 msgid "No notice content!"
-msgstr "Нет контента!"
+msgstr "Нет записей!"
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
 msgid "Pagination"
-msgstr ""
+msgstr "Пагинация"
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-#, fuzzy
 msgid "After"
-msgstr "« Ранее"
+msgstr "Сюда"
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
-#, fuzzy
 msgid "Before"
-msgstr "Ранее »"
+msgstr "Туда"
 
 #: actions/facebookinvite.php:70
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
-msgstr ""
+msgstr "Спасибо за приглашения друзьям использовать %s"
 
 #: actions/facebookinvite.php:72
-#, fuzzy
 msgid "Invitations have been sent to the following users:"
-msgstr "Приглашение(я) отослано(ы) следующим адресатам:"
+msgstr "Приглашения отосланы следующим адресатам:"
 
 #: actions/facebookinvite.php:96
-#, fuzzy, php-format
+#, php-format
 msgid "You have been invited to %s"
-msgstr "Вас \"подтолкнул\" пользователь %s"
+msgstr "Вас пригласили на %s"
 
 #: actions/facebookinvite.php:105
-#, fuzzy, php-format
+#, php-format
 msgid "Invite your friends to use %s"
-msgstr "Лента друзей %s"
+msgstr "Пригласите ваших друзей использовать %s"
 
 #: actions/facebookinvite.php:113
 #, php-format
 msgid "Friends already using %s:"
-msgstr ""
+msgstr "Друзья уже использующие %s"
 
 #: actions/facebookinvite.php:130
 #, php-format
 msgid "Send invitations"
-msgstr ""
+msgstr "Отправить приглашения"
 
 #: actions/facebookremove.php:56
 msgid "Couldn't remove Facebook user."
 msgstr "Не удаётся удалить Facebook-пользователя."
 
 #: actions/facebooksettings.php:65
-#, fuzzy
 msgid "There was a problem saving your sync preferences!"
-msgstr "Проблема с Вашей сессией. Попробуйте ещё раз, пожалуйста."
+msgstr "Произошла проблема сохранения настроек синхронизации!"
 
 #: actions/facebooksettings.php:67
-#, fuzzy
 msgid "Sync preferences saved."
-msgstr "Предпочтения сохранены."
+msgstr "Настройки синхронизации сохранены."
 
 #: actions/facebooksettings.php:90
-#, fuzzy
 msgid "Automatically update my Facebook status with my notices."
-msgstr "Автоматически отправлять мои заметки на Твиттер."
+msgstr ""
+"Автоматически обновлять мой Facebook статус моими записями с %%site.name%%."
 
 #: actions/facebooksettings.php:97
-#, fuzzy
 msgid "Send \"@\" replies to Facebook."
-msgstr "Отправлять локальные \"@\"-реплики на Твиттер."
+msgstr "Отправлять \"@\" ответы на Facebook."
 
 #: actions/facebooksettings.php:106
-#, fuzzy
 msgid "Prefix"
-msgstr "Профиль"
+msgstr "Префикс"
 
 #: actions/facebooksettings.php:108
 msgid "A string to prefix notices with."
-msgstr ""
+msgstr "Присоеденять префикс к записям"
 
 #: actions/facebooksettings.php:124
 #, php-format
 msgid "If you would like %s to automatically update "
 msgstr ""
+"Если вы хотите чтобы приложение %s автоматически обновляло ваш Facebook "
+"статус вашими последними записями, вы должны дать своё разрешение на это."
 
 #: actions/facebooksettings.php:147
-#, fuzzy
 msgid "Sync preferences"
-msgstr "Предпочтения"
+msgstr "Настройки синхронизации"
 
 #: actions/favor.php:94 lib/disfavorform.php:140
 msgid "Disfavor favorite"
-msgstr "Любимое, что разлюбил"
+msgstr "Разлюбить"
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
 #: lib/publicgroupnav.php:91
 msgid "Popular notices"
-msgstr "Популярные заметки"
+msgstr "Популярные записи"
 
 #: actions/favorited.php:67
-#, fuzzy, php-format
+#, php-format
 msgid "Popular notices, page %d"
-msgstr "Популярные заметки"
+msgstr "Популярные записи, страница %d"
 
 #: actions/favorited.php:79
-#, fuzzy
 msgid "The most popular notices on the site right now."
-msgstr "Показывать самые популярные теги за последнюю неделю."
+msgstr "Самые популярные записи на %%site.name%% на текущий момент."
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
 #: lib/publicgroupnav.php:87
@@ -3789,54 +3735,54 @@ msgid "Featured users"
 msgstr "Особые пользователи"
 
 #: actions/featured.php:71
-#, fuzzy, php-format
+#, php-format
 msgid "Featured users, page %d"
-msgstr "Особые пользователи"
+msgstr "Особые пользователи, страница %d"
 
 #: actions/featured.php:99
 #, php-format
 msgid "A selection of some of the great users on %s"
 msgstr ""
+"Список наиболее активных, знаменитых и уважаемых пользователей на "
+"%%%%site.name%%%%"
 
 #: actions/finishremotesubscribe.php:188
 msgid "That user has blocked you from subscribing."
-msgstr "Этот пользователь заблокирован Вами от подписки."
+msgstr "Этот пользователь заблокировал вас на его подписку."
 
 #: actions/groupbyid.php:79
 msgid "No ID"
-msgstr ""
+msgstr "Нет ID"
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
 msgid "Group logo"
-msgstr ""
+msgstr "Логотип группы"
 
 #: actions/grouplogo.php:149
 msgid "You can upload a logo image for your group."
-msgstr ""
+msgstr "Тут вы можете загрузить логотип для группы."
 
 #: actions/grouplogo.php:448
-#, fuzzy
 msgid "Logo updated."
-msgstr "Аватар обновлён."
+msgstr "Логотип обновлён."
 
 #: actions/grouplogo.php:450
-#, fuzzy
 msgid "Failed updating logo."
-msgstr "Неудача при обновлении аватара."
+msgstr "Неудача при обновлении логотипа."
 
 #: actions/groupmembers.php:93 lib/groupnav.php:91
 #, php-format
 msgid "%s group members"
-msgstr ""
+msgstr "Участники группы %s"
 
 #: actions/groupmembers.php:96
 #, php-format
 msgid "%s group members, page %d"
-msgstr ""
+msgstr "Участники группы %s, страница %d"
 
 #: actions/groupmembers.php:111
 msgid "A list of the users in this group."
-msgstr ""
+msgstr "Список пользователей, являющихся членами этой группы."
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
 #: lib/subgroupnav.php:96
@@ -3852,98 +3798,96 @@ msgstr "Группы, страница %d"
 #, php-format
 msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr ""
+"%%%%site.name%%%% группы помогут вам найти и общаться с людьми по интересам. "
+"Подробнее о группах [читайте тут](%%doc.groups%%). Попробуйте [поискать "
+"существующие группы](%%%%action.groupsearch%%%%) или [создайте новую "
+"группу](%%%%action.newgroup%%%%)."
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
-#, fuzzy
 msgid "Create a new group"
 msgstr "Создать новую группу"
 
 #: actions/groupsearch.php:57
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
 msgstr ""
-"поиск людей на %%site.name%% по их имени, месту жительства или описанию."
+"Поиск группы на %%site.name%% по названию, месторасположению или описанию."
 
 #: actions/groupsearch.php:63
-#, fuzzy
 msgid "Group search"
-msgstr "Поиск групп"
+msgstr "Поиск группы"
 
 #: actions/imsettings.php:70
-#, fuzzy
 msgid "You can send and receive notices through "
-msgstr "Вы не можете послать сообщение этому пользователю."
+msgstr ""
+"Вы можете отправлять и получать записи через Jabber/GTalk "
+"[онлайн-мессенджер](%%doc.im%%). Настройте ваш IM аккаунт и предпочтения "
+"ниже."
 
 #: actions/imsettings.php:120
 #, php-format
 msgid "Jabber or GTalk address, "
-msgstr "Адрес Jabber или GTalk, "
+msgstr ""
+"Jabber или GTalk - адрес, типа \\\"UserName@example.org\\\". Первым делом "
+"убедитесь, что добавили %s в список Ваших корреспондентов на Вашем "
+"IM-мессенджере или в GTalk."
 
 #: actions/imsettings.php:147
-#, fuzzy
 msgid "Send me replies through Jabber/GTalk "
-msgstr "Посылать мне заметки через Jabber/GTalk."
+msgstr "Посылать мне записи через Jabber/GTalk."
 
 #: actions/imsettings.php:321
-#, fuzzy, php-format
+#, php-format
 msgid "A confirmation code was sent "
-msgstr "Код подтверждения отправлен"
+msgstr ""
+"Код подтверждения выслан на ваш IM-адрес, который вы добавили. Вы должны "
+"подтвердить %s для рассылки сообщений вам."
 
 #: actions/joingroup.php:65
-#, fuzzy
 msgid "You must be logged in to join a group."
 msgstr "Вы должны авторизоваться для вступления в группу."
 
 #: actions/joingroup.php:95
-#, fuzzy
 msgid "You are already a member of that group"
 msgstr "Вы уже являетесь членом этой группы"
 
 #: actions/joingroup.php:128
-#, fuzzy, php-format
+#, php-format
 msgid "Could not join user %s to group %s"
-msgstr ""
-"Не удаётся следовать пользователю, т.к. такого пользователя не существует."
+msgstr "Не удаётся присоеденить пользователя %s к группе %s"
 
 #: actions/joingroup.php:135
-#, fuzzy, php-format
+#, php-format
 msgid "%s joined group %s"
-msgstr "%s / вступил в группу %s"
+msgstr "%s вступил в группу %s"
 
 #: actions/leavegroup.php:60
 msgid "Inboxes must be enabled for groups to work."
 msgstr "Входящие должны быть включены для работы групп."
 
 #: actions/leavegroup.php:65
-#, fuzzy
 msgid "You must be logged in to leave a group."
-msgstr ""
-"Вы должны авторизоваться, чтобы приглашать других пользователей следовать за "
-"%s"
+msgstr "Вы должны авторизоваться, чтобы покинуть группу."
 
 #: actions/leavegroup.php:88
-#, fuzzy
 msgid "No such group."
 msgstr "Нет такой группы."
 
 #: actions/leavegroup.php:95
-#, fuzzy
 msgid "You are not a member of that group."
 msgstr "Вы не являетесь членом этой группы."
 
 #: actions/leavegroup.php:100
-#, fuzzy
 msgid "You may not leave a group while you are its administrator."
 msgstr "Вы не можете покинуть группу, пока являетесь её администратором."
 
 #: actions/leavegroup.php:130
-#, fuzzy
 msgid "Could not find membership record."
 msgstr "Не удаётся найти учетную запись."
 
 #: actions/leavegroup.php:138
-#, fuzzy, php-format
+#, php-format
 msgid "Could not remove user %s to group %s"
 msgstr "Не удаётся удалить пользователя %s из группы %s"
 
@@ -3965,33 +3909,28 @@ msgid "New group"
 msgstr "Новая группа"
 
 #: actions/newgroup.php:115
-#, fuzzy
 msgid "Use this form to create a new group."
 msgstr "Используйте эту форму для создания новой группы."
 
 #: actions/newgroup.php:177
-#, fuzzy
 msgid "Could not create group."
 msgstr "Не удаётся создать группу."
 
 #: actions/newgroup.php:191
-#, fuzzy
 msgid "Could not set group membership."
 msgstr "Не удаётся назначить членство в группе."
 
 #: actions/newmessage.php:119 actions/newnotice.php:132
-#, fuzzy
 msgid "That's too long. "
 msgstr "Это слишком длинно."
 
 #: actions/newmessage.php:134
-#, fuzzy
 msgid "Don't send a message to yourself; "
 msgstr "Вы не можете послать сообщение самому себе."
 
 #: actions/newnotice.php:166
 msgid "Notice posted"
-msgstr "Заметка опубликована"
+msgstr "Запись опубликована"
 
 #: actions/newnotice.php:200 classes/Channel.php:163
 msgid "Ajax Error"
@@ -4013,12 +3952,10 @@ msgid "Nudge sent!"
 msgstr "\"Подталкивание\" отправлено!"
 
 #: actions/openidlogin.php:97
-#, fuzzy
 msgid "OpenID login"
-msgstr "Авторизация OpenID"
+msgstr "OpenID вход"
 
 #: actions/openidsettings.php:128
-#, fuzzy
 msgid "Removing your only OpenID "
 msgstr "Убрать OpenID"
 
@@ -4032,7 +3969,7 @@ msgstr "Управление другими опциями."
 
 #: actions/othersettings.php:93
 msgid "URL Auto-shortening"
-msgstr "URL, автоматически укороченный"
+msgstr "Автоматическое укорочение длинных URL"
 
 #: actions/othersettings.php:112
 msgid "Service"
@@ -4040,19 +3977,17 @@ msgstr "Сервис"
 
 #: actions/othersettings.php:113
 msgid "Automatic shortening service to use."
-msgstr "Автоматически использовать сокращение адресов."
+msgstr "Автоматически использовать выбранный сервис"
 
 #: actions/othersettings.php:144
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "Сервис сокращения URL слишком длинный (максимум 50 символов)."
 
 #: actions/passwordsettings.php:69
-#, fuzzy
 msgid "Change your password."
-msgstr "Изменить Ваш пароль"
+msgstr "Изменить ваш пароль"
 
 #: actions/passwordsettings.php:89
-#, fuzzy
 msgid "Password change"
 msgstr "Пароль сохранён."
 
@@ -4072,9 +4007,8 @@ msgid "These are users who have tagged themselves \"%s\" "
 msgstr "Есть пользователи, которые пометили себя как \"%s\""
 
 #: actions/profilesettings.php:91
-#, fuzzy
 msgid "Profile information"
-msgstr "Неизвестный профиль"
+msgstr "Информация профиля"
 
 #: actions/profilesettings.php:124
 msgid ""
@@ -4084,11 +4018,8 @@ msgstr ""
 "пробелом"
 
 #: actions/profilesettings.php:144
-#, fuzzy
 msgid "Automatically subscribe to whoever "
-msgstr ""
-"Автоматически подписываться на всех, кто подписался на меня (самое "
-"подходящее для ботов)"
+msgstr "Автоматически подписываться на всех, кто подписался на меня"
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
 #, php-format
@@ -4100,9 +4031,9 @@ msgid "Couldn't save tags."
 msgstr "Не удаётся сохранить теги."
 
 #: actions/public.php:107
-#, fuzzy, php-format
+#, php-format
 msgid "Public timeline, page %d"
-msgstr "Публичная хронология"
+msgstr "Общая лента, страница %d"
 
 #: actions/public.php:173
 msgid "Could not retrieve public stream."
@@ -4118,145 +4049,152 @@ msgstr ""
 "Micro-blogging)"
 
 #: actions/publictagcloud.php:57
-#, fuzzy
 msgid "Public tag cloud"
-msgstr "Лента публичного потока"
+msgstr "Общее облако тэгов"
 
 #: actions/publictagcloud.php:63
 #, php-format
 msgid "These are most popular recent tags on %s "
-msgstr ""
+msgstr "Самые популярные тэги на %s на текущий момент"
 
 #: actions/publictagcloud.php:119
 msgid "Tag cloud"
-msgstr ""
+msgstr "Облако тэгов"
 
 #: actions/register.php:139 actions/register.php:349
 msgid "Sorry, only invited people can register."
 msgstr "Простите, регистрация только по приглашению."
 
 #: actions/register.php:149
-#, fuzzy
 msgid "You can't register if you don't "
 msgstr ""
-"Вы не можете зарегистрироваться, если Вы не подтверждаете лицензионного "
-"соглашения."
+"Вы не можете зарегистрироваться, если вы не согласны лицензионным "
+"соглашением."
 
 #: actions/register.php:286
-#, fuzzy
 msgid "With this form you can create "
-msgstr "При помощи этой формы Вы можете создать новый счёт."
+msgstr ""
+"При помощи этой формы вы можете создать новый %%site.name%% аккаунт. (Есть "
+"[OpenID](http://openid.net/) аккаунт? Тогда используй [OpenID "
+"регистрацию](%%action.openidlogin%%)!)"
 
 #: actions/register.php:368
-#, fuzzy
 msgid "1-64 lowercase letters or numbers, "
-msgstr "1-64 латинских строчных букв или цифр, без пробелов"
+msgstr ""
+"Разрешено от 1 до 64 латинских строчных букв или цифр, без пробелов и знаков "
+"пунктуации."
 
 #: actions/register.php:382 actions/register.php:386
-#, fuzzy
 msgid "Used only for updates, announcements, "
-msgstr "Нужна только для обновлений, осведомлений и восстановления пароля."
+msgstr ""
+"Используется только для обновлений, осведомлений и восстановления пароля."
 
 #: actions/register.php:398
-#, fuzzy
 msgid "URL of your homepage, blog, "
-msgstr "Адрес твоей страницы, дневника или профиля на другом портале"
+msgstr "Адрес твоей страницы, дневника или профиля на другом портале."
 
 #: actions/register.php:404
-#, fuzzy
 msgid "Describe yourself and your "
-msgstr "Опиши себя и свои увлечения при помощи 140 символов"
+msgstr "Опиши себя и свои интересы при помощи 140 символов."
 
 #: actions/register.php:410
-#, fuzzy
 msgid "Where you are, like \"City, "
-msgstr "Где Вы находитесь, например «Город, штат (или область), страна»"
+msgstr "Где вы находитесь, например «Город, область, страна»."
 
 #: actions/register.php:432
-#, fuzzy
 msgid " except this private data: password, "
 msgstr ""
-", за исключением моих частных данных: пароля, почты, мессенджера, телефона."
+", за исключением моей приватной информации: пароля, почты, мессенджера, "
+"телефона."
 
 #: actions/register.php:471
-#, fuzzy, php-format
+#, php-format
 msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
 msgstr ""
-"Поздравляем, %s! И добро пожаловать на %%%%site.name%%%%. Здесь Вы можете ..."
+"Наши поздравления, %s! И добро пожаловать на %%%%site.name%%%%. Здесь вы "
+"можете ...\n"
+"\n"
+"* Перейти на [ваш микроблог](%s) и запостить вашу первую запись.\n"
+"* Добавить ваш [Jabber/GTalk - аккаунт](%%%%action.imsettings%%%%) так что "
+"вы сможете после этого отправлять записи через мессенджеры.\n"
+"* [Искать людей](%%%%action.peoplesearch%%%%), которых вы возможно знаете "
+"или с которыми разделяете одни и те же интересы.\n"
+"* Обновить ваши [профильные настройки](%%%%action.profilesettings%%%%) чтобы "
+"больше рассказать другим о себе.\n"
+"* Прочитать [документацию](%%%%doc.help%%%%) чтобы поподробнее узнать об "
+"особенностях данного вэб сервиса и о том как его использовать.\n"
+"Спасибо за то, что присоединились к нам и надеемся, что вы получите "
+"удовольствие от использования данного сервиса!"
 
 #: actions/register.php:495
-#, fuzzy
 msgid "(You should receive a message by email "
-msgstr "(Вы получили электронное сообщение, от "
+msgstr ""
+"(Вам сразу же послано сообщение по электронной почте, с инструкциями по "
+"тому, как подтвердить свой электронный адрес.)"
 
 #: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
 msgid "That's a local profile! Login to subscribe."
 msgstr "Это локальный профиль! Авторизуйтесь для подписки."
 
 #: actions/replies.php:118
-#, fuzzy, php-format
+#, php-format
 msgid "Replies to %s, page %d"
-msgstr "Ответы для %s"
+msgstr "Ответы для %s, страница %d"
 
 #: actions/showfavorites.php:79
-#, fuzzy, php-format
+#, php-format
 msgid "%s favorite notices, page %d"
-msgstr "%s любимые заметки"
+msgstr "Любимые записи %s, страница %d"
 
 #: actions/showgroup.php:77 lib/groupnav.php:85
 #, php-format
 msgid "%s group"
-msgstr ""
+msgstr "Группа %s"
 
 #: actions/showgroup.php:79
 #, php-format
 msgid "%s group, page %d"
-msgstr ""
+msgstr "Группа %s, страница %d"
 
 #: actions/showgroup.php:206
-#, fuzzy
 msgid "Group profile"
-msgstr "Нет такого профиля."
+msgstr "Профиль группы"
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
-#, fuzzy
 msgid "Note"
-msgstr "Заметки"
+msgstr "Запись"
 
 #: actions/showgroup.php:270
-#, fuzzy
 msgid "Group actions"
-msgstr "Другие опции"
+msgstr "Действия группы"
 
 #: actions/showgroup.php:323
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group"
-msgstr "Лента заметок для %s"
+msgstr "Лента записей от группы %s"
 
 #: actions/showgroup.php:357 lib/groupnav.php:90
-#, fuzzy
 msgid "Members"
-msgstr "Регистрация"
+msgstr "Участники"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
 #: lib/tagcloudsection.php:71
-#, fuzzy
 msgid "(None)"
-msgstr "(none)"
+msgstr "(пока ничего нет)"
 
 #: actions/showgroup.php:370
 msgid "All members"
-msgstr ""
+msgstr "Все участники"
 
 #: actions/showgroup.php:378
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
@@ -4265,79 +4203,73 @@ msgstr ""
 "Micro-blogging)"
 
 #: actions/showmessage.php:98
-#, fuzzy
 msgid "Only the sender and recipient "
 msgstr "Только отправитель и получатель могут читать это сообщение."
 
 #: actions/showstream.php:73
-#, fuzzy, php-format
+#, php-format
 msgid "%s, page %d"
 msgstr "Входящие для %s - страница %d"
 
 #: actions/showstream.php:143
-#, fuzzy
 msgid "'s profile"
 msgstr "Профиль"
 
 #: actions/showstream.php:236 actions/tagother.php:77
-#, fuzzy
 msgid "User profile"
-msgstr "У пользователя нет профиля."
+msgstr "Профиль пользователя"
 
 #: actions/showstream.php:240 actions/tagother.php:81
 msgid "Photo"
-msgstr ""
+msgstr "Фото"
 
 #: actions/showstream.php:317
-#, fuzzy
 msgid "User actions"
-msgstr "Другие опции"
+msgstr "Действия пользователя"
 
 #: actions/showstream.php:342
-#, fuzzy
 msgid "Send a direct message to this user"
-msgstr "Вы не можете послать сообщение этому пользователю."
+msgstr "Послать приватное сообщение этому пользователю."
 
 #: actions/showstream.php:343
-#, fuzzy
 msgid "Message"
-msgstr "Новое сообщение"
+msgstr "Сообщение"
 
 #: actions/showstream.php:451
-#, fuzzy
 msgid "All subscribers"
-msgstr "Подписчики"
+msgstr "Все подписчики"
 
 #: actions/showstream.php:533
 msgid "All groups"
-msgstr ""
+msgstr "Все группы"
 
 #: actions/showstream.php:542
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
-"Это сайт %%site.name%%, для [микроблогинга](http://en.wikipedia.org/wiki/"
-"Micro-blogging)"
+"**%s** имеет аккаунт на %%%%site.name%%%%, сервисе для "
+"[микроблогинга](http://en.wikipedia.org/wiki/Micro-blogging). "
+"[Присоеденяйся](%%%%action.register%%%%) и получи возможность быть всегда в "
+"курсе всего самого интересного в жизни **%s**. ([Читать "
+"больше](%%%%doc.help%%%%))"
 
 #: actions/smssettings.php:128
-#, fuzzy
 msgid "Phone number, no punctuation or spaces, "
 msgstr "Номер телефона, без пробелов, с кодом зоны"
 
 #: actions/smssettings.php:162
-#, fuzzy
 msgid "Send me notices through SMS; "
-msgstr "Посылать мне заметки через Jabber/GTalk."
+msgstr ""
+"Посылать мне записи через СМС; я понимаю, что это может привести к расходам "
+"по пересылке."
 
 #: actions/smssettings.php:335
-#, fuzzy
 msgid "A confirmation code was sent to the phone number you added. "
 msgstr "В ожидании подтверждения данного номера телефона."
 
 #: actions/smssettings.php:453
-#, fuzzy
 msgid "Mobile carrier"
 msgstr "Выбор провайдера"
 
@@ -4358,58 +4290,56 @@ msgid "Subscribed"
 msgstr "Подписано"
 
 #: actions/subscribers.php:50
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscribers"
-msgstr "Подписчики"
+msgstr "%s подписчики"
 
 #: actions/subscribers.php:52
 #, php-format
 msgid "%s subscribers, page %d"
-msgstr ""
+msgstr "%s подписчики, страница %d"
 
 #: actions/subscribers.php:63
-#, fuzzy
 msgid "These are the people who listen to "
-msgstr "Это пользователи, которые читают заметки %s."
+msgstr "Это пользователи, которые читают записи %s."
 
 #: actions/subscribers.php:67
-#, fuzzy, php-format
+#, php-format
 msgid "These are the people who "
-msgstr "Это пользователи, которые читают заметки %s."
+msgstr "Это пользователи, которые читают записи %s."
 
 #: actions/subscriptions.php:52
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscriptions"
-msgstr "Все подписки."
+msgstr "Подписки %s"
 
 #: actions/subscriptions.php:54
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscriptions, page %d"
-msgstr "Все подписки."
+msgstr "Подписки %s, страница %d"
 
 #: actions/subscriptions.php:65
-#, fuzzy
 msgid "These are the people whose notices "
-msgstr "Это пользователи, заметки которых читает %s."
+msgstr "Это пользователи, записи которых читает %s."
 
 #: actions/subscriptions.php:69
-#, fuzzy, php-format
+#, php-format
 msgid "These are the people whose "
-msgstr "Это пользователи, которые читают заметки %s."
+msgstr "Это пользователи, которые читают записи %s."
 
 #: actions/subscriptions.php:122
 msgid "Jabber"
 msgstr "Jabber"
 
 #: actions/tag.php:43
-#, fuzzy, php-format
+#, php-format
 msgid "Notices tagged with %s, page %d"
-msgstr "Заметки, помеченные %s"
+msgstr "Записи, помеченные %s, страница %d"
 
 #: actions/tag.php:66
 #, php-format
 msgid "Messages tagged \"%s\", most recent first"
-msgstr ""
+msgstr "Записи, помеченные \"%s\", в хронологическом порядке"
 
 #: actions/tagother.php:33
 msgid "Not logged in"
@@ -4420,14 +4350,13 @@ msgid "No id argument."
 msgstr "Нет ID аргумента."
 
 #: actions/tagother.php:65
-#, fuzzy, php-format
+#, php-format
 msgid "Tag %s"
-msgstr "Теги"
+msgstr "Тэги %s"
 
 #: actions/tagother.php:141
-#, fuzzy
 msgid "Tag user"
-msgstr "Теги"
+msgstr "Тэги для пользователя"
 
 #: actions/tagother.php:149
 msgid ""
@@ -4438,7 +4367,6 @@ msgstr ""
 "или пробелом"
 
 #: actions/tagother.php:164
-#, fuzzy
 msgid "There was a problem with your session token."
 msgstr "Проблема с Вашей сессией. Попробуйте ещё раз, пожалуйста."
 
@@ -4480,11 +4408,10 @@ msgid "Not found."
 msgstr "Не найдено."
 
 #: actions/twittersettings.php:71
-#, fuzzy
 msgid "Add your Twitter account to automatically send "
 msgstr ""
-"Добавьте Ваш счёт на Твиттере для автоматической отправки Ваших заметок на "
-"Твиттер,"
+"Добавьте ваш аккаунт на Твиттере для автоматической отправки ваших записей "
+"на Твиттер, и подпишитесь на друзей с Твиттера, которые уже здесь."
 
 #: actions/twittersettings.php:119
 msgid "Twitter user name"
@@ -4501,11 +4428,13 @@ msgstr "Твиттер-друзья"
 #: actions/twittersettings.php:327
 msgid "Username must have only numbers, "
 msgstr ""
+"Имя пользователя должно состоят только из цифр, прописных или строчных букв "
+"и символа подчеркивания (_). Всего не более 15 символов."
 
 #: actions/twittersettings.php:341
-#, fuzzy, php-format
+#, php-format
 msgid "Unable to retrieve account information "
-msgstr "Не удаётся подтвердить данные по счёту от \"%s\" из Твитера."
+msgstr "Не удаётся подтвердить данные по аккаунту от \"%s\" из Твитера."
 
 #: actions/unblock.php:108
 msgid "Error removing the block."
@@ -4526,22 +4455,22 @@ msgstr "Отписано"
 #: actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
-msgstr ""
+msgstr "Группы %s"
 
 #: actions/usergroups.php:65
 #, php-format
 msgid "%s groups, page %d"
-msgstr ""
+msgstr "Группы %s, страница %d"
 
 #: classes/Notice.php:104
 msgid "Problem saving notice. Unknown user."
-msgstr "Проблема при сохранении заметки. Неизвестный пользователь."
+msgstr "Проблема при сохранении записи. Неизвестный пользователь."
 
 #: classes/Notice.php:109
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
-"Слишком много заметок за столь короткий срок; немного передохните и "
+"Слишком много записей за столь короткий срок; передохните немного и "
 "попробуйте вновь через пару минут."
 
 #: classes/Notice.php:116
@@ -4549,9 +4478,8 @@ msgid "You are banned from posting notices on this site."
 msgstr "Вам запрещено поститься на этом сайте (бан)"
 
 #: lib/accountsettingsaction.php:108
-#, fuzzy
 msgid "Upload an avatar"
-msgstr "Неудача при обновлении аватара."
+msgstr "Загрузить аватар"
 
 #: lib/accountsettingsaction.php:119
 msgid "Other"
@@ -4562,35 +4490,33 @@ msgid "Other options"
 msgstr "Другие опции"
 
 #: lib/action.php:130
-#, fuzzy, php-format
+#, php-format
 msgid "%s - %s"
 msgstr "%s (%s)"
 
 #: lib/action.php:145
 msgid "Untitled page"
-msgstr ""
+msgstr "Страница без названия"
 
 #: lib/action.php:316
 msgid "Primary site navigation"
-msgstr ""
+msgstr "Главная навигация"
 
 #: lib/action.php:322
 msgid "Personal profile and friends timeline"
-msgstr ""
+msgstr "Личный профиль и лента друзей"
 
 #: lib/action.php:325
 msgid "Search for people or text"
 msgstr "Искать людей или текст"
 
 #: lib/action.php:328
-#, fuzzy
 msgid "Account"
-msgstr "Аккаунт"
+msgstr "Настройки"
 
 #: lib/action.php:328
-#, fuzzy
 msgid "Change your email, avatar, password, profile"
-msgstr "Изменить Ваш email, аватару, пароль, профиль"
+msgstr "Изменить ваш email, аватар, пароль, профиль и др."
 
 #: lib/action.php:330
 msgid "Connect to IM, SMS, Twitter"
@@ -4605,45 +4531,38 @@ msgid "Login to the site"
 msgstr "Войти"
 
 #: lib/action.php:338
-#, fuzzy
 msgid "Create an account"
-msgstr "Создать новую учетную запись"
+msgstr "Создать новый аккаунт"
 
 #: lib/action.php:341
-#, fuzzy
 msgid "Login with OpenID"
 msgstr "Войти с OpenID"
 
 #: lib/action.php:344
-#, fuzzy
 msgid "Help me!"
 msgstr "Помощь"
 
 #: lib/action.php:362
-#, fuzzy
 msgid "Site notice"
-msgstr "Новая заметка"
+msgstr "Новая запись"
 
 #: lib/action.php:417
 msgid "Local views"
-msgstr ""
+msgstr "Локальные виды"
 
 #: lib/action.php:472
-#, fuzzy
 msgid "Page notice"
-msgstr "Новая заметка"
+msgstr "Новая запись"
 
 #: lib/action.php:562
-#, fuzzy
 msgid "Secondary site navigation"
 msgstr "Навигация по подпискам"
 
 #: lib/action.php:602 lib/action.php:623
 msgid "Laconica software license"
-msgstr ""
+msgstr "Laconica лицензия"
 
 #: lib/action.php:630
-#, fuzzy
 msgid "All "
 msgstr "Все"
 
@@ -4652,7 +4571,6 @@ msgid "license."
 msgstr "лицензия."
 
 #: lib/blockform.php:123 lib/blockform.php:153
-#, fuzzy
 msgid "Block this user"
 msgstr "Заблокировать пользователя."
 
@@ -4661,37 +4579,33 @@ msgid "Block"
 msgstr "Блокировать"
 
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
-#, fuzzy
 msgid "Disfavor this notice"
-msgstr "%s любимые заметки"
+msgstr "Мне не нравиться эта запись"
 
 #: lib/facebookaction.php:268
 #, php-format
 msgid "To use the %s Facebook Application you need to login "
-msgstr ""
+msgstr "Вы должны авторизоваться чтобы использовать %s приложение"
 
 #: lib/facebookaction.php:271
-#, fuzzy
 msgid " a new account."
 msgstr "Создать новую учетную запись"
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-#, fuzzy
 msgid "Published"
-msgstr "Публичное"
+msgstr "Общее"
 
 #: lib/favorform.php:114 lib/favorform.php:140
-#, fuzzy
 msgid "Favor this notice"
-msgstr "%s любимые заметки"
+msgstr "Мне нравиться эта запись"
 
 #: lib/feedlist.php:64
 msgid "Export data"
-msgstr "Экспорт данных"
+msgstr "Экспорт потока записей"
 
 #: lib/galleryaction.php:121
 msgid "Filter tags"
-msgstr "Теги фильтра"
+msgstr "Фильтровать тэги"
 
 #: lib/galleryaction.php:131
 msgid "All"
@@ -4699,59 +4613,54 @@ msgstr "Все"
 
 #: lib/galleryaction.php:137
 msgid "Tag"
-msgstr "Тег"
+msgstr "Тэги"
 
 #: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
-msgstr "Выберите тег из выпадающего списка"
+msgstr "Выберите тэг из выпадающего списка"
 
 #: lib/galleryaction.php:139
 msgid "Go"
 msgstr "Перейти"
 
 #: lib/groupeditform.php:148
-#, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
-msgstr "Адрес твоей страницы, дневника или профиля на другом портале"
+msgstr "Адрес страницы, дневника или профиля группы на другом портале"
 
 #: lib/groupeditform.php:151
-#, fuzzy
 msgid "Description"
 msgstr "Описание"
 
 #: lib/groupeditform.php:153
-#, fuzzy
 msgid "Describe the group or topic in 140 chars"
-msgstr "Опиши себя и свои увлечения при помощи 140 символов"
+msgstr "Опиши группу при помощи 140 символов"
 
 #: lib/groupeditform.php:158
-#, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr "Где Вы находитесь, например «Город, штат (или область), страна»"
+msgstr "Где находится группа, например «Город, область, страна»"
 
 #: lib/groupnav.php:84 lib/searchgroupnav.php:84
 msgid "Group"
-msgstr ""
+msgstr "Группа"
 
 #: lib/groupnav.php:100
 msgid "Admin"
-msgstr ""
+msgstr "Настройки"
 
 #: lib/groupnav.php:101
 #, php-format
 msgid "Edit %s group properties"
-msgstr ""
+msgstr "Редактировать информацию о группе %s"
 
 #: lib/groupnav.php:106
-#, fuzzy
 msgid "Logo"
-msgstr "Выход"
+msgstr "Логотип"
 
 #: lib/groupnav.php:107
 #, php-format
 msgid "Add or edit %s logo"
-msgstr "Добавить или изменить логотип %s"
+msgstr "Добавить или изменить логотип группы %s"
 
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
@@ -4759,37 +4668,32 @@ msgstr "Группы с наибольшим количеством участн
 
 #: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
-msgstr "Группы с наибольшим количеством сообщений"
+msgstr "Группы с наибольшим количеством записей"
 
 #: lib/grouptagcloudsection.php:56
 #, php-format
 msgid "Tags in %s group's notices"
-msgstr ""
+msgstr "Тэги записей группы %s"
 
 #: lib/htmloutputter.php:104
-#, fuzzy
 msgid "This page is not available in a "
 msgstr "Страница недоступна для того типа, который Вы задействовали."
 
 #: lib/joinform.php:114
-#, fuzzy
 msgid "Join"
 msgstr "Авторизация"
 
 #: lib/leaveform.php:114
-#, fuzzy
 msgid "Leave"
 msgstr "Выйти"
 
 #: lib/logingroupnav.php:76
-#, fuzzy
 msgid "Login with a username and password"
-msgstr "Войти с Вашим именем и паролем."
+msgstr "Войти с вашим ником и паролем."
 
 #: lib/logingroupnav.php:79
-#, fuzzy
 msgid "Sign up for a new account"
-msgstr "Создать новую учетную запись"
+msgstr "Создать новый аккаунт"
 
 #: lib/logingroupnav.php:82
 msgid "Login or register with OpenID"
@@ -4805,19 +4709,19 @@ msgstr ""
 "\n"
 
 #: lib/mail.php:236
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s is now listening to "
 msgstr "%1$s теперь просматривает твои записи на %2$s."
 
 #: lib/mail.php:254
-#, fuzzy, php-format
+#, php-format
 msgid "Location: %s\n"
-msgstr "Место жительства: %s"
+msgstr "Месторасположение: %s\n"
 
 #: lib/mail.php:256
-#, fuzzy, php-format
+#, php-format
 msgid "Homepage: %s\n"
-msgstr "Домашняя страница: %s"
+msgstr "Домашняя страница: %s\n"
 
 #: lib/mail.php:258
 #, php-format
@@ -4825,6 +4729,8 @@ msgid ""
 "Bio: %s\n"
 "\n"
 msgstr ""
+"Био: %s\n"
+"\n"
 
 #: lib/mail.php:461
 #, php-format
@@ -4832,137 +4738,123 @@ msgid "You've been nudged by %s"
 msgstr "Вас \"подтолкнул\" пользователь %s"
 
 #: lib/mail.php:465
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s (%2$s) is wondering what you are up to "
 msgstr ""
 "%1$s (%2$s) интересуется чем Вы занимались последнее время и предлагает Вам "
 "запостить парочку новостей."
 
 #: lib/mail.php:555
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s just added your notice from %2$s"
-msgstr "%1$s добавил Вашу заметку от %2$s в состав своих любимых."
+msgstr "%1$s добавил вашу запись от %2$s в состав своих любимых."
 
 #: lib/mailbox.php:229 lib/noticelist.php:380
-#, fuzzy
 msgid "From"
 msgstr " из"
 
 #: lib/messageform.php:110
-#, fuzzy
 msgid "Send a direct notice"
-msgstr "Удалить заметку"
+msgstr "Послать прямую запись"
 
 #: lib/noticeform.php:125
-#, fuzzy
 msgid "Send a notice"
-msgstr "Послать \"подталкивание\""
+msgstr "Послать запись"
 
 #: lib/noticeform.php:152
-#, fuzzy
 msgid "Available characters"
 msgstr "6 или больше знаков"
 
 #: lib/noticelist.php:426
-#, fuzzy
 msgid "in reply to"
-msgstr "в ответ на..."
+msgstr "в ответ на"
 
 #: lib/noticelist.php:447 lib/noticelist.php:450
-#, fuzzy
 msgid "Reply to this notice"
-msgstr "Не удаётся удалить эту заметку."
+msgstr "Ответить на эту запись"
 
 #: lib/noticelist.php:451
-#, fuzzy
 msgid "Reply"
 msgstr "Ответить"
 
 #: lib/noticelist.php:471 lib/noticelist.php:474
-#, fuzzy
 msgid "Delete this notice"
-msgstr "Удалить заметку"
+msgstr "Удалить эту запись"
 
 #: lib/noticelist.php:474
-#, fuzzy
 msgid "Delete"
-msgstr "удалить"
+msgstr "Удалить"
 
 #: lib/nudgeform.php:116
-#, fuzzy
 msgid "Nudge this user"
-msgstr "\"Подталкивание\" послано"
+msgstr "\"Подтолкнуть\" этого пользователя"
 
 #: lib/nudgeform.php:128
-#, fuzzy
 msgid "Nudge"
-msgstr "\"Подталкивание\" послано"
+msgstr "\"Подтолкнуть\""
 
 #: lib/nudgeform.php:128
-#, fuzzy
 msgid "Send a nudge to this user"
-msgstr "Вы не можете послать сообщение этому пользователю."
+msgstr "\"Подтолкнуть\" этого пользователя"
 
 #: lib/personaltagcloudsection.php:56
-#, fuzzy, php-format
+#, php-format
 msgid "Tags in %s's notices"
-msgstr "У пользователя нет заметок"
+msgstr "Тэги записей пользователя %s"
 
 #: lib/profilelist.php:182
 msgid "(none)"
-msgstr "(none)"
+msgstr "(пока ничего нет)"
 
 #: lib/publicgroupnav.php:76
 msgid "Public"
-msgstr "Публичное"
+msgstr "Общее"
 
 #: lib/publicgroupnav.php:80
 msgid "User groups"
-msgstr "Группы пользователя"
+msgstr "Группы"
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
 msgid "Recent tags"
-msgstr "Последние теги"
+msgstr "Облаго тэгов"
 
 #: lib/publicgroupnav.php:86
 msgid "Featured"
-msgstr "Особое"
+msgstr "Особые"
 
 #: lib/publicgroupnav.php:90
 msgid "Popular"
 msgstr "Популярное"
 
 #: lib/searchgroupnav.php:82
-#, fuzzy
 msgid "Notice"
-msgstr "Заметки"
+msgstr "Запись"
 
 #: lib/searchgroupnav.php:85
-#, fuzzy
 msgid "Find groups on this site"
 msgstr "Найти группы на этом сайте"
 
 #: lib/section.php:89
 msgid "Untitled section"
-msgstr ""
+msgstr "Секция без названия"
 
 #: lib/subgroupnav.php:81
-#, fuzzy, php-format
+#, php-format
 msgid "People %s subscribes to"
-msgstr "Удалить подписку"
+msgstr "Люди на которых подписан %s"
 
 #: lib/subgroupnav.php:89
-#, fuzzy, php-format
+#, php-format
 msgid "People subscribed to %s"
-msgstr "Подписано на %s"
+msgstr "Люди подписанные на %s"
 
 #: lib/subgroupnav.php:97
 #, php-format
 msgid "Groups %s is a member of"
-msgstr ""
+msgstr "Группы, в которых состоит %s"
 
 #: lib/subgroupnav.php:104
-#, fuzzy, php-format
+#, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "В этой форме ты можешь пригласить друзей и коллег на этот сервис."
 
@@ -4971,32 +4863,28 @@ msgid "User has blocked you."
 msgstr "Пользователь заблокировал Вас."
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
-#, fuzzy
 msgid "Subscribe to this user"
-msgstr "Подписано на %s"
+msgstr "Подписаться на %s"
 
 #: lib/tagcloudsection.php:56
-#, fuzzy
 msgid "None"
-msgstr "Нет"
+msgstr "Нет тэгов"
 
 #: lib/topposterssection.php:74
 msgid "Top posters"
-msgstr ""
+msgstr "Самые активные"
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
-#, fuzzy
 msgid "Unblock this user"
-msgstr "Заблокировать пользователя."
+msgstr "Разблокировать пользователя."
 
 #: lib/unblockform.php:150
 msgid "Unblock"
 msgstr "Разблокировать"
 
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
-#, fuzzy
 msgid "Unsubscribe from this user"
-msgstr "Отписано от %s"
+msgstr "Отписаться от этого пользователя"
 
 #~ msgid "Code not yet ready."
 #~ msgstr "Код ещё не готов."
diff --git a/locale/sv_SE/LC_MESSAGES/laconica.mo b/locale/sv_SE/LC_MESSAGES/laconica.mo
index 1f77251e3..e2a8fa9cc 100644
--- a/locale/sv_SE/LC_MESSAGES/laconica.mo
+++ b/locale/sv_SE/LC_MESSAGES/laconica.mo
diff --git a/locale/sv_SE/LC_MESSAGES/laconica.po b/locale/sv_SE/LC_MESSAGES/laconica.po
index 4b0467e64..4598be4a2 100644
--- a/locale/sv_SE/LC_MESSAGES/laconica.po
+++ b/locale/sv_SE/LC_MESSAGES/laconica.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-02-03 18:51+0000\n"
-"Last-Translator: Håkan Eriksson <eriksson@utryckning.se>\n"
+"PO-Revision-Date: 2009-03-17 10:54+0000\n"
+"Last-Translator: Per-Olov Jernberg <possan@possan.se>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -158,7 +158,7 @@ msgstr "%s med vänner"
 #: actions/twitapistatuses.php:33
 #, php-format
 msgid "%s public timeline"
-msgstr "%s publik tidslinje"
+msgstr "%s publika tidslinje"
 
 #: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
 #, php-format
@@ -278,7 +278,7 @@ msgstr ""
 #: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
 #: actions/twitapiusers.php:32
 msgid "API method not found!"
-msgstr "API metoden hittades inte!"
+msgstr "API-metoden hittades inte!"
 
 #: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
 #: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
@@ -301,7 +301,7 @@ msgstr "API metoden hittades inte!"
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
 #: actions/twitapistatuses.php:562
 msgid "API method under construction."
-msgstr "API metoden är under uppbyggnad."
+msgstr "API-metoden är under uppbyggnad."
 
 #: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
 msgid "About"
@@ -330,7 +330,7 @@ msgstr "Lägg till OpenID"
 #: ../lib/settingsaction.php:97 lib/settingsaction.php:91
 #: lib/accountsettingsaction.php:117
 msgid "Add or remove OpenIDs"
-msgstr "Lägg till eller tabort OpenIDs"
+msgstr "Lägg till eller ta bort OpenID"
 
 #: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
 #: ../actions/smssettings.php:39 actions/emailsettings.php:39
@@ -450,7 +450,7 @@ msgstr "Biografin är för lång (max 140 tecken)"
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
 msgid "Can't delete this notice."
-msgstr "Kan inte tabort detta inlägg."
+msgstr "Kan inte ta bort detta inlägg."
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #: actions/updateprofile.php:123
@@ -462,7 +462,7 @@ msgstr "Kan inte läsa användarbild URL '%s'"
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 msgid "Can't save new password."
-msgstr "Kan inte spara nya lösenordet."
+msgstr "Kan inte spara det nya lösenordet."
 
 #: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
 #: ../actions/smssettings.php:62 actions/emailsettings.php:58
@@ -508,7 +508,7 @@ msgstr "Ändra ditt lösenord"
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
 #: lib/accountsettingsaction.php:105
 msgid "Change your profile settings"
-msgstr "Ändra dina profil inställningar"
+msgstr "Ändra dina profilinställningar"
 
 #: ../actions/password.php:43 ../actions/recoverpassword.php:181
 #: ../actions/register.php:155 ../actions/smssettings.php:65
@@ -540,7 +540,7 @@ msgstr "Bekräftelsekod"
 #: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 #: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
-msgstr "Verifikation koden finns ej."
+msgstr "Bekräftelsekoden kunde inte hittas."
 
 #: ../actions/register.php:202
 #, php-format
@@ -4794,12 +4794,12 @@ msgstr "%1$s lyssnar nu på dina meddelanden i %2$s."
 #: lib/mail.php:254
 #, fuzzy, php-format
 msgid "Location: %s\n"
-msgstr "Plats: %s"
+msgstr "Plats: %s\n"
 
 #: lib/mail.php:256
 #, fuzzy, php-format
 msgid "Homepage: %s\n"
-msgstr "Hemsida: %s"
+msgstr "Hemsida: %s\n"
 
 #: lib/mail.php:258
 #, php-format
@@ -4821,9 +4821,7 @@ msgstr ""
 #: lib/mail.php:555
 #, fuzzy, php-format
 msgid "%1$s just added your notice from %2$s"
-msgstr ""
-"%1$s la just in ditt inlägg ifrån %2$s som en av deras favorit.\n"
-"\n"
+msgstr "%1$s la just in ditt inlägg ifrån %2$s som en av deras favorit."
 
 #: lib/mailbox.php:229 lib/noticelist.php:380
 #, fuzzy
@@ -4853,7 +4851,7 @@ msgstr "svar till..."
 #: lib/noticelist.php:447 lib/noticelist.php:450
 #, fuzzy
 msgid "Reply to this notice"
-msgstr "Kan inte tabort detta inlägg."
+msgstr "Svara på detta inlägg"
 
 #: lib/noticelist.php:451
 #, fuzzy
@@ -4863,12 +4861,12 @@ msgstr "svar"
 #: lib/noticelist.php:471 lib/noticelist.php:474
 #, fuzzy
 msgid "Delete this notice"
-msgstr "Tabort inlägg"
+msgstr "Ta bort inlägg"
 
 #: lib/noticelist.php:474
 #, fuzzy
 msgid "Delete"
-msgstr "Tabort"
+msgstr "Ta bort"
 
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
diff --git a/locale/te_IN/LC_MESSAGES/laconica.mo b/locale/te_IN/LC_MESSAGES/laconica.mo
index 92e135972..5cfa0c3fb 100644
--- a/locale/te_IN/LC_MESSAGES/laconica.mo
+++ b/locale/te_IN/LC_MESSAGES/laconica.mo
diff --git a/locale/te_IN/LC_MESSAGES/laconica.po b/locale/te_IN/LC_MESSAGES/laconica.po
index bfd0581c1..e8522f971 100644
--- a/locale/te_IN/LC_MESSAGES/laconica.po
+++ b/locale/te_IN/LC_MESSAGES/laconica.po
@@ -10,20 +10,18 @@
 # 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: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2009-04-18 06:18+0000\n"
+"Last-Translator: Veeven <veeven@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"X-Generator: Pootle 1.1.0\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
 #: actions/noticesearchrss.php:88
@@ -41,7 +39,7 @@ msgstr "ఈ అంతరంగిక భోగట్టా తప్ప: సం�
 #: ../actions/showstream.php:400 ../lib/stream.php:109
 #: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
 msgid " from "
-msgstr ""
+msgstr " నుండి "
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
 #: actions/twitapistatuses.php:347
@@ -117,7 +115,7 @@ msgstr ""
 #: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
 #, php-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
 #: actions/publicrss.php:90
@@ -143,13 +141,13 @@ msgstr ""
 #: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
 #, php-format
 msgid "%s status"
-msgstr ""
+msgstr "%s స్థితి"
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
 #: actions/twitapistatuses.php:199
 #, php-format
 msgid "%s timeline"
-msgstr ""
+msgstr "%s కాలరేఖ"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
 #: actions/twitapistatuses.php:36
@@ -345,7 +343,7 @@ msgstr "ఇప్పటికే చేరారు!"
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
 #: actions/deletenotice.php:113
 msgid "Are you sure you want to delete this notice?"
-msgstr ""
+msgstr "మీరు నిజంగానే ఈ నోటీసుని తొలగించాలనుకుంటున్నారా?"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 #: actions/userauthorization.php:81
@@ -412,7 +410,7 @@ msgstr "స్వపరిచయం చాలా పెద్దగా ఉంద
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
 msgid "Can't delete this notice."
-msgstr ""
+msgstr "ఈ నోటీసుని తొలగించలేము."
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #: actions/updateprofile.php:123
@@ -779,10 +777,7 @@ msgstr "వాడుకరిని అనుసంధానించడంల�
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
 #, fuzzy
 msgid "Error inserting avatar"
-msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"అవతారాన్ని పెట్టడంలో పొరపాటు\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+msgstr "అవతారాన్ని పెట్టడంలో పొరపాటు"
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
@@ -848,10 +843,7 @@ msgstr "ప్రస్తుత పేరు"
 #: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
 #, fuzzy
 msgid "FAQ"
-msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"తవసం\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+msgstr "తవసం"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397
@@ -918,10 +910,7 @@ msgstr "సహాయం"
 #: lib/facebookaction.php:200
 #, fuzzy
 msgid "Home"
-msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"వాకిలి\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+msgstr "వాకిలి"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
 #: actions/profilesettings.php:79 actions/register.php:181
@@ -929,10 +918,7 @@ msgstr ""
 #: lib/groupeditform.php:146
 #, fuzzy
 msgid "Homepage"
-msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"హోమ్ పేజీ\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+msgstr "హోమ్ పేజీ"
 
 #: ../actions/profilesettings.php:95 ../actions/register.php:76
 #: actions/profilesettings.php:210 actions/register.php:83
@@ -1198,10 +1184,7 @@ msgstr "సభ్యులైన తేదీ"
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
 #, fuzzy, php-format
 msgid "Microblog by %s"
-msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"%s యొక్క మైక్రోబ్లాగు\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+msgstr "%s యొక్క మైక్రోబ్లాగు"
 
 #: ../actions/smssettings.php:304
 #, php-format
@@ -1354,10 +1337,7 @@ msgstr "దూరపు సర్వర్ పేరుని ఇవ్వలే
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
 #, fuzzy
 msgid "No nickname."
-msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"పేరు లేదు.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+msgstr "పేరు లేదు."
 
 #: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
 #: ../actions/smssettings.php:229 actions/emailsettings.php:240
@@ -1614,10 +1594,7 @@ msgstr "ఓపెన్ఐడీ"
 #: actions/finishopenidlogin.php:73
 #, fuzzy
 msgid "OpenID Account Setup"
-msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"ఓపెన్ఐడీ ఖాతా అమర్పు\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+msgstr "ఓపెన్ఐడీ ఖాతా అమర్పు"
 
 #: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
 msgid "OpenID Auto-Submit"
@@ -3448,10 +3425,7 @@ msgstr ""
 #: actions/showgroup.php:121
 #, fuzzy
 msgid "No nickname"
-msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"పేరు లేదు.\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+msgstr "పేరు లేదు."
 
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
@@ -4230,10 +4204,7 @@ msgstr "Jabber ID లేదు."
 #: actions/tag.php:43
 #, fuzzy, php-format
 msgid "Notices tagged with %s, page %d"
-msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"%s యొక్క మైక్రోబ్లాగు\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+msgstr "%s యొక్క మైక్రోబ్లాగు"
 
 #: actions/tag.php:66
 #, php-format
@@ -4291,10 +4262,7 @@ msgstr "అటువంటి సందేశమేమీ లేదు."
 #: actions/tagrss.php:66
 #, fuzzy, php-format
 msgid "Microblog tagged with %s"
-msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"%s యొక్క మైక్రోబ్లాగు\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+msgstr "%s యొక్క మైక్రోబ్లాగు"
 
 #: actions/twitapiblocks.php:47
 msgid "Block user failed."
@@ -4638,15 +4606,12 @@ msgstr ""
 #: lib/mail.php:254
 #, fuzzy, php-format
 msgid "Location: %s\n"
-msgstr "ప్రాంతం: %s"
+msgstr "ప్రాంతం: %s\n"
 
 #: lib/mail.php:256
 #, fuzzy, php-format
 msgid "Homepage: %s\n"
-msgstr ""
-"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
-"హోమ్ పేజీ\n"
-"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+msgstr "హోమ్ పేజీ\n"
 
 #: lib/mail.php:258
 #, php-format
diff --git a/locale/vi_VN/LC_MESSAGES/laconica.mo b/locale/vi_VN/LC_MESSAGES/laconica.mo
index 314315c5d..b7f5e3c2c 100644
--- a/locale/vi_VN/LC_MESSAGES/laconica.mo
+++ b/locale/vi_VN/LC_MESSAGES/laconica.mo
diff --git a/locale/vi_VN/LC_MESSAGES/laconica.po b/locale/vi_VN/LC_MESSAGES/laconica.po
index 2abf33609..0b9477a6a 100644
--- a/locale/vi_VN/LC_MESSAGES/laconica.po
+++ b/locale/vi_VN/LC_MESSAGES/laconica.po
@@ -3,8 +3,8 @@ msgstr ""
 "Project-Id-Version: laconica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-01-31 05:21+0000\n"
-"Last-Translator: Tuan Nguyen <group3t@gmail.com>\n"
+"PO-Revision-Date: 2009-05-10 05:27+0000\n"
+"Last-Translator: NGUYỄN Mạnh Hùng <loveleeyoungae@yahoo.com>\n"
 "Language-Team: <support@saigonica.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,13 +30,13 @@ msgstr " ngoại trừ thông tin riêng: mật khẩu, email, địa chỉ IM,
 #: ../actions/showstream.php:400 ../lib/stream.php:109
 #: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
 msgid " from "
-msgstr " từ"
+msgstr " từ "
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
 #: actions/twitapistatuses.php:347
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
-msgstr ""
+msgstr "%1$s / Các cập nhật đang trả lời tới %2$s"
 
 #: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
 #, php-format
@@ -103,7 +103,7 @@ msgstr ""
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s dang theo doi tin nhan cua ban tren %2$s."
+msgstr "%1$s đang theo dõi lưu ý của bạn trên %2$s."
 
 #: ../lib/mail.php:126
 #, php-format
@@ -176,7 +176,7 @@ msgstr "Dòng tin nhắn của %s"
 #: actions/twitapistatuses.php:36
 #, php-format
 msgid "%s updates from everyone!"
-msgstr ""
+msgstr "%s cập nhật từ tất cả mọi người!"
 
 #: ../actions/register.php:213
 msgid ""
@@ -817,7 +817,7 @@ msgstr "Nhập biệt hiệu hoặc email."
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
 #: actions/smssettings.php:119
 msgid "Enter the code you received on your phone."
-msgstr ""
+msgstr "Nhập mã mà bạn nhận được trên điện thoại của bạn."
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 #: actions/userauthorization.php:161
@@ -1151,9 +1151,9 @@ msgid ""
 "s, available under the [GNU Affero General Public License](http://www.fsf."
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
-"Saigonica là bản sửa đổi của phiên bản [Laconica 0.6.0](http://laconi.ca/),  "
-"phát hành theo bản quyền [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
+"Đang dùng [Laconica](http://laconi.ca/), phiên bản %s phát hành theo bản "
+"quyền [GNU Affero General Public "
+"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
 #: actions/imsettings.php:296
@@ -1178,7 +1178,7 @@ msgstr "Ngôn ngữ"
 #: actions/profilesettings.php:217
 #, fuzzy
 msgid "Language is too long (max 50 chars)."
-msgstr "Tên khu vực quá dài (không quá 255 ký tự)."
+msgstr "Ngôn ngữ quá dài (tối đa là 50 ký tự)."
 
 #: ../actions/profilesettings.php:52 ../actions/register.php:173
 #: actions/profilesettings.php:85 actions/register.php:187
@@ -1280,7 +1280,7 @@ msgstr "Ghi chú và các file của tôi đã có ở phía dưới"
 #: actions/emailsettings.php:83 actions/smssettings.php:91
 #: actions/emailsettings.php:142 actions/smssettings.php:152
 msgid "New"
-msgstr ""
+msgstr "Mới"
 
 #: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
 #, php-format
@@ -1395,9 +1395,8 @@ msgstr "Không có nội dung!"
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
 #: actions/emailsettings.php:304
-#, fuzzy
 msgid "No email address."
-msgstr "Địa chỉ email của bạn"
+msgstr "Không có địa chỉ email."
 
 #: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
 msgid "No id."
@@ -1429,9 +1428,8 @@ msgstr "Sự xác nhận chưa được hủy bỏ."
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
 #: actions/smssettings.php:294
-#, fuzzy
 msgid "No phone number."
-msgstr "Số điện thoại để nhắn SMS "
+msgstr "Không có số điện thoại."
 
 #: ../actions/finishremotesubscribe.php:72
 #: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
@@ -1635,9 +1633,8 @@ msgstr "Chưa đăng nhận!"
 
 #: ../actions/opensearch.php:35 actions/opensearch.php:35
 #: actions/opensearch.php:67
-#, fuzzy
 msgid "Notice Search"
-msgstr "Tin đã gửi"
+msgstr "Tìm kiếm thông báo"
 
 #: ../actions/showstream.php:82 actions/showstream.php:82
 #: actions/showstream.php:180 actions/showstream.php:187
@@ -1659,9 +1656,9 @@ msgstr "Tin nhắn"
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
 #: actions/tag.php:81 actions/tag.php:41
-#, fuzzy, php-format
+#, php-format
 msgid "Notices tagged with %s"
-msgstr "Dòng tin nhắn cho %s"
+msgstr "Thông báo được gắn thẻ %s"
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
 #: actions/passwordsettings.php:97
@@ -2915,7 +2912,7 @@ msgstr "Đây là hộp thư đến của bạn, bao gồm các tin nhắn gửi
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
 "\n"
-msgstr "%1$s moi ban tham gia vao %2$s"
+msgstr "%1$s moi ban tham gia vao %2$s (%3$s).\n"
 
 #: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
 #: actions/register.php:416
@@ -3194,7 +3191,8 @@ msgstr "%s da them tin nhan cua ban vao danh sach tin nhan ua thich"
 msgid ""
 "%1$s just added your notice from %2$s as one of their favorites.\n"
 "\n"
-msgstr "%s da them tin nhan cua ban vao danh sach tin nhan ua thich"
+msgstr "%s da them tin nhan cua ban vao danh sach tin nhan ua thich\n"
+"\n"
 
 #: actions/twittersettings.php:27
 #, fuzzy
@@ -3326,7 +3324,7 @@ msgstr ""
 #: classes/Command.php:96 classes/Command.php:113
 #, fuzzy, php-format
 msgid "Subscriptions: %1$s\n"
-msgstr "Tôi theo"
+msgstr "Tôi theo: %1$s\n"
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
 #: classes/Command.php:276
@@ -3352,12 +3350,12 @@ msgstr "Tên đầy đủ"
 #: classes/Command.php:172 classes/Command.php:195
 #, fuzzy, php-format
 msgid "Location: %s"
-msgstr "Thành phố"
+msgstr "Thành phố: %s"
 
 #: classes/Command.php:175 classes/Command.php:198
 #, fuzzy, php-format
 msgid "Homepage: %s"
-msgstr "Trang chủ hoặc Blog"
+msgstr "Trang chủ hoặc Blog: %s"
 
 #: classes/Command.php:178 classes/Command.php:201
 #, fuzzy, php-format
@@ -4878,12 +4876,12 @@ msgstr "%1$s dang theo doi tin nhan cua ban tren %2$s."
 #: lib/mail.php:254
 #, fuzzy, php-format
 msgid "Location: %s\n"
-msgstr "Thành phố"
+msgstr "Thành phố: %s\n"
 
 #: lib/mail.php:256
 #, fuzzy, php-format
 msgid "Homepage: %s\n"
-msgstr "Trang chủ hoặc Blog"
+msgstr "Trang chủ hoặc Blog: %s\n"
 
 #: lib/mail.php:258
 #, php-format
@@ -5050,22 +5048,21 @@ msgid "None"
 msgstr "Không"
 
 #: lib/topposterssection.php:74
+#, fuzzy
 msgid "Top posters"
-msgstr ""
+msgstr "Top posters"
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
-#, fuzzy
 msgid "Unblock this user"
-msgstr "Ban user"
+msgstr "Bỏ chặn người dùng này"
 
 #: lib/unblockform.php:150
 msgid "Unblock"
-msgstr ""
+msgstr "Bỏ chặn"
 
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
-#, fuzzy
 msgid "Unsubscribe from this user"
-msgstr "Hết theo"
+msgstr "Ngừng đăng ký từ người dùng này"
 
 #, fuzzy
 #~ msgid "Code not yet ready."
diff --git a/locale/zh_CN/LC_MESSAGES/laconica.mo b/locale/zh_CN/LC_MESSAGES/laconica.mo
index 15c5bf9e8..2d380582a 100644
--- a/locale/zh_CN/LC_MESSAGES/laconica.mo
+++ b/locale/zh_CN/LC_MESSAGES/laconica.mo
diff --git a/locale/zh_CN/LC_MESSAGES/laconica.po b/locale/zh_CN/LC_MESSAGES/laconica.po
index df63b5715..5d285122d 100644
--- a/locale/zh_CN/LC_MESSAGES/laconica.po
+++ b/locale/zh_CN/LC_MESSAGES/laconica.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: identi.ca\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-02-11 07:27+0000\n"
-"Last-Translator: zhangfei <zhangfeisky@126.com>\n"
+"PO-Revision-Date: 2009-04-28 22:31+0000\n"
+"Last-Translator: doubliu <doubliu@gmail.com>\n"
 "Language-Team: i18n-zh <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -75,6 +75,25 @@ msgid ""
 "\n"
 "Sincerely, %2$s\n"
 msgstr ""
+"%1$s 邀请你加入 %2$s (%3$s).\n"
+"\n"
+"%2$s 是一个能让你和你认识的、感兴趣的人保持联系的微博客服务。 \n"
+"你可以和你认识的人分享你的近况、想法或者你的网络生活。你也可以结交有共同兴趣的新朋友。\n"
+"\n"
+"%1$s 说:\n"
+"\n"
+"%4$s\n"
+"\n"
+"你可以在这里查阅 %1$s's 的资料 %2$s :\n"
+"\n"
+"%5$s\n"
+"\n"
+"如果你想使用这个服务，请点击一下链接接受邀请。\n"
+"%6$s\n"
+"\n"
+"如果你不愿意，请跳过这条信息。感谢您的耐心和时间。\n"
+"\n"
+"诚挚的感谢, %2$s\n"
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
 #, php-format
@@ -378,7 +397,7 @@ msgstr "头像已更新。"
 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 ""
+msgstr "正在等待这个地址的确认。请查阅你Jabber/GTalk的帐户看有没有收到进一步的指示。（你是否已经添加 %s为你的好友？）"
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
 msgid ""
@@ -524,6 +543,15 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
+"恭喜， %s! 欢迎来到 %%%%site.name%%%%. 这里，你需要\n"
+"\n"
+"* 查看你的资料Go to [your profile](%s) 发布你的第一条消息.\n"
+"* 填加 [Jabber/GTalk address](%%%%action.imsettings%%%%) 然后你可以通过即时消息平台发布信息。\n"
+"* [Search for people](%%%%action.peoplesearch%%%%) 你认识的或和你有共同兴趣的朋友。 \n"
+"* 更新你的 [profile settings](%%%%action.profilesettings%%%%) 告诉大家更多关于你的情况。 \n"
+"* 请阅读 [online docs](%%%%doc.help%%%%) 有的功能也许你还不熟悉。\n"
+"\n"
+"感谢您的注册，希望您喜欢这个服务。"
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
 #: actions/finishopenidlogin.php:119 lib/action.php:330
@@ -1152,6 +1180,8 @@ msgid ""
 "(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
 "%). "
 msgstr ""
+"请使用你的帐号和密码登入。没有帐号？[注册](%%action.register%%) 一个新帐号, 或使用 "
+"[OpenID](%%action.openidlogin%%). "
 
 #: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
 msgid "Logout"
@@ -1181,7 +1211,7 @@ msgstr "设置 %%site.name%% 发送的邮件。"
 #: ../actions/showstream.php:300 actions/showstream.php:315
 #: actions/showstream.php:480
 msgid "Member since"
-msgstr "注册于"
+msgstr "用户始于"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
 #, php-format
@@ -2307,6 +2337,8 @@ msgid ""
 "register%%) a new  account. If you already have an account  on a [compatible "
 "microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
+"要订阅，你可以登录 (%%action.login%%), 或注册(%%action.register%%) "
+"一个新帐号。如果你已经有在另一个兼容的微博客的帐号(%%doc.openmublog%%),  请填入你资料的互联网地址URL."
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132
@@ -3348,16 +3380,16 @@ msgstr "Twitter 设置"
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
 msgid "Original"
-msgstr ""
+msgstr "原来的"
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
 msgid "Preview"
-msgstr ""
+msgstr "预览"
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
 msgid "Crop"
-msgstr ""
+msgstr "剪裁"
 
 #: actions/avatarsettings.php:248 actions/deletenotice.php:133
 #: actions/emailsettings.php:224 actions/grouplogo.php:307
@@ -3374,11 +3406,11 @@ msgstr "会话标识有问题，请重试。"
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
 msgid "Pick a square area of the image to be your avatar"
-msgstr ""
+msgstr "请选择一块方形区域作为你的头像"
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
 msgid "Lost our file data."
-msgstr ""
+msgstr "文件数据丢失"
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
 #: classes/User_group.php:112
@@ -3407,51 +3439,51 @@ msgstr "没有找到此ID的信息。"
 #: actions/block.php:111
 #, fuzzy
 msgid "Block user"
-msgstr "未找到用户"
+msgstr "阻止用户"
 
 #: actions/block.php:129
 #, fuzzy
 msgid "Are you sure you want to block this user? "
-msgstr "确定要删除这条通告吗？"
+msgstr "确定要阻止该用户吗？"
 
 #: actions/block.php:162
-#, fuzzy
 msgid "You have already blocked this user."
-msgstr "您已订阅这些用户："
+msgstr "您已成功阻止该用户："
 
 #: actions/block.php:167
 msgid "Failed to save block information."
-msgstr ""
+msgstr "保存阻止信息失败。"
 
 #: actions/confirmaddress.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "The address \"%s\" has been "
-msgstr "地址被移除。"
+msgstr "该地址 \"%s\" 已被"
 
 #: actions/deletenotice.php:73
 #, fuzzy
 msgid "You are about to permanently delete a notice. "
-msgstr "您选择了永久删除通告。这样做是无法恢复的。"
+msgstr "您将要永久删除这条通告。"
 
 #: actions/disfavor.php:94
-#, fuzzy
 msgid "Add to favorites"
-msgstr "%s 的收藏的聚合"
+msgstr "加入收藏"
 
 #: actions/editgroup.php:54
 #, php-format
 msgid "Edit %s group"
-msgstr ""
+msgstr "编辑 %s 组"
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+#, fuzzy
 msgid "Inboxes must be enabled for groups to work"
-msgstr ""
+msgstr "使用组功能前必须使能邮箱"
 
+# before login, the user don't even see any Chinese translation. Anyway. This may be good for the future.
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
 #, fuzzy
 msgid "You must be logged in to create a group."
-msgstr "您必须登录才能邀请其他人使用 %s"
+msgstr "您必须登录才能创建组 %s"
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
@@ -3463,44 +3495,39 @@ msgstr "没有昵称。"
 #: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
 #: actions/groupmembers.php:83 actions/joingroup.php:88
 #: actions/showgroup.php:128
-#, fuzzy
 msgid "No such group"
-msgstr "未找到用户"
+msgstr "没有这个组"
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
 #: actions/grouplogo.php:107
-#, fuzzy
 msgid "You must be an admin to edit the group"
-msgstr "您必须登录才能邀请其他人使用 %s"
+msgstr "只有admin才能编辑这个组"
 
 #: actions/editgroup.php:157
 msgid "Use this form to edit the group."
-msgstr ""
+msgstr "使用这个表单来编辑组"
 
 #: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
 #, fuzzy
 msgid "Nickname must have only lowercase letters "
-msgstr "昵称只能使用小写字母和数字，不包含空格。"
+msgstr "昵称只能使用小写字母"
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
-#, fuzzy
 msgid "description is too long (max 140 chars)."
-msgstr "个人小传过长(不能超过140字符)。"
+msgstr "描述过长(不能超过140字符)。"
 
 #: actions/editgroup.php:218
-#, fuzzy
 msgid "Could not update group."
-msgstr "无法更新用户。"
+msgstr "无法更新组"
 
 #: actions/editgroup.php:226
-#, fuzzy
 msgid "Options saved."
-msgstr "设置已保存。"
+msgstr "选项已保存。"
 
 #: actions/emailsettings.php:107 actions/imsettings.php:108
-#, fuzzy, php-format
+#, php-format
 msgid "Awaiting confirmation on this address. "
-msgstr "等待确认此电话号码。"
+msgstr "正在等待这个地址的确认。"
 
 #: actions/emailsettings.php:139 actions/smssettings.php:150
 #, fuzzy
@@ -3514,7 +3541,7 @@ msgstr "如果收到私人信息，发邮件通知我。"
 
 #: actions/emailsettings.php:168
 msgid "Allow friends to nudge me and send me an email."
-msgstr ""
+msgstr "允许朋友们呼叫并给我发送邮件。"
 
 #: actions/emailsettings.php:321
 #, fuzzy
@@ -3528,21 +3555,21 @@ msgstr "验证码已被发送到您新增的即时通讯帐号。您必须允许
 
 #: actions/facebookhome.php:110
 msgid "Server error - couldn't get user!"
-msgstr ""
+msgstr "服务器报错 -- 无法找到该用户。"
 
 #: actions/facebookhome.php:196
 #, php-format
 msgid "If you would like the %s app to automatically update "
-msgstr ""
+msgstr "如果你想使用 %s 程序自动更新"
 
 #: actions/facebookhome.php:213 actions/facebooksettings.php:137
 #, php-format
 msgid "Allow %s to update my Facebook status"
-msgstr ""
+msgstr "允许 %s 更新我Facebook 的状态"
 
 #: actions/facebookhome.php:218
 msgid "Skip"
-msgstr ""
+msgstr "跳过"
 
 #: actions/facebookhome.php:235
 #, fuzzy
@@ -3551,7 +3578,7 @@ msgstr "没有内容！"
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
 msgid "Pagination"
-msgstr ""
+msgstr "分页"
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
 #, fuzzy
@@ -3566,7 +3593,7 @@ msgstr "之前 »"
 #: actions/facebookinvite.php:70
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
-msgstr ""
+msgstr "感谢您邀请朋友使用 %s"
 
 #: actions/facebookinvite.php:72
 #, fuzzy
@@ -3576,7 +3603,7 @@ msgstr "已发送邀请给这些人："
 #: actions/facebookinvite.php:96
 #, fuzzy, php-format
 msgid "You have been invited to %s"
-msgstr "您已得到确认。输入"
+msgstr "您已被邀请到 %s"
 
 #: actions/facebookinvite.php:105
 #, fuzzy, php-format
@@ -3586,17 +3613,17 @@ msgstr "%s 好友的聚合"
 #: actions/facebookinvite.php:113
 #, php-format
 msgid "Friends already using %s:"
-msgstr ""
+msgstr "已经正在使用 %s 的朋友："
 
 #: actions/facebookinvite.php:130
 #, php-format
 msgid "Send invitations"
-msgstr ""
+msgstr "发出邀请"
 
 #: actions/facebookremove.php:56
 #, fuzzy
 msgid "Couldn't remove Facebook user."
-msgstr "无法移除 Twitter 用户。"
+msgstr "无法移除 facebook用户。"
 
 #: actions/facebooksettings.php:65
 #, fuzzy
@@ -3604,9 +3631,8 @@ msgid "There was a problem saving your sync preferences!"
 msgstr "会话标识有问题，请重试。"
 
 #: actions/facebooksettings.php:67
-#, fuzzy
 msgid "Sync preferences saved."
-msgstr "首选项已保存。"
+msgstr "同步选项已保存。"
 
 #: actions/facebooksettings.php:90
 #, fuzzy
@@ -3625,17 +3651,16 @@ msgstr "个人信息"
 
 #: actions/facebooksettings.php:108
 msgid "A string to prefix notices with."
-msgstr ""
+msgstr "消息以一字符串为前缀。"
 
 #: actions/facebooksettings.php:124
 #, php-format
 msgid "If you would like %s to automatically update "
-msgstr ""
+msgstr "如果你希望 %s 自动更新。"
 
 #: actions/facebooksettings.php:147
-#, fuzzy
 msgid "Sync preferences"
-msgstr "首选项"
+msgstr "同步设置"
 
 #: actions/favor.php:94 lib/disfavorform.php:140
 #, fuzzy
@@ -3661,77 +3686,77 @@ msgstr "显示上周以来最流行的标签"
 #: actions/featured.php:69 lib/featureduserssection.php:82
 #: lib/publicgroupnav.php:87
 msgid "Featured users"
-msgstr ""
+msgstr "推荐用户"
 
 #: actions/featured.php:71
 #, php-format
 msgid "Featured users, page %d"
-msgstr ""
+msgstr "推荐用户，第 %d 页"
 
 #: actions/featured.php:99
 #, php-format
 msgid "A selection of some of the great users on %s"
-msgstr ""
+msgstr "%s 优秀用户摘选"
 
 #: actions/finishremotesubscribe.php:188
 msgid "That user has blocked you from subscribing."
-msgstr ""
+msgstr "那个用户阻止了你的订阅。"
 
 #: actions/groupbyid.php:79
 msgid "No ID"
-msgstr ""
+msgstr "没有ID"
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
 msgid "Group logo"
-msgstr ""
+msgstr "组logo"
 
 #: actions/grouplogo.php:149
 msgid "You can upload a logo image for your group."
-msgstr ""
+msgstr "你可以给你的组上载一个logo图。"
 
 #: actions/grouplogo.php:448
-#, fuzzy
 msgid "Logo updated."
-msgstr "头像已更新。"
+msgstr "logo已更新。"
 
 #: actions/grouplogo.php:450
 #, fuzzy
 msgid "Failed updating logo."
-msgstr "更新头像失败。"
+msgstr "更新logo失败。"
 
 #: actions/groupmembers.php:93 lib/groupnav.php:91
 #, php-format
 msgid "%s group members"
-msgstr ""
+msgstr "%s 组成员"
 
 #: actions/groupmembers.php:96
 #, php-format
 msgid "%s group members, page %d"
-msgstr ""
+msgstr "%s 组成员, 第 %d 页"
 
 #: actions/groupmembers.php:111
 msgid "A list of the users in this group."
-msgstr ""
+msgstr "该组成员列表。"
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
 #: lib/subgroupnav.php:96
 msgid "Groups"
-msgstr ""
+msgstr "组"
 
 #: actions/groups.php:64
 #, php-format
 msgid "Groups, page %d"
-msgstr ""
+msgstr "组，第 %d 页"
 
 #: actions/groups.php:90
 #, php-format
+#, fuzzy
 msgid "%%%%site.name%%%% groups let you find and talk with "
-msgstr ""
+msgstr "%%%%site.name%%%% 组你可以查找并联络"
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
 #, fuzzy
 msgid "Create a new group"
-msgstr "创建新帐号"
+msgstr "创建新组"
 
 #: actions/groupsearch.php:57
 #, fuzzy, php-format
@@ -3740,19 +3765,18 @@ msgid ""
 msgstr "在 %%site.name%% 的用户信息中搜索，可以搜索姓名、未知和爱好。"
 
 #: actions/groupsearch.php:63
-#, fuzzy
 msgid "Group search"
-msgstr "搜索用户"
+msgstr "组检索"
 
 #: actions/imsettings.php:70
 #, fuzzy
 msgid "You can send and receive notices through "
-msgstr "无法向此用户发送消息。"
+msgstr "收发可以通过"
 
 #: actions/imsettings.php:120
 #, php-format
 msgid "Jabber or GTalk address, "
-msgstr ""
+msgstr "Jabber 或者 GTalk 地址, "
 
 #: actions/imsettings.php:147
 #, fuzzy
@@ -3760,33 +3784,32 @@ msgid "Send me replies through Jabber/GTalk "
 msgstr "通过Jabber/GTalk发送通告。"
 
 #: actions/imsettings.php:321
-#, fuzzy, php-format
+#, php-format
 msgid "A confirmation code was sent "
-msgstr "没有验证码"
+msgstr "确认消息已经发送"
 
 #: actions/joingroup.php:65
 #, fuzzy
 msgid "You must be logged in to join a group."
-msgstr "您必须登录才能邀请其他人使用 %s"
+msgstr "您必须登录才能加入组。"
 
 #: actions/joingroup.php:95
-#, fuzzy
 msgid "You are already a member of that group"
-msgstr "您已订阅这些用户："
+msgstr "您已经是该组成员"
 
 #: actions/joingroup.php:128
 #, fuzzy, php-format
 msgid "Could not join user %s to group %s"
-msgstr "无法订阅用户：未找到。"
+msgstr "无法把 %s 用户添加到 %s 组"
 
 #: actions/joingroup.php:135
 #, fuzzy, php-format
 msgid "%s joined group %s"
-msgstr "%s 的收藏 / %s"
+msgstr "%s 加入 %s 组"
 
 #: actions/leavegroup.php:60
 msgid "Inboxes must be enabled for groups to work."
-msgstr ""
+msgstr "邮箱必须使能组才能工作。"
 
 #: actions/leavegroup.php:65
 #, fuzzy
@@ -3794,9 +3817,8 @@ msgid "You must be logged in to leave a group."
 msgstr "您必须登录才能邀请其他人使用 %s"
 
 #: actions/leavegroup.php:88
-#, fuzzy
 msgid "No such group."
-msgstr "未找到此消息。"
+msgstr "没有这个组。"
 
 #: actions/leavegroup.php:95
 #, fuzzy
@@ -3821,28 +3843,27 @@ msgstr "无法订阅用户：未找到。"
 #: actions/leavegroup.php:145
 #, php-format
 msgid "%s left group %s"
-msgstr ""
+msgstr "%s 离开群 %s"
 
 #: actions/login.php:225 lib/facebookaction.php:304
 msgid "Login to site"
-msgstr ""
+msgstr "登录"
 
 #: actions/microsummary.php:69
 msgid "No current status"
-msgstr ""
+msgstr "没有当前状态"
 
 #: actions/newgroup.php:53
 msgid "New group"
-msgstr ""
+msgstr "新组"
 
 #: actions/newgroup.php:115
 msgid "Use this form to create a new group."
-msgstr ""
+msgstr "使用此表格创建组。"
 
 #: actions/newgroup.php:177
-#, fuzzy
 msgid "Could not create group."
-msgstr "无法创建收藏。"
+msgstr "无法创建组。"
 
 #: actions/newgroup.php:191
 #, fuzzy
@@ -3860,26 +3881,25 @@ msgid "Don't send a message to yourself; "
 msgstr "无法向此用户发送消息。"
 
 #: actions/newnotice.php:166
-#, fuzzy
 msgid "Notice posted"
-msgstr "通告"
+msgstr "消息已发布。"
 
 #: actions/newnotice.php:200 classes/Channel.php:163
 msgid "Ajax Error"
-msgstr ""
+msgstr "Ajax错误"
 
 #: actions/nudge.php:85
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set his email yet."
-msgstr ""
+msgstr "此用户不允许振铃呼叫或者还没有确认或设置TA的电子邮件。"
 
 #: actions/nudge.php:94
 msgid "Nudge sent"
-msgstr ""
+msgstr "振铃呼叫发出。"
 
 #: actions/nudge.php:97
 msgid "Nudge sent!"
-msgstr ""
+msgstr "振铃呼叫已经发出！"
 
 #: actions/openidlogin.php:97
 #, fuzzy
@@ -3898,25 +3918,24 @@ msgstr "Twitter 设置"
 
 #: actions/othersettings.php:71
 msgid "Manage various other options."
-msgstr ""
+msgstr "管理其他选项。"
 
 #: actions/othersettings.php:93
 msgid "URL Auto-shortening"
-msgstr ""
+msgstr "URL自动缩短"
 
 #: actions/othersettings.php:112
-#, fuzzy
 msgid "Service"
-msgstr "搜索"
+msgstr "服务"
 
 #: actions/othersettings.php:113
 msgid "Automatic shortening service to use."
-msgstr ""
+msgstr "要使用的自动缩短服务。"
 
 #: actions/othersettings.php:144
 #, fuzzy
 msgid "URL shortening service is too long (max 50 chars)."
-msgstr "语言过长(不能超过50个字符)。"
+msgstr "URL缩短服务超长(最多50个字符)。"
 
 #: actions/passwordsettings.php:69
 #, fuzzy
@@ -3936,12 +3955,12 @@ msgstr "不是有效的电子邮件"
 #: actions/peopletag.php:47
 #, php-format
 msgid "Users self-tagged with %s - page %d"
-msgstr ""
+msgstr "用户自加标签 %s - 第 %d 页"
 
 #: actions/peopletag.php:91
 #, php-format
 msgid "These are users who have tagged themselves \"%s\" "
-msgstr ""
+msgstr "这些是自我标识为 \"%s\"  的用户"
 
 #: actions/profilesettings.php:91
 #, fuzzy
@@ -3951,7 +3970,7 @@ msgstr "未知的帐号"
 #: actions/profilesettings.php:124
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
-msgstr ""
+msgstr "你的标签 (字母letters, 数字numbers, -, ., 和 _), 以逗号或空格分隔"
 
 #: actions/profilesettings.php:144
 #, fuzzy
@@ -3984,6 +4003,8 @@ msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service "
 msgstr ""
+"这里是 %%site.name%%,一个微博客 [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) 服务"
 
 #: actions/publictagcloud.php:57
 #, fuzzy
@@ -3993,15 +4014,15 @@ msgstr "公开的聚合"
 #: actions/publictagcloud.php:63
 #, php-format
 msgid "These are most popular recent tags on %s "
-msgstr ""
+msgstr "这些是最近的 %s 流行标签 "
 
 #: actions/publictagcloud.php:119
 msgid "Tag cloud"
-msgstr ""
+msgstr "标签云聚集"
 
 #: actions/register.php:139 actions/register.php:349
 msgid "Sorry, only invited people can register."
-msgstr ""
+msgstr "对不起，请邀请那些能注册的人。"
 
 #: actions/register.php:149
 #, fuzzy
@@ -4010,7 +4031,7 @@ msgstr "您必须同意此授权方可注册。"
 
 #: actions/register.php:286
 msgid "With this form you can create "
-msgstr ""
+msgstr "使用这个表格你可以创建"
 
 #: actions/register.php:368
 #, fuzzy
@@ -4054,12 +4075,12 @@ msgstr "(您将立即收到一封电子邮件，含有"
 
 #: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
 msgid "That's a local profile! Login to subscribe."
-msgstr ""
+msgstr "那是一个本地资料！需要登录才能订阅。"
 
 #: actions/replies.php:118
 #, fuzzy, php-format
 msgid "Replies to %s, page %d"
-msgstr "%s 的回复"
+msgstr "%s 的回复，第 % 页"
 
 #: actions/showfavorites.php:79
 #, fuzzy, php-format
@@ -4069,22 +4090,22 @@ msgstr "%s 收藏的通告"
 #: actions/showgroup.php:77 lib/groupnav.php:85
 #, php-format
 msgid "%s group"
-msgstr ""
+msgstr "%s 组"
 
 #: actions/showgroup.php:79
 #, php-format
 msgid "%s group, page %d"
-msgstr ""
+msgstr "%s 组, 第 %d 页"
 
 #: actions/showgroup.php:206
 #, fuzzy
 msgid "Group profile"
-msgstr "没有这份通告。"
+msgstr "组资料"
 
 #: actions/showgroup.php:251 actions/showstream.php:278
 #: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
 msgid "URL"
-msgstr ""
+msgstr "URL 互联网地址"
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
@@ -4094,7 +4115,7 @@ msgstr "通告"
 
 #: actions/showgroup.php:270
 msgid "Group actions"
-msgstr ""
+msgstr "组动作"
 
 #: actions/showgroup.php:323
 #, fuzzy, php-format
@@ -4110,11 +4131,11 @@ msgstr "注册于"
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
 #: lib/tagcloudsection.php:71
 msgid "(None)"
-msgstr ""
+msgstr "（没有）"
 
 #: actions/showgroup.php:370
 msgid "All members"
-msgstr ""
+msgstr "所有成员"
 
 #: actions/showgroup.php:378
 #, php-format
@@ -4122,6 +4143,8 @@ msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
+"**%s** 是一个 %%%%site.name%%%% 的用户组,一个微博客服务 [micro-"
+"blogging](http://en.wikipedia.org/wiki/Micro-blogging)"
 
 #: actions/showmessage.php:98
 #, fuzzy
@@ -4145,7 +4168,7 @@ msgstr "用户没有个人信息。"
 
 #: actions/showstream.php:240 actions/tagother.php:81
 msgid "Photo"
-msgstr ""
+msgstr "相片"
 
 #: actions/showstream.php:317
 #, fuzzy
@@ -4169,7 +4192,7 @@ msgstr "订阅者"
 
 #: actions/showstream.php:533
 msgid "All groups"
-msgstr ""
+msgstr "所有组"
 
 #: actions/showstream.php:542
 #, php-format
@@ -4177,6 +4200,8 @@ msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
+"**%s** 有一个帐号在 %%%%site.name%%%%, 一个微博客服务 [micro-"
+"blogging](http://en.wikipedia.org/wiki/Micro-blogging)"
 
 #: actions/smssettings.php:128
 #, fuzzy
@@ -4226,7 +4251,7 @@ msgstr "订阅者"
 #: actions/subscribers.php:52
 #, php-format
 msgid "%s subscribers, page %d"
-msgstr ""
+msgstr "%s 订阅者, 第 %d 页"
 
 #: actions/subscribers.php:63
 #, fuzzy
@@ -4271,7 +4296,7 @@ msgstr "带 %s 标签的通告"
 #: actions/tag.php:66
 #, php-format
 msgid "Messages tagged \"%s\", most recent first"
-msgstr ""
+msgstr "有 \"%s\" 标签的消息，最近的排序在前"
 
 #: actions/tagother.php:33
 #, fuzzy
@@ -4297,7 +4322,7 @@ msgstr "标签"
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
-msgstr ""
+msgstr "给这个用户加注标签 (字母letters, 数字numbers, -, ., and _), 逗号或空格分隔"
 
 #: actions/tagother.php:164
 #, fuzzy
@@ -4307,7 +4332,7 @@ msgstr "会话标识有问题，请重试。"
 #: actions/tagother.php:191
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
-msgstr ""
+msgstr "你只能给你订阅的人或订阅你的人加标签。"
 
 #: actions/tagother.php:198
 #, fuzzy
@@ -4316,7 +4341,7 @@ msgstr "无法保存头像"
 
 #: actions/tagother.php:233
 msgid "Use this form to add tags to your subscribers or subscriptions."
-msgstr ""
+msgstr "使用这个表格给你的关注者或你的订阅加注标签。"
 
 #: actions/tagrss.php:35
 #, fuzzy
@@ -4330,11 +4355,11 @@ msgstr "带 %s 标签的通告"
 
 #: actions/twitapiblocks.php:47
 msgid "Block user failed."
-msgstr ""
+msgstr "阻止用户失败。"
 
 #: actions/twitapiblocks.php:69
 msgid "Unblock user failed."
-msgstr ""
+msgstr "取消阻止用户失败。"
 
 #: actions/twitapiusers.php:48
 #, fuzzy
@@ -4363,7 +4388,7 @@ msgstr "Twitter 设置"
 
 #: actions/twittersettings.php:327
 msgid "Username must have only numbers, "
-msgstr ""
+msgstr "用户名只能有数字，"
 
 #: actions/twittersettings.php:341
 #, fuzzy, php-format
@@ -4393,12 +4418,12 @@ msgstr "退订"
 #: actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
-msgstr ""
+msgstr "%s 群组"
 
 #: actions/usergroups.php:65
 #, php-format
 msgid "%s groups, page %d"
-msgstr ""
+msgstr "%s 群组, 第 %d 页"
 
 #: classes/Notice.php:104
 #, fuzzy
@@ -4408,27 +4433,23 @@ msgstr "保存通告时出错。"
 #: classes/Notice.php:109
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
-msgstr ""
+msgstr "你在短时间里发布了过多的消息，请深呼吸，过几分钟再发消息。"
 
 #: classes/Notice.php:116
-#, fuzzy
 msgid "You are banned from posting notices on this site."
-msgstr ""
-"您的新的发布用的地址是 %1$s。\n"
-"\n"
+msgstr "在这个网站你被禁止发布消息。"
 
 #: lib/accountsettingsaction.php:108
-#, fuzzy
 msgid "Upload an avatar"
-msgstr "更新头像失败。"
+msgstr "上载一个头像。"
 
 #: lib/accountsettingsaction.php:119
 msgid "Other"
-msgstr ""
+msgstr "其他"
 
 #: lib/accountsettingsaction.php:120
 msgid "Other options"
-msgstr ""
+msgstr "其他选项"
 
 #: lib/action.php:130
 #, fuzzy, php-format
@@ -4437,41 +4458,40 @@ msgstr "%s (%s)"
 
 #: lib/action.php:145
 msgid "Untitled page"
-msgstr ""
+msgstr "无标题页"
 
 #: lib/action.php:316
 msgid "Primary site navigation"
-msgstr ""
+msgstr "主站导航"
 
 #: lib/action.php:322
 msgid "Personal profile and friends timeline"
-msgstr ""
+msgstr "个人资料及朋友年表"
 
 #: lib/action.php:325
 msgid "Search for people or text"
-msgstr ""
+msgstr "检索人或文字"
 
 #: lib/action.php:328
-#, fuzzy
 msgid "Account"
-msgstr "关于"
+msgstr "帐号"
 
 #: lib/action.php:328
 #, fuzzy
 msgid "Change your email, avatar, password, profile"
-msgstr "修改密码"
+msgstr "修改资料"
 
 #: lib/action.php:330
 msgid "Connect to IM, SMS, Twitter"
-msgstr ""
+msgstr "与IM，手机短信，Twitter的连接"
 
 #: lib/action.php:332
 msgid "Logout from the site"
-msgstr ""
+msgstr "登出本站"
 
 #: lib/action.php:335
 msgid "Login to the site"
-msgstr ""
+msgstr "登入本站"
 
 #: lib/action.php:338
 #, fuzzy
@@ -4495,7 +4515,7 @@ msgstr "新通告"
 
 #: lib/action.php:417
 msgid "Local views"
-msgstr ""
+msgstr "本地显示"
 
 #: lib/action.php:472
 #, fuzzy
@@ -4505,28 +4525,28 @@ msgstr "新通告"
 #: lib/action.php:562
 #, fuzzy
 msgid "Secondary site navigation"
-msgstr "订阅"
+msgstr "次项站导航"
 
 #: lib/action.php:602 lib/action.php:623
 msgid "Laconica software license"
-msgstr ""
+msgstr "Laconica软件注册证"
 
 #: lib/action.php:630
 msgid "All "
-msgstr ""
+msgstr "全部"
 
 #: lib/action.php:635
 msgid "license."
-msgstr ""
+msgstr "注册证"
 
 #: lib/blockform.php:123 lib/blockform.php:153
 #, fuzzy
 msgid "Block this user"
-msgstr "未找到用户"
+msgstr "阻止该用户"
 
 #: lib/blockform.php:153
 msgid "Block"
-msgstr ""
+msgstr "阻止"
 
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
 #, fuzzy
@@ -4536,16 +4556,16 @@ msgstr "%s 收藏的通告"
 #: lib/facebookaction.php:268
 #, php-format
 msgid "To use the %s Facebook Application you need to login "
-msgstr ""
+msgstr "你需要登录方能使用%sFacebook程序"
 
 #: lib/facebookaction.php:271
 #, fuzzy
 msgid " a new account."
-msgstr "创建新帐号"
+msgstr "一个新帐号"
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
 msgid "Published"
-msgstr ""
+msgstr "已发布"
 
 #: lib/favorform.php:114 lib/favorform.php:140
 #, fuzzy
@@ -4554,7 +4574,7 @@ msgstr "%s 收藏的通告"
 
 #: lib/feedlist.php:64
 msgid "Export data"
-msgstr ""
+msgstr "导出数据"
 
 #: lib/galleryaction.php:121
 #, fuzzy
@@ -4563,7 +4583,7 @@ msgstr "%s 标签的聚合"
 
 #: lib/galleryaction.php:131
 msgid "All"
-msgstr ""
+msgstr "全部"
 
 #: lib/galleryaction.php:137
 #, fuzzy
@@ -4572,11 +4592,11 @@ msgstr "标签"
 
 #: lib/galleryaction.php:138
 msgid "Choose a tag to narrow list"
-msgstr ""
+msgstr "选择标签缩小清单"
 
 #: lib/galleryaction.php:139
 msgid "Go"
-msgstr ""
+msgstr "执行"
 
 #: lib/groupeditform.php:148
 #, fuzzy
@@ -4586,7 +4606,7 @@ msgstr "您的主页、博客或在其他站点的URL"
 #: lib/groupeditform.php:151
 #, fuzzy
 msgid "Description"
-msgstr "订阅"
+msgstr "描述"
 
 #: lib/groupeditform.php:153
 #, fuzzy
@@ -4601,39 +4621,39 @@ msgstr "你的位置，格式类似\"城市，省份，国家\""
 
 #: lib/groupnav.php:84 lib/searchgroupnav.php:84
 msgid "Group"
-msgstr ""
+msgstr "组"
 
 #: lib/groupnav.php:100
 msgid "Admin"
-msgstr ""
+msgstr "admin管理员"
 
 #: lib/groupnav.php:101
 #, php-format
 msgid "Edit %s group properties"
-msgstr ""
+msgstr "编辑 %s群选项"
 
 #: lib/groupnav.php:106
 #, fuzzy
 msgid "Logo"
-msgstr "登出"
+msgstr "Logo图标"
 
 #: lib/groupnav.php:107
 #, php-format
 msgid "Add or edit %s logo"
-msgstr ""
+msgstr "添加或编辑 %s 图标"
 
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
-msgstr ""
+msgstr "人气最旺的群"
 
 #: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
-msgstr ""
+msgstr "消息最多的群"
 
 #: lib/grouptagcloudsection.php:56
 #, php-format
 msgid "Tags in %s group's notices"
-msgstr ""
+msgstr "这个组所发布的消息的标签"
 
 #: lib/htmloutputter.php:104
 #, fuzzy
@@ -4662,7 +4682,7 @@ msgstr "创建新帐号"
 
 #: lib/logingroupnav.php:82
 msgid "Login or register with OpenID"
-msgstr ""
+msgstr "使用openID登录或注册"
 
 #: lib/mail.php:175
 #, php-format
@@ -4670,6 +4690,8 @@ msgid ""
 "Hey, %s.\n"
 "\n"
 msgstr ""
+"你好，%s.\n"
+"\n"
 
 #: lib/mail.php:236
 #, fuzzy, php-format
@@ -4679,12 +4701,12 @@ msgstr "%1$s 开始关注您的 %2$s 信息。"
 #: lib/mail.php:254
 #, fuzzy, php-format
 msgid "Location: %s\n"
-msgstr "位置：%s"
+msgstr "位置：%s\n"
 
 #: lib/mail.php:256
 #, fuzzy, php-format
 msgid "Homepage: %s\n"
-msgstr "主页：%s"
+msgstr "主页：%s\n"
 
 #: lib/mail.php:258
 #, php-format
@@ -4692,30 +4714,28 @@ msgid ""
 "Bio: %s\n"
 "\n"
 msgstr ""
+"自传Bio: %s\n"
+"\n"
 
 #: lib/mail.php:461
-#, fuzzy, php-format
+#, php-format
 msgid "You've been nudged by %s"
-msgstr "您已得到确认。输入"
+msgstr "%s 振铃呼叫你"
 
 #: lib/mail.php:465
 #, fuzzy, php-format
 msgid "%1$s (%2$s) is wondering what you are up to "
-msgstr ""
-"%1$s (%2$s) 发送了新的私人信息：\n"
-"\n"
+msgstr "%1$s (%2$s) 发送了新的私人信息："
 
 #: lib/mail.php:555
 #, fuzzy, php-format
 msgid "%1$s just added your notice from %2$s"
-msgstr ""
-"%1$s 收藏了您的 %2$s 通告。\n"
-"\n"
+msgstr "%1$s 收藏了您的 %2$s 通告"
 
 #: lib/mailbox.php:229 lib/noticelist.php:380
 #, fuzzy
 msgid "From"
-msgstr " 从 "
+msgstr "从 "
 
 #: lib/messageform.php:110
 #, fuzzy
@@ -4759,29 +4779,29 @@ msgstr "删除"
 
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
-msgstr ""
+msgstr "呼叫这个用户"
 
 #: lib/nudgeform.php:128
 msgid "Nudge"
-msgstr ""
+msgstr "呼叫"
 
 #: lib/nudgeform.php:128
 #, fuzzy
 msgid "Send a nudge to this user"
-msgstr "无法向此用户发送消息。"
+msgstr "呼叫这个用户"
 
 #: lib/personaltagcloudsection.php:56
 #, fuzzy, php-format
 msgid "Tags in %s's notices"
-msgstr "用户没有通告。"
+msgstr "%s's 的消息的标签"
 
 #: lib/profilelist.php:182
 msgid "(none)"
-msgstr ""
+msgstr "(none 没有)"
 
 #: lib/publicgroupnav.php:76
 msgid "Public"
-msgstr ""
+msgstr "公告"
 
 #: lib/publicgroupnav.php:80
 msgid "User groups"
@@ -4813,12 +4833,12 @@ msgstr "搜索用户信息"
 
 #: lib/section.php:89
 msgid "Untitled section"
-msgstr ""
+msgstr "无标题章节"
 
 #: lib/subgroupnav.php:81
 #, fuzzy, php-format
 msgid "People %s subscribes to"
-msgstr "远程订阅"
+msgstr "%s 订阅的人"
 
 #: lib/subgroupnav.php:89
 #, fuzzy, php-format
@@ -4828,7 +4848,7 @@ msgstr "订阅 %s"
 #: lib/subgroupnav.php:97
 #, php-format
 msgid "Groups %s is a member of"
-msgstr ""
+msgstr "%s 组是成员组成了"
 
 #: lib/subgroupnav.php:104
 #, fuzzy, php-format
@@ -4851,17 +4871,18 @@ msgid "None"
 msgstr "否"
 
 #: lib/topposterssection.php:74
+#, fuzzy
 msgid "Top posters"
-msgstr ""
+msgstr "灌水精英"
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
 #, fuzzy
 msgid "Unblock this user"
-msgstr "未找到用户"
+msgstr "取消阻止次用户"
 
 #: lib/unblockform.php:150
 msgid "Unblock"
-msgstr ""
+msgstr "取消阻止"
 
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 #, fuzzy
diff --git a/plugins/Comet/CometPlugin.php b/plugins/Comet/CometPlugin.php
index 45251c66f..1735d2b15 100644
--- a/plugins/Comet/CometPlugin.php
+++ b/plugins/Comet/CometPlugin.php
@@ -31,6 +31,8 @@ if (!defined('LACONICA')) {
     exit(1);
 }
 
+require_once INSTALLDIR.'/plugins/Realtime/RealtimePlugin.php';
+
 /**
  * Plugin to do realtime updates using Comet
  *
@@ -41,165 +43,65 @@ if (!defined('LACONICA')) {
  * @link     http://laconi.ca/
  */
 
-class CometPlugin extends Plugin
+class CometPlugin extends RealtimePlugin
 {
-    var $server = null;
+    public $server   = null;
+    public $username = null;
+    public $password = null;
+    public $prefix   = null;
+    protected $bay   = null;
 
-    function __construct($server=null, $username=null, $password=null)
+    function __construct($server=null, $username=null, $password=null, $prefix=null)
     {
         $this->server   = $server;
         $this->username = $username;
         $this->password = $password;
+        $this->prefix   = $prefix;
 
         parent::__construct();
     }
 
-    function onEndShowScripts($action)
+    function _getScripts()
     {
-        $timeline = null;
-
-        $this->log(LOG_DEBUG, 'got action ' . $action->trimmed('action'));
-
-        switch ($action->trimmed('action')) {
-         case 'public':
-            $timeline = '/timelines/public';
-            break;
-         case 'tag':
-            $tag = $action->trimmed('tag');
-            if (!empty($tag)) {
-                $timeline = '/timelines/tag/'.$tag;
-            } else {
-                return true;
-            }
-            break;
-         default:
-            return true;
-        }
-
-        $scripts = array('jquery.comet.js', 'json2.js', 'updatetimeline.js');
+        $scripts = parent::_getScripts();
 
-        foreach ($scripts as $script) {
-            $action->element('script', array('type' => 'text/javascript',
-                                             'src' => common_path('plugins/Comet/'.$script)),
-                         ' ');
-        }
-
-        $user = common_current_user();
+        $ours = array('jquery.comet.js', 'cometupdate.js');
 
-        if (!empty($user->id)) {
-            $user_id = $user->id;
-        } else {
-            $user_id = 0;
+        foreach ($ours as $script) {
+            $scripts[] = common_path('plugins/Comet/'.$script);
         }
 
-        $replyurl = common_local_url('newnotice');
-        $favorurl = common_local_url('favor');
-        // FIXME: need to find a better way to pass this pattern in
-        $deleteurl = common_local_url('deletenotice',
-                                      array('notice' => '0000000000'));
-
-        $action->elementStart('script', array('type' => 'text/javascript'));
-        $action->raw("$(document).ready(function() { updater.init(\"$this->server\", \"$timeline\", $user_id, \"$replyurl\", \"$favorurl\", \"$deleteurl\"); });");
-        $action->elementEnd('script');
-
-        return true;
+        return $scripts;
     }
 
-    function onEndNoticeSave($notice)
+    function _updateInitialize($timeline, $user_id)
     {
-        $this->log(LOG_INFO, "Called for save notice.");
-
-        $timelines = array();
-
-        // XXX: Add other timelines; this is just for the public one
-
-        if ($notice->is_local ||
-            ($notice->is_local == 0 && !common_config('public', 'localonly'))) {
-            $timelines[] = '/timelines/public';
-        }
-
-        $tags = $this->getNoticeTags($notice);
-
-        if (!empty($tags)) {
-            foreach ($tags as $tag) {
-                $timelines[] = '/timelines/tag/' . $tag;
-            }
-        }
-
-        if (count($timelines) > 0) {
-            // Require this, since we need it
-            require_once(INSTALLDIR.'/plugins/Comet/bayeux.class.inc.php');
-
-            $json = $this->noticeAsJson($notice);
-
-            // Bayeux? Comet? Huh? These terms confuse me
-            $bay = new Bayeux($this->server, $this->user, $this->password);
-
-            foreach ($timelines as $timeline) {
-                $this->log(LOG_INFO, "Posting notice $notice->id to '$timeline'.");
-                $bay->publish($timeline, $json);
-            }
-
-            $bay = NULL;
-        }
-
-        return true;
+        $script = parent::_updateInitialize($timeline, $user_id);
+        return $script." CometUpdate.init(\"$this->server\", \"$timeline\", $user_id, \"$this->replyurl\", \"$this->favorurl\", \"$this->deleteurl\");";
     }
 
-    function noticeAsJson($notice)
+    function _connect()
     {
-        // FIXME: this code should be abstracted to a neutral third
-        // party, like Notice::asJson(). I'm not sure of the ethics
-        // of refactoring from within a plugin, so I'm just abusing
-        // the TwitterApiAction method. Don't do this unless you're me!
-
-        require_once(INSTALLDIR.'/lib/twitterapi.php');
-
-        $act = new TwitterApiAction('/dev/null');
-
-        $arr = $act->twitter_status_array($notice, true);
-        $arr['url'] = $notice->bestUrl();
-        $arr['html'] = htmlspecialchars($notice->rendered);
-        $arr['source'] = htmlspecialchars($arr['source']);
-
-        if (!empty($notice->reply_to)) {
-            $reply_to = Notice::staticGet('id', $notice->reply_to);
-            if (!empty($reply_to)) {
-                $arr['in_reply_to_status_url'] = $reply_to->bestUrl();
-            }
-            $reply_to = null;
-        }
-
-        $profile = $notice->getProfile();
-        $arr['user']['profile_url'] = $profile->profileurl;
-
-        return $arr;
+        require_once INSTALLDIR.'/plugins/Comet/bayeux.class.inc.php';
+        // Bayeux? Comet? Huh? These terms confuse me
+        $this->bay = new Bayeux($this->server, $this->user, $this->password);
     }
 
-    function getNoticeTags($notice)
+    function _publish($timeline, $json)
     {
-        $tags = null;
-
-        $nt = new Notice_tag();
-        $nt->notice_id = $notice->id;
-
-        if ($nt->find()) {
-            $tags = array();
-            while ($nt->fetch()) {
-                $tags[] = $nt->tag;
-            }
-        }
-
-        $nt->free();
-        $nt = null;
-
-        return $tags;
+        $this->bay->publish($timeline, $json);
     }
 
-    // Push this up to Plugin
+    function _disconnect()
+    {
+        unset($this->bay);
+    }
 
-    function log($level, $msg)
+    function _pathToChannel($path)
     {
-        common_log($level, get_class($this) . ': '.$msg);
+        if (!empty($this->prefix)) {
+            array_unshift($path, $this->prefix);
+        }
+        return '/' . implode('/', $path);
     }
 }
diff --git a/plugins/Comet/cometupdate.js b/plugins/Comet/cometupdate.js
new file mode 100644
index 000000000..72cca004b
--- /dev/null
+++ b/plugins/Comet/cometupdate.js
@@ -0,0 +1,30 @@
+// update the local timeline from a Comet server
+//
+
+var CometUpdate = function()
+{
+     var _server;
+     var _timeline;
+     var _userid;
+     var _replyurl;
+     var _favorurl;
+     var _deleteurl;
+     var _cometd;
+
+     return {
+          init: function(server, timeline, userid, replyurl, favorurl, deleteurl)
+          {
+               _cometd = $.cometd; // Uses the default Comet object
+               _cometd.init(server);
+               _server = server;
+               _timeline = timeline;
+               _userid = userid;
+               _favorurl = favorurl;
+               _replyurl = replyurl;
+               _deleteurl = deleteurl;
+               _cometd.subscribe(timeline, function(message) { RealtimeUpdate.receive(message.data) });
+               $(window).unload(function() { _cometd.disconnect(); } );
+          }
+     }
+}();
+
diff --git a/plugins/Meteor/MeteorPlugin.php b/plugins/Meteor/MeteorPlugin.php
new file mode 100644
index 000000000..d54d565bd
--- /dev/null
+++ b/plugins/Meteor/MeteorPlugin.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Plugin to do "real time" updates using Comet/Bayeux
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Plugin
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/plugins/Realtime/RealtimePlugin.php';
+
+/**
+ * Plugin to do realtime updates using Meteor
+ *
+ * @category Plugin
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
+
+class MeteorPlugin extends RealtimePlugin
+{
+    public $webserver     = null;
+    public $webport       = null;
+    public $controlport   = null;
+    public $controlserver = null;
+    public $channelbase   = null;
+    protected $_socket    = null;
+
+    function __construct($webserver=null, $webport=4670, $controlport=4671, $controlserver=null, $channelbase='')
+    {
+        global $config;
+
+        $this->webserver     = (empty($webserver)) ? $config['site']['server'] : $webserver;
+        $this->webport       = $webport;
+        $this->controlport   = $controlport;
+        $this->controlserver = (empty($controlserver)) ? $webserver : $controlserver;
+        $this->channelbase   = $channelbase;
+
+        parent::__construct();
+    }
+
+    function _getScripts()
+    {
+        $scripts = parent::_getScripts();
+        $scripts[] = 'http://'.$this->webserver.(($this->webport == 80) ? '':':'.$this->webport).'/meteor.js';
+        $scripts[] = common_path('plugins/Meteor/meteorupdater.js');
+        return $scripts;
+    }
+
+    function _updateInitialize($timeline, $user_id)
+    {
+        $script = parent::_updateInitialize($timeline, $user_id);
+        return $script." MeteorUpdater.init(\"$this->webserver\", $this->webport, \"{$timeline}\");";
+    }
+
+    function _connect()
+    {
+        $controlserver = (empty($this->controlserver)) ? $this->webserver : $this->controlserver;
+        // May throw an exception.
+        $this->_socket = stream_socket_client("tcp://{$controlserver}:{$this->controlport}");
+        if (!$this->_socket) {
+            throw new Exception("Couldn't connect to {$controlserver} on {$this->controlport}");
+        }
+    }
+
+    function _publish($channel, $message)
+    {
+        $message = json_encode($message);
+        $message = addslashes($message);
+        $cmd = "ADDMESSAGE $channel $message\n";
+        $cnt = fwrite($this->_socket, $cmd);
+        $result = fgets($this->_socket);
+        if (preg_match('/^ERR (.*)$/', $result, $matches)) {
+            throw new Exception('Error adding meteor message "'.$matches[1].'"');
+        }
+        // TODO: parse and deal with result
+    }
+
+    function _disconnect()
+    {
+        $cnt = fwrite($this->_socket, "QUIT\n");
+        @fclose($this->_socket);
+    }
+
+    // Meteord flips out with default '/' separator
+
+    function _pathToChannel($path)
+    {
+        if (!empty($this->channelbase)) {
+            array_unshift($path, $this->channelbase);
+        }
+        return implode('-', $path);
+    }
+}
diff --git a/plugins/Meteor/README b/plugins/Meteor/README
new file mode 100644
index 000000000..22f548462
--- /dev/null
+++ b/plugins/Meteor/README
@@ -0,0 +1,27 @@
+This is a plugin to automatically load notices in the browser no
+matter who creates them -- the kind of thing we see with
+search.twitter.com, rejaw.com, or FriendFeed's "real time" news.
+
+It requires a meteor server.
+
+   http://meteorserver.org/
+
+Note that the controller interface needs to be accessible by the Web
+server, and the subscriber interface needs to be accessible by your
+Web users. You MUST firewall the controller interface from users;
+otherwise anyone will be able to push any message to your subscribers.
+Not good!
+
+You can enable the plugin with this line in config.php:
+
+addPlugin('Meteor', array('webserver' => 'meteor server address'));
+
+Available parameters:
+
+* webserver: Web server address. Defaults to site server.
+* webport: port to connect to for Web access. Defaults to 4670.
+* controlserver: Control server address. Defaults to webserver.
+* controlport: port to connect to for control. Defaults to 4671.
+* channelbase: a base string to use for channels. Good if you have
+  multiple sites using the same meteor server.
+
diff --git a/plugins/Meteor/meteorupdater.js b/plugins/Meteor/meteorupdater.js
new file mode 100644
index 000000000..2e688336f
--- /dev/null
+++ b/plugins/Meteor/meteorupdater.js
@@ -0,0 +1,21 @@
+// update the local timeline from a Meteor server
+//
+
+var MeteorUpdater = function()
+{
+     return {
+
+          init: function(server, port, timeline)
+          {
+               Meteor.callbacks["process"] = function(data) {
+                    RealtimeUpdate.receive(JSON.parse(data));
+               };
+
+               Meteor.host = server;
+               Meteor.port = port;
+               Meteor.joinChannel(timeline, 0);
+               Meteor.connect();
+          }
+     }
+}();
+
diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
new file mode 100644
index 000000000..507f0194d
--- /dev/null
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -0,0 +1,229 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Superclass for plugins that do "real time" updates of timelines using Ajax
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Plugin
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Superclass for plugin to do realtime updates
+ *
+ * Based on experience with the Comet and Meteor plugins,
+ * this superclass extracts out some of the common functionality
+ *
+ * @category Plugin
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
+
+class RealtimePlugin extends Plugin
+{
+    protected $replyurl = null;
+    protected $favorurl = null;
+    protected $deleteurl = null;
+
+    function onInitializePlugin()
+    {
+        $this->replyurl = common_local_url('newnotice');
+        $this->favorurl = common_local_url('favor');
+        // FIXME: need to find a better way to pass this pattern in
+        $this->deleteurl = common_local_url('deletenotice',
+                                            array('notice' => '0000000000'));
+    }
+
+    function onEndShowScripts($action)
+    {
+        $path = null;
+
+        switch ($action->trimmed('action')) {
+         case 'public':
+            $path = array('public');
+            break;
+         case 'tag':
+            $tag = $action->trimmed('tag');
+            if (!empty($tag)) {
+                $path = array('tag', $tag);
+            } else {
+                return true;
+            }
+            break;
+         default:
+            return true;
+        }
+
+        $timeline = $this->_pathToChannel($path);
+
+        $scripts = $this->_getScripts();
+
+        foreach ($scripts as $script) {
+            $action->element('script', array('type' => 'text/javascript',
+                                             'src' => $script),
+                         ' ');
+        }
+
+        $user = common_current_user();
+
+        if (!empty($user->id)) {
+            $user_id = $user->id;
+        } else {
+            $user_id = 0;
+        }
+
+        $action->elementStart('script', array('type' => 'text/javascript'));
+        $action->raw("$(document).ready(function() { ");
+        $action->raw($this->_updateInitialize($timeline, $user_id));
+        $action->raw(" });");
+        $action->elementEnd('script');
+
+        return true;
+    }
+
+    function onEndNoticeSave($notice)
+    {
+        $paths = array();
+
+        // XXX: Add other timelines; this is just for the public one
+
+        if ($notice->is_local ||
+            ($notice->is_local == 0 && !common_config('public', 'localonly'))) {
+            $paths[] = array('public');
+        }
+
+        $tags = $this->getNoticeTags($notice);
+
+        if (!empty($tags)) {
+            foreach ($tags as $tag) {
+                $paths[] = array('tag', $tag);
+            }
+        }
+
+        if (count($paths) > 0) {
+
+            $json = $this->noticeAsJson($notice);
+
+            $this->_connect();
+
+            foreach ($paths as $path) {
+                $timeline = $this->_pathToChannel($path);
+                $this->_publish($timeline, $json);
+            }
+
+            $this->_disconnect();
+        }
+
+        return true;
+    }
+
+    function noticeAsJson($notice)
+    {
+        // FIXME: this code should be abstracted to a neutral third
+        // party, like Notice::asJson(). I'm not sure of the ethics
+        // of refactoring from within a plugin, so I'm just abusing
+        // the TwitterApiAction method. Don't do this unless you're me!
+
+        require_once(INSTALLDIR.'/lib/twitterapi.php');
+
+        $act = new TwitterApiAction('/dev/null');
+
+        $arr = $act->twitter_status_array($notice, true);
+        $arr['url'] = $notice->bestUrl();
+        $arr['html'] = htmlspecialchars($notice->rendered);
+        $arr['source'] = htmlspecialchars($arr['source']);
+
+        if (!empty($notice->reply_to)) {
+            $reply_to = Notice::staticGet('id', $notice->reply_to);
+            if (!empty($reply_to)) {
+                $arr['in_reply_to_status_url'] = $reply_to->bestUrl();
+            }
+            $reply_to = null;
+        }
+
+        $profile = $notice->getProfile();
+        $arr['user']['profile_url'] = $profile->profileurl;
+
+        return $arr;
+    }
+
+    function getNoticeTags($notice)
+    {
+        $tags = null;
+
+        $nt = new Notice_tag();
+        $nt->notice_id = $notice->id;
+
+        if ($nt->find()) {
+            $tags = array();
+            while ($nt->fetch()) {
+                $tags[] = $nt->tag;
+            }
+        }
+
+        $nt->free();
+        $nt = null;
+
+        return $tags;
+    }
+
+    // Push this up to Plugin
+
+    function log($level, $msg)
+    {
+        common_log($level, get_class($this) . ': '.$msg);
+    }
+
+    function _getScripts()
+    {
+        return array(common_path('plugins/Realtime/realtimeupdate.js'),
+                     common_path('plugins/Realtime/json2.js'));
+    }
+
+    function _updateInitialize($timeline, $user_id)
+    {
+        return "RealtimeUpdate.init($user_id, \"$this->replyurl\", \"$this->favorurl\", \"$this->deleteurl\"); ";
+    }
+
+    function _connect()
+    {
+    }
+
+    function _publish($timeline, $json)
+    {
+    }
+
+    function _disconnect()
+    {
+    }
+
+    function _pathToChannel($path)
+    {
+        return '';
+    }
+}
diff --git a/plugins/Comet/json2.js b/plugins/Realtime/json2.js
index 7e27df518..7e27df518 100644
--- a/plugins/Comet/json2.js
+++ b/plugins/Realtime/json2.js
diff --git a/plugins/Comet/updatetimeline.js b/plugins/Realtime/realtimeupdate.js
index 170949e9b..d55db5859 100644
--- a/plugins/Comet/updatetimeline.js
+++ b/plugins/Realtime/realtimeupdate.js
@@ -1,41 +1,24 @@
-// update the local timeline from a Comet server
+// add a notice encoded as JSON into the current timeline
 //
 
-var updater = function()
-{
-     var _server;
-     var _timeline;
-     var _userid;
-     var _replyurl;
-     var _favorurl;
-     var _deleteurl;
-     var _cometd;
-
-     return {
-          init: function(server, timeline, userid, replyurl, favorurl, deleteurl)
-          {
-               _cometd = $.cometd; // Uses the default Comet object
-               _cometd.setLogLevel('debug');
-               _cometd.init(server);
-               _server = server;
-               _timeline = timeline;
-               _userid = userid;
-               _favorurl = favorurl;
-               _replyurl = replyurl;
-               _deleteurl = deleteurl;
-               _cometd.subscribe(timeline, receive);
-               $(window).unload(leave);
-          }
-     }
+RealtimeUpdate = {
+
+     _userid: 0,
+     _replyurl: '',
+     _favorurl: '',
+     _deleteurl: '',
 
-     function leave()
+     init: function(userid, replyurl, favorurl, deleteurl)
      {
-          _cometd.disconnect();
-     }
+          RealtimeUpdate._userid = userid;
+          RealtimeUpdate._replyurl = replyurl;
+          RealtimeUpdate._favorurl = favorurl;
+          RealtimeUpdate._deleteurl = deleteurl;
+     },
 
-     function receive(message)
+     receive: function(data)
      {
-          id = message.data.id;
+          id = data.id;
 
           // Don't add it if it already exists
 
@@ -43,15 +26,14 @@ var updater = function()
                return;
           }
 
-          var noticeItem = makeNoticeItem(message.data);
+          var noticeItem = RealtimeUpdate.makeNoticeItem(data);
           $("#notices_primary .notices").prepend(noticeItem, true);
           $("#notices_primary .notice:first").css({display:"none"});
           $("#notices_primary .notice:first").fadeIn(1000);
-          NoticeHover();
           NoticeReply();
-     }
+     },
 
-     function makeNoticeItem(data)
+     makeNoticeItem: function(data)
      {
           user = data['user'];
           html = data['html'].replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&quot;/g,'"');
@@ -93,26 +75,26 @@ var updater = function()
           ni = ni+"</div>"+
                "<div class=\"notice-options\">";
 
-          if (_userid != 0) {
+          if (RealtimeUpdate._userid != 0) {
                var input = $("form#form_notice fieldset input#token");
                var session_key = input.val();
-               ni = ni+makeFavoriteForm(data['id'], session_key);
-               ni = ni+makeReplyLink(data['id'], data['user']['screen_name']);
-               if (_userid == data['user']['id']) {
-                    ni = ni+makeDeleteLink(data['id']);
+               ni = ni+RealtimeUpdate.makeFavoriteForm(data['id'], session_key);
+               ni = ni+RealtimeUpdate.makeReplyLink(data['id'], data['user']['screen_name']);
+               if (RealtimeUpdate._userid == data['user']['id']) {
+                    ni = ni+RealtimeUpdate.makeDeleteLink(data['id']);
                }
           }
 
           ni = ni+"</div>"+
                "</li>";
           return ni;
-     }
+     },
 
-     function makeFavoriteForm(id, session_key)
+     makeFavoriteForm: function(id, session_key)
      {
           var ff;
 
-          ff = "<form id=\"favor-"+id+"\" class=\"form_favor\" method=\"post\" action=\""+_favorurl+"\">"+
+          ff = "<form id=\"favor-"+id+"\" class=\"form_favor\" method=\"post\" action=\""+RealtimeUpdate._favorurl+"\">"+
                "<fieldset>"+
                "<legend>Favor this notice</legend>"+ // XXX: i18n
                "<input name=\"token-"+id+"\" type=\"hidden\" id=\"token-"+id+"\" value=\""+session_key+"\"/>"+
@@ -121,25 +103,25 @@ var updater = function()
                "</fieldset>"+
                "</form>";
           return ff;
-     }
+     },
 
-     function makeReplyLink(id, nickname)
+     makeReplyLink: function(id, nickname)
      {
           var rl;
           rl = "<dl class=\"notice_reply\">"+
                "<dt>Reply to this notice</dt>"+
                "<dd>"+
-               "<a href=\""+_replyurl+"?replyto="+nickname+"\" title=\"Reply to this notice\">Reply <span class=\"notice_id\">"+id+"</span>"+
+               "<a href=\""+RealtimeUpdate._replyurl+"?replyto="+nickname+"\" title=\"Reply to this notice\">Reply <span class=\"notice_id\">"+id+"</span>"+
                "</a>"+
                "</dd>"+
                "</dl>";
           return rl;
-     }
+     },
 
-     function makeDeleteLink(id)
+     makeDeleteLink: function(id)
      {
           var dl, delurl;
-          delurl = _deleteurl.replace("0000000000", id);
+          delurl = RealtimeUpdate._deleteurl.replace("0000000000", id);
 
           dl = "<dl class=\"notice_delete\">"+
                "<dt>Delete this notice</dt>"+
@@ -149,6 +131,5 @@ var updater = function()
                "</dl>";
 
           return dl;
-     }
-}();
-
+     },
+}
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 3426e71c0..3604f193a 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1028,7 +1028,7 @@ border-radius:7px;
 -webkit-border-radius:7px;
 }
 #jOverlayLoading {
-top:22.5%;
+top:5%;
 left:40%;
 }
 #attachment_view img {
author	Jeffery To <jeffery.to@gmail.com>	2009-07-17 16:54:46 +0800
committer	Jeffery To <jeffery.to@gmail.com>	2009-07-17 16:54:46 +0800
commit	1aea5989776e75f3b7af236049d511a28c3f1ff7 (patch)
tree	fbf355767238df2dbdebf086fa2c9e5f51f7dbed
parent	5015505f16c9ce412e6f5535f80188f33d24c4ea (diff)
parent	c32e494c0c480e30317b0f0a8dcae7103c4ff89e (diff)