75 files changed, 49347 insertions, 23595 deletions

diff --git a/actions/api.php b/actions/api.php
index 47c119605..dfe2c8857 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -72,10 +72,14 @@ class ApiAction extends Action
             }
         } else {
 
-            # Look for the user in the session
-            if (common_logged_in()) {
-                 $this->user = common_current_user();
-            }
+			# Caller might give us a username even if not required
+			if (isset($_SERVER['PHP_AUTH_USER'])) {
+				$user = User::staticGet('nickname', $_SERVER['PHP_AUTH_USER']);
+				if ($user) {
+					$this->user = $user;
+				}
+				# Twitter doesn't throw an error if the user isn't found
+			}
 
             $this->process_command();
         }
diff --git a/actions/grouplogo.php b/actions/grouplogo.php
new file mode 100644
index 000000000..393070d5d
--- /dev/null
+++ b/actions/grouplogo.php
@@ -0,0 +1,511 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Upload an avatar
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Settings
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Zach Copley <zach@controlyourself.ca>
+ * @copyright 2008-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/accountsettingsaction.php';
+
+/**
+ * Upload an avatar
+ *
+ * We use jCrop plugin for jQuery to crop the image after upload.
+ *
+ * @category Settings
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@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 GrouplogoAction extends Action
+{
+    var $mode = null;
+    var $imagefile = null;
+    var $filename = null;
+
+    /**
+     * Prepare to run
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        if (!common_config('inboxes','enabled')) {
+            $this->serverError(_('Inboxes must be enabled for groups to work'));
+            return false;
+        }
+
+        if (!common_logged_in()) {
+            $this->clientError(_('You must be logged in to create a group.'));
+            return false;
+        }
+
+        $nickname_arg = $this->trimmed('nickname');
+        $nickname = common_canonical_nickname($nickname_arg);
+
+        // Permanent redirect on non-canonical nickname
+
+        if ($nickname_arg != $nickname) {
+            $args = array('nickname' => $nickname);
+            common_redirect(common_local_url('editgroup', $args), 301);
+            return false;
+        }
+
+        if (!$nickname) {
+            $this->clientError(_('No nickname'), 404);
+            return false;
+        }
+
+        $groupid = $this->trimmed('groupid');
+
+        if ($groupid) {
+            $this->group = User_group::staticGet('id', $groupid);
+        } else {
+            $this->group = User_group::staticGet('nickname', $nickname);
+        }
+
+        if (!$this->group) {
+            $this->clientError(_('No such group'), 404);
+            return false;
+        }
+
+        $cur = common_current_user();
+
+        if (!$cur->isAdmin($this->group)) {
+            $this->clientError(_('You must be an admin to edit the group'), 403);
+            return false;
+        }
+
+        return true;
+    }
+
+    function handle($args)
+    {
+        parent::handle($args);
+        if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+            $this->handlePost();
+        } else {
+            $this->showForm();
+        }
+    }
+
+    function showForm($msg = null)
+    {
+        $this->msg = $msg;
+        $this->showPage();
+    }
+
+    /**
+     * Title of the page
+     *
+     * @return string Title of the page
+     */
+
+    function title()
+    {
+        return _('Group logo');
+    }
+
+    /**
+     * Instructions for use
+     *
+     * @return instructions for use
+     */
+
+    function getInstructions()
+    {
+        return _('You can upload a logo image for your group.');
+    }
+
+    /**
+     * Content area of the page
+     *
+     * Shows a form for uploading an avatar.
+     *
+     * @return void
+     */
+
+    function showContent()
+    {
+        if ($this->mode == 'crop') {
+            $this->showCropForm();
+        } else {
+            $this->showUploadForm();
+        }
+    }
+
+    function showUploadForm()
+    {
+        $user = common_current_user();
+
+        $profile = $user->getProfile();
+
+        if (!$profile) {
+            common_log_db_error($user, 'SELECT', __FILE__);
+            $this->serverError(_('User without matching profile'));
+            return;
+        }
+
+        $original = $this->group->original_logo;
+
+        $this->elementStart('form', array('enctype' => 'multipart/form-data',
+                                          'method' => 'post',
+                                          'id' => 'form_settings_logo',
+                                          'class' => 'form_settings',
+                                          'action' =>
+                                          common_local_url('grouplogo',
+                                                           array('nickname' => $this->group->nickname))));
+        $this->elementStart('fieldset');
+        $this->element('legend', null, _('Group logo'));
+        $this->hidden('token', common_session_token());
+
+        $this->elementStart('ul', 'form_data');
+        if ($original) {
+            $this->elementStart('li', array('id' => 'avatar_original',
+                                            'class' => 'avatar_view'));
+            $this->element('h2', null, _("Original"));
+            $this->elementStart('div', array('id'=>'avatar_original_view'));
+            $this->element('img', array('src' => $this->group->original_logo,
+                                        'alt' => $this->group->nickname));
+            $this->elementEnd('div');
+            $this->elementEnd('li');
+        }
+
+        if ($this->group->homepage_logo) {
+            $this->elementStart('li', array('id' => 'avatar_preview',
+                                            'class' => 'avatar_view'));
+            $this->element('h2', null, _("Preview"));
+            $this->elementStart('div', array('id'=>'avatar_preview_view'));
+            $this->element('img', array('src' => $this->group->homepage_logo,
+                                        'width' => AVATAR_PROFILE_SIZE,
+                                        'height' => AVATAR_PROFILE_SIZE,
+                                        'alt' => $this->group->nickname));
+            $this->elementEnd('div');
+            $this->elementEnd('li');
+        }
+
+        $this->elementStart('li', array ('id' => 'settings_attach'));
+        $this->element('input', array('name' => 'avatarfile',
+                                      'type' => 'file',
+                                      'id' => 'avatarfile'));
+        $this->element('input', array('name' => 'MAX_FILE_SIZE',
+                                      'type' => 'hidden',
+                                      'id' => 'MAX_FILE_SIZE',
+                                      'value' => MAX_AVATAR_SIZE));
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
+
+        $this->elementStart('ul', 'form_actions');
+        $this->elementStart('li');
+        $this->submit('upload', _('Upload'));
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
+
+        $this->elementEnd('fieldset');
+        $this->elementEnd('form');
+
+    }
+
+    function showCropForm()
+    {
+        $this->elementStart('form', array('method' => 'post',
+                                          'id' => 'form_settings_avatar',
+                                          'class' => 'form_settings',
+                                          'action' =>
+                                          common_local_url('grouplogo',
+                                                           array('nickname' => $this->group->nickname))));
+        $this->elementStart('fieldset');
+        $this->element('legend', null, _('Avatar settings'));
+        $this->hidden('token', common_session_token());
+
+        $this->elementStart('ul', 'form_data');
+
+        $this->elementStart('li',
+                            array('id' => 'avatar_original',
+                                  'class' => 'avatar_view'));
+        $this->element('h2', null, _("Original"));
+        $this->elementStart('div', array('id'=>'avatar_original_view'));
+        $this->element('img', array('src' => common_avatar_url($this->filedata['filename']),
+                                    'width' => $this->filedata['width'],
+                                    'height' => $this->filedata['height'],
+                                    'alt' => $this->group->nickname));
+        $this->elementEnd('div');
+        $this->elementEnd('li');
+
+        $this->elementStart('li',
+                            array('id' => 'avatar_preview',
+                                  'class' => 'avatar_view'));
+        $this->element('h2', null, _("Preview"));
+        $this->elementStart('div', array('id'=>'avatar_preview_view'));
+        $this->element('img', array('src' => common_avatar_url($this->filedata['filename']),
+                                    'width' => AVATAR_PROFILE_SIZE,
+                                    'height' => AVATAR_PROFILE_SIZE,
+                                    'alt' => $this->group->nickname));
+        $this->elementEnd('div');
+
+        foreach (array('avatar_crop_x', 'avatar_crop_y',
+                       'avatar_crop_w', 'avatar_crop_h') as $crop_info) {
+            $this->element('input', array('name' => $crop_info,
+                                          'type' => 'hidden',
+                                          'id' => $crop_info));
+        }
+        $this->submit('crop', _('Crop'));
+
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
+        $this->elementEnd('fieldset');
+        $this->elementEnd('form');
+
+    }
+
+    /**
+     * Handle a post
+     *
+     * We mux on the button name to figure out what the user actually wanted.
+     *
+     * @return void
+     */
+
+    function handlePost()
+    {
+        // CSRF protection
+
+        $token = $this->trimmed('token');
+        if (!$token || $token != common_session_token()) {
+            $this->show_form(_('There was a problem with your session token. '.
+                               'Try again, please.'));
+            return;
+        }
+
+        if ($this->arg('upload')) {
+            $this->uploadAvatar();
+        } else if ($this->arg('crop')) {
+            $this->cropAvatar();
+        } else {
+            $this->showForm(_('Unexpected form submission.'));
+        }
+    }
+
+    /**
+     * Handle an image upload
+     *
+     * Does all the magic for handling an image upload, and crops the
+     * image by default.
+     *
+     * @return void
+     */
+
+    function uploadAvatar()
+    {
+        try {
+            $imagefile = ImageFile::fromUpload('avatarfile');
+        } catch (Exception $e) {
+            $this->showForm($e->getMessage());
+            return;
+        }
+
+        $filename = common_avatar_filename($this->group->id,
+                                           image_type_to_extension($imagefile->type),
+                                           null,
+                                           'group-temp-'.common_timestamp());
+
+        $filepath = common_avatar_path($filename);
+
+        move_uploaded_file($imagefile->filename, $filepath);
+
+        $filedata = array('filename' => $filename,
+                          'filepath' => $filepath,
+                          'width' => $imagefile->width,
+                          'height' => $imagefile->height,
+                          'type' => $imagefile->type);
+
+        $_SESSION['FILEDATA'] = $filedata;
+
+        $this->filedata = $filedata;
+
+        $this->mode = 'crop';
+
+        $this->showForm(_('Pick a square area of the image to be your avatar'),
+                        true);
+    }
+
+    /**
+     * Handle the results of jcrop.
+     *
+     * @return void
+     */
+
+    function cropAvatar()
+    {
+        $user = common_current_user();
+
+        $profile = $user->getProfile();
+
+        $x = $this->arg('avatar_crop_x');
+        $y = $this->arg('avatar_crop_y');
+        $w = $this->arg('avatar_crop_w');
+        $h = $this->arg('avatar_crop_h');
+
+        $filedata = $_SESSION['FILEDATA'];
+
+        if (!$filedata) {
+            $this->serverError(_('Lost our file data.'));
+            return;
+        }
+
+        $filepath = common_avatar_path($filedata['filename']);
+
+        if (!file_exists($filepath)) {
+            $this->serverError(_('Lost our file.'));
+            return;
+        }
+
+        switch ($filedata['type']) {
+        case IMAGETYPE_GIF:
+            $image_src = imagecreatefromgif($filepath);
+            break;
+        case IMAGETYPE_JPEG:
+            $image_src = imagecreatefromjpeg($filepath);
+            break;
+        case IMAGETYPE_PNG:
+            $image_src = imagecreatefrompng($filepath);
+            break;
+         default:
+            $this->serverError(_('Unknown file type'));
+            return;
+        }
+
+        common_debug("W = $w, H = $h, X = $x, Y = $y");
+
+        $image_dest = imagecreatetruecolor($w, $h);
+
+        $background = imagecolorallocate($image_dest, 0, 0, 0);
+        ImageColorTransparent($image_dest, $background);
+        imagealphablending($image_dest, false);
+
+        imagecopyresized($image_dest, $image_src, 0, 0, $x, $y, $w, $h, $w, $h);
+
+        $cur = common_current_user();
+
+        $filename = common_avatar_filename($this->group->id,
+                                           image_type_to_extension($imagefile->type),
+                                           null,
+                                           'group-'.common_timestamp());
+
+        $filepath = common_avatar_path($filename);
+
+        switch ($filedata['type']) {
+        case IMAGETYPE_GIF:
+            imagegif($image_dest, $filepath);
+            break;
+        case IMAGETYPE_JPEG:
+            imagejpeg($image_dest, $filepath);
+            break;
+        case IMAGETYPE_PNG:
+            imagepng($image_dest, $filepath);
+            break;
+         default:
+            $this->serverError(_('Unknown file type'));
+            return;
+        }
+
+        if ($this->group->setOriginal($filename, $filedata['type'])) {
+            @unlink(common_avatar_path($filedata['filename']));
+            unset($_SESSION['FILEDATA']);
+            $this->mode = 'upload';
+            $this->showForm(_('Logo updated.'), true);
+        } else {
+            $this->showForm(_('Failed updating logo.'));
+        }
+    }
+
+    function showPageNotice()
+    {
+        if ($this->msg) {
+            $this->element('div', ($this->success) ? 'success' : 'error',
+                           $this->msg);
+        } else {
+            $inst   = $this->getInstructions();
+            $output = common_markup_to_html($inst);
+
+            $this->elementStart('div', 'instructions');
+            $this->raw($output);
+            $this->elementEnd('div');
+        }
+    }
+
+    /**
+     * Add the jCrop stylesheet
+     *
+     * @return void
+     */
+
+    function showStylesheets()
+    {
+        parent::showStylesheets();
+        $jcropStyle =
+          common_path('theme/base/css/jquery.Jcrop.css?version='.LACONICA_VERSION);
+
+        $this->element('link', array('rel' => 'stylesheet',
+                                     'type' => 'text/css',
+                                     'href' => $jcropStyle,
+                                     'media' => 'screen, projection, tv'));
+    }
+
+    /**
+     * Add the jCrop scripts
+     *
+     * @return void
+     */
+
+    function showScripts()
+    {
+        parent::showScripts();
+
+        $jcropPack = common_path('js/jcrop/jquery.Jcrop.pack.js');
+        $jcropGo   = common_path('js/jcrop/jquery.Jcrop.go.js');
+
+        $this->element('script', array('type' => 'text/javascript',
+                                       'src' => $jcropPack));
+        $this->element('script', array('type' => 'text/javascript',
+                                       'src' => $jcropGo));
+    }
+
+    function showLocalNav()
+    {
+        $nav = new GroupNav($this, $this->group);
+        $nav->show();
+    }
+}
diff --git a/actions/twitapiaccount.php b/actions/twitapiaccount.php
index e51a29a2d..dc8e2e798 100644
--- a/actions/twitapiaccount.php
+++ b/actions/twitapiaccount.php
@@ -24,17 +24,20 @@ require_once(INSTALLDIR.'/lib/twitterapi.php');
 class TwitapiaccountAction extends TwitterapiAction
 {
 
-    function verify_credentials($args, $apidata)
+	function verify_credentials($args, $apidata)
     {
-        parent::handle($args);
 
-        if (!in_array($apidata['content-type'], array('xml', 'json'))) {
-            $this->clientError(_('API method not found!'), $code = 404);
-            return;
-        }
+		if ($apidata['content-type'] == 'xml') {
+			header('Content-Type: application/xml; charset=utf-8');
+			print '<authorized>true</authorized>';
+		} elseif ($apidata['content-type'] == 'json') {
+			header('Content-Type: application/json; charset=utf-8');
+			print '{"authorized":true}';
+		} else {
+			common_user_error(_('API method not found!'), $code=404);
+		}
 
-        $this->show_extended_profile($apidata['user'], $apidata);
-    }
+	}
 
     function end_session($args, $apidata)
     {
@@ -99,4 +102,4 @@ class TwitapiaccountAction extends TwitterapiAction
         parent::handle($args);
         $this->serverError(_('API method under construction.'), $code=501);
     }
-}
\ No newline at end of file
+}
diff --git a/actions/twitapiusers.php b/actions/twitapiusers.php
index ed2417561..8f16e5613 100644
--- a/actions/twitapiusers.php
+++ b/actions/twitapiusers.php
@@ -33,22 +33,88 @@ class TwitapiusersAction extends TwitterapiAction
             return;
         }
 
-        $user = null;
-        $email = $this->arg('email');
+ $this->auth_user = $apidata['user'];
+		$user = null;
+		$email = $this->arg('email');
 
-        if ($email) {
-            $user = User::staticGet('email', $email);
-        } elseif (isset($apidata['api_arg'])) {
-            $user = $this->get_user($apidata['api_arg']);
-        }
+		if ($email) {
+			$user = User::staticGet('email', $email);
+		} elseif (isset($apidata['api_arg'])) {
+			$user = $this->get_user($apidata['api_arg']);
+		}
 
-        if (!$user) {
-            // XXX: Twitter returns a random(?) user instead of throwing and err! -- Zach
-            $this->clientError(_('Not found.'), 404, $apidata['content-type']);
-            return;
-        }
+		if (!$user) {
+			// XXX: Twitter returns a random(?) user instead of throwing and err! -- Zach
+			$this->client_error(_('Not found.'), 404, $apidata['content-type']);
+			return;
+		}
+
+		$profile = $user->getProfile();
+
+		if (!$profile) {
+			common_server_error(_('User has no profile.'));
+			return;
+		}
+
+		$twitter_user = $this->twitter_user_array($profile, true);
+
+		// Add in extended user fields offered up by this method
+		$twitter_user['created_at'] = $this->date_twitter($profile->created);
+
+		$subbed = DB_DataObject::factory('subscription');
+		$subbed->subscriber = $profile->id;
+		$subbed_count = (int) $subbed->count() - 1;
+
+		$notices = DB_DataObject::factory('notice');
+		$notices->profile_id = $profile->id;
+		$notice_count = (int) $notices->count();
+
+		$twitter_user['friends_count'] = (is_int($subbed_count)) ? $subbed_count : 0;
+		$twitter_user['statuses_count'] = (is_int($notice_count)) ? $notice_count : 0;
+
+		// Other fields Twitter sends...
+		$twitter_user['profile_background_color'] = '';
+		$twitter_user['profile_text_color'] = '';
+		$twitter_user['profile_link_color'] = '';
+		$twitter_user['profile_sidebar_fill_color'] = '';
+
+		$faves = DB_DataObject::factory('fave');
+		$faves->user_id = $user->id;
+		$faves_count = (int) $faves->count();
+		$twitter_user['favourites_count'] = $faves_count;
+
+		$timezone = 'UTC';
+
+		if ($user->timezone) {
+			$timezone = $user->timezone;
+		}
+
+		$t = new DateTime;
+		$t->setTimezone(new DateTimeZone($timezone));
+		$twitter_user['utc_offset'] = $t->format('Z');
+		$twitter_user['time_zone'] = $timezone;
+
+		if (isset($this->auth_user)) {
+
+			if ($this->auth_user->isSubscribed($profile)) {
+				$twitter_user['following'] = 'true';
+			} else {
+				$twitter_user['following'] = 'false';
+			}
+
+			// Not implemented yet
+			$twitter_user['notifications'] = 'false';
+		}
 
-        $this->show_extended_profile($user, $apidata);
-    }
+		if ($apidata['content-type'] == 'xml') {
+			$this->init_document('xml');
+			$this->show_twitter_xml_user($twitter_user);
+			$this->end_document('xml');
+		} elseif ($apidata['content-type'] == 'json') {
+			$this->init_document('json');
+			$this->show_json_objects($twitter_user);
+			$this->end_document('json');
+		}
 
+	}
 }
diff --git a/classes/Notice.php b/classes/Notice.php
index de7540705..4a06c9258 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -129,6 +129,8 @@ class Notice extends Memcached_DataObject
             $notice->is_local = $is_local;
         }
 
+		$notice->query('BEGIN');
+
         $notice->reply_to = $reply_to;
         $notice->created = common_sql_now();
         $notice->content = common_shorten_links($content);
@@ -160,6 +162,9 @@ class Notice extends Memcached_DataObject
         $notice->saveTags();
         $notice->saveGroups();
 
+        $notice->addToInboxes();
+		$notice->query('COMMIT');
+
         # Clear the cache for subscribed users, so they'll update at next request
         # XXX: someone clever could prepend instead of clearing the cache
 
@@ -167,7 +172,6 @@ class Notice extends Memcached_DataObject
             $notice->blowCaches();
         }
 
-        $notice->addToInboxes();
         return $notice;
     }
 
diff --git a/classes/User.php b/classes/User.php
index 5f4fb9b6f..b1bae8835 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -403,7 +403,7 @@ class User extends Memcached_DataObject
               'FROM notice JOIN notice_inbox ON notice.id = notice_inbox.notice_id ' .
               'WHERE notice_inbox.user_id = %d ';
             # NOTE: we override ORDER
-            $order = 'ORDER BY notice_inbox.created DESC, notice_inbox.notice_id DESC ';
+            $order = null;
         }
         return Notice::getStream(sprintf($qry, $this->id),
                                  'user:notices_with_friends:' . $this->id,
diff --git a/classes/User_group.php b/classes/User_group.php
index 484b2fe0a..98ad77cc0 100755
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -86,4 +86,82 @@ class User_group extends Memcached_DataObject
 
         return $members;
     }
+
+    function setOriginal($filename, $type)
+    {
+        $orig = clone($this);
+        $this->original_logo = common_avatar_url($filename);
+        $this->homepage_logo = common_avatar_url($this->scale($filename,
+                                                                      AVATAR_PROFILE_SIZE,
+                                                                      $type));
+        $this->stream_logo = common_avatar_url($this->scale($filename,
+                                                                    AVATAR_STREAM_SIZE,
+                                                                      $type));
+        $this->mini_logo = common_avatar_url($this->scale($filename,
+                                                                  AVATAR_MINI_SIZE,
+                                                                  $type));
+        common_debug(common_log_objstring($this));
+        return $this->update($orig);
+    }
+
+    function scale($filename, $size, $type)
+    {
+        $filepath = common_avatar_path($filename);
+
+        if (!file_exists($filepath)) {
+            $this->serverError(_('Lost our file.'));
+            return;
+        }
+
+        $info = @getimagesize($filepath);
+
+        switch ($type) {
+        case IMAGETYPE_GIF:
+            $image_src = imagecreatefromgif($filepath);
+            break;
+        case IMAGETYPE_JPEG:
+            $image_src = imagecreatefromjpeg($filepath);
+            break;
+        case IMAGETYPE_PNG:
+            $image_src = imagecreatefrompng($filepath);
+            break;
+         default:
+            $this->serverError(_('Unknown file type'));
+            return;
+        }
+
+        $image_dest = imagecreatetruecolor($size, $size);
+
+        $background = imagecolorallocate($image_dest, 0, 0, 0);
+        ImageColorTransparent($image_dest, $background);
+        imagealphablending($image_dest, false);
+
+        imagecopyresized($image_dest, $image_src, 0, 0, $x, $y, $size, $size, $info[0], $info[1]);
+
+        $cur = common_current_user();
+
+        $outname = common_avatar_filename($cur->id,
+                                          image_type_to_extension($type),
+                                          null,
+                                          common_timestamp());
+
+        $outpath = common_avatar_path($outname);
+
+        switch ($type) {
+        case IMAGETYPE_GIF:
+            imagegif($image_dest, $outpath);
+            break;
+        case IMAGETYPE_JPEG:
+            imagejpeg($image_dest, $outpath);
+            break;
+        case IMAGETYPE_PNG:
+            imagepng($image_dest, $outpath);
+            break;
+         default:
+            $this->serverError(_('Unknown file type'));
+            return;
+        }
+
+        return $outname;
+    }
 }
diff --git a/db/laconica_pg.sql b/db/laconica_pg.sql
index e784bb169..eb0dfc0ee 100644
--- a/db/laconica_pg.sql
+++ b/db/laconica_pg.sql
@@ -49,7 +49,8 @@ create table "user" (
     emailnotifysub integer default 1 /* comment 'Notify by email of subscriptions' */,

     emailnotifyfav integer default 1 /* comment 'Notify by email of favorites' */,

     emailnotifynudge integer default 1 /* comment 'Notify by email of nudges' */,

-    emailmicroid integer default 1 /* comment 'whether to publish email microid' */,

+    emailnotifymsg integer default 1 / * comment 'Notify by email of direct messages' */,

+emailmicroid integer default 1 /* comment 'whether to publish email microid' */,

     language varchar(50) /* comment 'preferred language' */,

     timezone varchar(50) /* comment 'timezone' */,

     emailpost integer default 1 /* comment 'Post by email' */,

@@ -66,6 +67,7 @@ create table "user" (
     uri varchar(255) unique /* comment 'universally unique identifier, usually a tag URI' */,

     autosubscribe integer default 0 /* comment 'automatically subscribe to users who subscribe to us' */,

     urlshorteningservice varchar(50) default 'ur1.ca' /* comment 'service to use for auto-shortening URLs' */,

+    inboxed integer default 0 /* comment 'has an inbox been created for this user?' */, 

     created timestamp not null /* comment 'date this record was created' */,

     modified timestamp /* comment 'date this record was modified' */

 

@@ -86,6 +88,8 @@ create table remote_profile (
 create table subscription (

     subscriber integer not null /* comment 'profile listening' */,

     subscribed integer not null /* comment 'profile being listened to' */,

+    jabber integer default 1 /* comment 'deliver jabber messages',

+    sms integer default 1 comment 'deliver sms messages',

     token varchar(255) /* comment 'authorization token' */,

     secret varchar(255) /* comment 'token secret' */,

     created timestamp not null /* comment 'date this record was created' */,

@@ -271,8 +275,6 @@ create table foreign_user (
      service int not null /* comment 'foreign key to service' */ references foreign_service(id) ,

      uri varchar(255) not null unique /* comment 'identifying URI' */,

      nickname varchar(255) /* comment 'nickname on foreign service' */,

-     user_id int /* comment 'link to user on this system, if exists' */ references "user" (id),  

-     credentials varchar(255) /* comment 'authc credentials, typically a password' */,

      created timestamp not null /* comment 'date this record was created' */,

      modified timestamp /* comment 'date this record was modified' */,

      

@@ -280,11 +282,25 @@ create table foreign_user (
 );

 create index foreign_user_user_id_idx on foreign_user using btree(user_id);

 

+create table foreign_link (

+     user_id int /* comment 'link to user on this system, if exists' */ references "user" (id),

+     foreign_id int /* comment 'link' */ references foreign_user (id),

+     service int not null /* comment 'foreign key to service' */ references foreign_service (id),

+     credentials varchar(255) /* comment 'authc credentials, typically a password',

+     noticesync int not null default 1 /* comment 'notice synchronisation, bit 1 = sync outgoing, bit 2 = sync incoming, bit 3 = filter local replies' */,

+     friendsync int not null default 2 /* comment 'friend synchronisation, bit 1 = sync outgoing, bit 2 = sync incoming 

+     created timestamp not null /* comment 'date this record was created' */,

+     modified timestamp not null /* comment 'date this record was modified' */,

+

+     primary key (user_id,foreign_id,service)

+);

+create index foreign_user_user_id_idx on foreign_link using btree(user_id);

+

 create table foreign_subscription (

      service int not null /* comment 'service where relationship happens' */ references foreign_service(id) ,

      subscriber int not null /* comment 'subscriber on foreign service' */ ,

      subscribed int not null /* comment 'subscribed user' */ ,

-     created timestamp not null /* comment 'date this record was created' */,

+     created timestamp not null /* comment 'date this record was created' /,

      

      primary key (service, subscriber, subscribed)

 );

@@ -320,6 +336,38 @@ create index message_from_idx on message using btree(from_profile);
 create index message_to_idx on message using btree(to_profile);

 create index message_created_idx on message using btree(created);

 

+create table notice_inbox (

+

+    user_id integer not null /* comment 'user receiving the message' */ references user (id),

+    notice_id integer not null /* comment 'notice received' */ references notice (id),

+    created datetime not null /* comment 'date the notice was created' */,

+    source integer default 1 /* comment 'reason it is in the inbox; 1=subscription' */,

+

+    primary key (user_id, notice_id)

+);

+create index notice_inbox_notice_id_idx (notice_id) on notice_inbox using btree(notice_id);

+

+create table profile_tag (

+   tagger integer not null /* comment 'user making the tag' */ references "user" (id),

+   tagged integer not null /* comment 'profile tagged' */ references profile (id),

+   tag varchar(64) not null /* comment 'hash tag associated with this notice' */,

+   modified timestamp /* comment 'date the tag was added' */,

+

+   primary key (tagger, tagged, tag)

+);

+create index profile_tag_modified_idx on profile_tag using btree(modified);

+create index profile_tag_tagger_tag_idx on profile_tag using btree(tagger,tag);

+

+create table profile_block (

+

+   blocker integer not null i/* comment 'user making the block' */ references user (id),

+   blocked integer not null /* comment 'profile that is blocked' */ references profile (id),

+   modified timestamp /* comment 'date of blocking' */,

+

+   primary key (blocker, blocked)

+

+);

+

 /* Textsearch stuff */

 

 create index textsearch_idx on profile using gist(textsearch);

diff --git a/htaccess.sample b/htaccess.sample
index d94652bfd..5f9827f96 100644
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -89,13 +89,14 @@ RewriteRule ^peopletag/([a-zA-Z0-9]+)$ index.php?action=peopletag&tag=$1 [L,QSA]
 RewriteRule ^featured/?$ index.php?action=featured [L,QSA]
 RewriteRule ^favorited/?$ index.php?action=favorited [L,QSA]
 
-RewriteRule ^group/new index.php?action=newgroup [L,QSA]
-RewriteRule ^group/([a-zA-Z0-9]+)/edit index.php?action=editgroup&nickname=$1 [L,QSA]
-RewriteRule ^group/([a-zA-Z0-9]+)/join index.php?action=joingroup&nickname=$1 [L,QSA]
-RewriteRule ^group/([a-zA-Z0-9]+)/leave index.php?action=leavegroup&nickname=$1 [L,QSA]
-RewriteRule ^group/([a-zA-Z0-9]+)/members index.php?action=groupmembers&nickname=$1 [L,QSA]
-RewriteRule ^group/([0-9]+)/id index.php?action=groupbyid&id=$1 [L,QSA]
-RewriteRule ^group/([a-zA-Z0-9]+)/rss index.php?action=grouprss&nickname=$1 [L,QSA]
+RewriteRule ^group/new$ index.php?action=newgroup [L,QSA]
+RewriteRule ^group/([a-zA-Z0-9]+)/edit$ index.php?action=editgroup&nickname=$1 [L,QSA]
+RewriteRule ^group/([a-zA-Z0-9]+)/join$ index.php?action=joingroup&nickname=$1 [L,QSA]
+RewriteRule ^group/([a-zA-Z0-9]+)/leave$ index.php?action=leavegroup&nickname=$1 [L,QSA]
+RewriteRule ^group/([a-zA-Z0-9]+)/members$ index.php?action=groupmembers&nickname=$1 [L,QSA]
+RewriteRule ^group/([a-zA-Z0-9]+)/logo$ index.php?action=grouplogo&nickname=$1 [L,QSA]
+RewriteRule ^group/([0-9]+)/id$ index.php?action=groupbyid&id=$1 [L,QSA]
+RewriteRule ^group/([a-zA-Z0-9]+)/rss$ index.php?action=grouprss&nickname=$1 [L,QSA]
 RewriteRule ^group/([a-zA-Z0-9]+)$ index.php?action=showgroup&nickname=$1 [L,QSA]
 RewriteRule ^group$ index.php?action=groups [L,QSA]
 
diff --git a/lib/common.php b/lib/common.php
index 1068d4c13..a2f9b9bfe 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -19,7 +19,7 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-define('LACONICA_VERSION', '0.6.4.1');
+define('LACONICA_VERSION', '0.7.0');
 
 define('AVATAR_PROFILE_SIZE', 96);
 define('AVATAR_STREAM_SIZE', 48);
diff --git a/lib/groupnav.php b/lib/groupnav.php
index 32803fd42..90bdc1014 100644
--- a/lib/groupnav.php
+++ b/lib/groupnav.php
@@ -101,6 +101,12 @@ class GroupNav extends Widget
                                  sprintf(_('Edit %s group properties'), $nickname),
                                  $action_name == 'editgroup',
                                  'nav_group_admin');
+            $this->out->menuItem(common_local_url('grouplogo', array('nickname' =>
+                                                                     $nickname)),
+                                 _('Logo'),
+                                 sprintf(_('Add or edit %s logo'), $nickname),
+                                 $action_name == 'grouplogo',
+                                 'nav_group_logo');
         }
         $this->out->elementEnd('ul');
     }
diff --git a/lib/language.php b/lib/language.php
index 1d00cc31e..a73b73f28 100644
--- a/lib/language.php
+++ b/lib/language.php
@@ -99,54 +99,35 @@ function get_nice_language_list()
  *
  * @return array mapping of language codes to language info
  */
-
-function get_all_languages()
-{
-    return
-      array('en-us' => array('q' => 1, 'lang' => 'en_US',
-                             'name' => 'English (US)', 'direction' => 'ltr'),
-            'en-nz' => array('q' => 1, 'lang' => 'en_NZ',
-                             'name' => 'English (NZ)', 'direction' => 'ltr'),
-            'en-gb' => array('q' => 1, 'lang' => 'en_GB',
-                             'name' => 'English (British)', 'direction' => 'ltr'),
-            'en' => array('q' => 1, 'lang' => 'en',
-                          'name' => 'English', 'direction' => 'ltr'),
-            'da' => array('q' => 0.1, 'lang' => 'da_DK',
-                          'name' => 'Danish', 'direction' => 'ltr'),
-            'nl' => array('q' => 1, 'lang' => 'nl_NL',
-                          'name' => 'Dutch', 'direction' => 'ltr'),
-            'eo' => array('q' => 0.1, 'lang' => 'eo',
-                          'name' => 'Esperanto', 'direction' => 'ltr'),
-            'fr-fr' => array('q' => 0.9, 'lang' => 'fr_FR',
-                             'name' => 'French', 'direction' => 'ltr'),
-            'de' => array('q' => 1, 'lang' => 'de_DE',
-                          'name' => 'German', 'direction' => 'ltr'),
-            'it' => array('q' => 1, 'lang' => 'it_IT',
-                          'name' => 'Italian', 'direction' => 'ltr'),
-            'ko' => array('q' => 0.1, 'lang' => 'ko',
-                          'name' => 'Korean', 'direction' => 'ltr'),
-            'nb' => array('q' => 1, 'lang' => 'nb_NO',
-                          'name' => 'Norwegian (bokmal)', 'direction' => 'ltr'),
-            'pt' => array('q' => 0.2, 'lang' => 'pt',
-                          'name' => 'Portuguese', 'direction' => 'ltr'),
-            'pt-br' => array('q' => 1, 'lang' => 'pt_BR',
-                             'name' => 'Portuguese Brazil', 'direction' => 'ltr'),
-            'es' => array('q' => 1, 'lang' => 'es',
-                          'name' => 'Spanish', 'direction' => 'ltr'),
-            'tr' => array('q' => 1, 'lang' => 'tr_TR',
-                          'name' => 'Turkish', 'direction' => 'ltr'),
-            'uk' => array('q' => 1, 'lang' => 'uk_UA',
-                          'name' => 'Ukrainian', 'direction' => 'ltr'),
-            'pl' => array('q' => 1, 'lang' => 'pl_PL',
-                          'name' => 'Polish', 'direction' => 'ltr'),
-            'mk' => array('q' => 1, 'lang' => 'mk_MK',
-                          'name' => 'Macedonian', 'direction' => 'ltr'),
-            'jp' => array('q' => 0.1, 'lang' => 'ja_JP',
-                          'name' => 'Japanese', 'direction' => 'ltr'),
-            'cs' => array('q' => 1, 'lang' => 'cs_CZ',
-                          'name' => 'Czech', 'direction' => 'ltr'),
-            'ca' => array('q' => 1, 'lang' => 'ca_ES',
-                          'name' => 'Catalan', 'direction' => 'ltr'),
-            );
+function get_all_languages() {
+	return array(
+		'bg' => array('q' => 0.8, 'lang' => 'bg_BG', 'name' => 'Bulgarian', 'direction' => 'ltr'),
+		'ca'	=> array('q' => 0.5, 'lang' => 'ca_ES', 'name' => 'Catalan', 'direction' => 'ltr'),
+		'cs'	=> array('q' => 0.5, 'lang' => 'cs_CZ', 'name' => 'Czech', 'direction' => 'ltr'),
+		'de'    => array('q' => 0.5, 'lang' => 'de_DE', 'name' => 'German', 'direction' => 'ltr'),
+		'el'    => array('q' => 0.1, 'lang' => 'el',    'name' => 'Greek', 'direction' => 'ltr'),
+		'en-us' => array('q' => 1, 'lang' => 'en_US', 'name' => 'English (US)', 'direction' => 'ltr'),
+		'en-gb' => array('q' => 0.3, 'lang' => 'en_GB', 'name' => 'English (British)', 'direction' => 'ltr'),
+		'en'    => array('q' => 1, 'lang' => 'en',    'name' => 'English', 'direction' => 'ltr'),
+		'es'    => array('q' => 0.5, 'lang' => 'es',    'name' => 'Spanish', 'direction' => 'ltr'),
+		'fr-fr' => array('q' => 0.2, 'lang' => 'fr_FR', 'name' => 'French', 'direction' => 'ltr'),
+		'he'    => array('q' => 0.5, 'lang' => 'he_IL', 'name' => 'Hebrew', 'direction' => 'ltr'),
+		'it'    => array('q' => 0.9, 'lang' => 'it_IT', 'name' => 'Italian', 'direction' => 'rtl'),
+		'jp'	=> array('q' => 0.5, 'lang' => 'ja_JP', 'name' => 'Japanese', 'direction' => 'ltr'),
+#		'ko'    => array('q' => 0, 'lang' => 'ko',    'name' => 'Korean', 'direction' => 'ltr'),
+		'mk'	=> array('q' => 0.5, 'lang' => 'mk_MK', 'name' => 'Macedonian', 'direction' => 'ltr'),
+		'nb'    => array('q' => 0.1, 'lang' => 'nb_NO', 'name' => 'Norwegian (bokmal)', 'direction' => 'ltr'),
+		'nl'    => array('q' => 0.5, 'lang' => 'nl_NL', 'name' => 'Dutch', 'direction' => 'ltr'),
+		'pl'	=> array('q' => 0.5, 'lang' => 'pl_PL', 'name' => 'Polish', 'direction' => 'ltr'),
+#		'pt'    => array('q' => 0, 'lang' => 'pt',    'name' => 'Portuguese', 'direction' => 'ltr'),
+		'pt-br' => array('q' => 0.7, 'lang' => 'pt_BR', 'name' => 'Portuguese Brazil', 'direction' => 'ltr'),
+		'ru'    => array('q' => 0.1, 'lang' => 'ru_RU', 'name' => 'Russian', 'direction' => 'ltr'),
+		'sv'    => array('q' => 0.9, 'lang' => 'sv_SE', 'name' => 'Swedish', 'direction' => 'ltr'),
+		'te'    => array('q' => 0.3, 'lang' => 'te_IN', 'name' => 'Telugu', 'direction' => 'ltr'),
+		'tr'    => array('q' => 0.5, 'lang' => 'tr_TR', 'name' => 'Turkish', 'direction' => 'ltr'),
+		'uk'    => array('q' => 0.7, 'lang' => 'uk_UA', 'name' => 'Ukrainian', 'direction' => 'ltr'),
+		'vi'    => array('q' => 0.7, 'lang' => 'vi_VN', 'name' => 'Vietnamese', 'direction' => 'ltr'),
+		'zh-cn'    => array('q' => 0.9, 'lang' => 'zh_CN', 'name' => 'Chinese (Simplified)', 'direction' => 'ltr'),
+		'zh-hant'    => array('q' => 0.2, 'lang' => 'zh_hant', 'name' => 'Chinese (Taiwanese)', 'direction' => 'ltr'),
+	);
 }
-
diff --git a/lib/subs.php b/lib/subs.php
index 6fa1dcad3..0e7b9ded5 100644
--- a/lib/subs.php
+++ b/lib/subs.php
@@ -60,23 +60,22 @@ function subs_subscribe_to($user, $other)
 
     subs_notify($other, $user);
 
-    if (common_config('memcached', 'enabled')) {
-        $cache = new Memcache();
-        if ($cache->connect(common_config('memcached', 'server'), common_config('memcached', 'port'))) {
-            $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id));
-        }
-    }
+        $cache = common_memcache();
+
+    if ($cache) {
+        $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id));
+	}
+
 
     if ($other->autosubscribe && !$other->isSubscribed($user) && !$user->hasBlocked($other)) {
         if (!$other->subscribeTo($user)) {
             return _('Could not subscribe other to you.');
         }
-        if (common_config('memcached', 'enabled')) {
-            $cache = new Memcache();
-            if ($cache->connect(common_config('memcached', 'server'), common_config('memcached', 'port'))) {
-                $cache->delete(common_cache_key('user:notices_with_friends:' . $other->id));
-            }
-        }
+        $cache = common_memcache();
+
+        if ($cache) {
+            $cache->delete(common_cache_key('user:notices_with_friends:' . $other->id));
+		}
 
         subs_notify($user, $other);
     }
@@ -134,12 +133,11 @@ function subs_unsubscribe_to($user, $other)
     if (!$sub->delete())
         return _('Couldn\'t delete subscription.');
 
-    if (common_config('memcached', 'enabled')) {
-        $cache = new Memcache();
-        if ($cache->connect(common_config('memcached', 'server'), common_config('memcached', 'port'))) {
-            $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id));
-        }
-    }
+    $cache = common_memcache();
+
+    if ($cache) {
+        $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id));
+	}
 
     return true;
 }
diff --git a/lib/twitterapi.php b/lib/twitterapi.php
index 50bcb06fe..3d2c74feb 100644
--- a/lib/twitterapi.php
+++ b/lib/twitterapi.php
@@ -690,4 +690,4 @@ class TwitterapiAction extends Action
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/util.php b/lib/util.php
index 4b77f7c19..723b2f250 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -900,6 +900,8 @@ function common_fancy_url($action, $args=null)
         return common_path('group/'.$args['nickname'].'/rss');
      case 'groupmembers':
         return common_path('group/'.$args['nickname'].'/members');
+     case 'grouplogo':
+        return common_path('group/'.$args['nickname'].'/logo');
      case 'usergroups':
         return common_path($args['nickname'].'/groups');
      case 'groups':
diff --git a/locale/bg_BG/LC_MESSAGES/laconica.mo b/locale/bg_BG/LC_MESSAGES/laconica.mo
new file mode 100644
index 000000000..b563ad3a8
--- /dev/null
+++ 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
new file mode 100644
index 000000000..cbdbc8ba4
--- /dev/null
+++ b/locale/bg_BG/LC_MESSAGES/laconica.po
@@ -0,0 +1,2873 @@
+# #-#-#-#-#  laconica.pot (Laconica 0.6.4)  #-#-#-#-#
+# Laconica Bulgarian translation.
+# Copyright (C) 2008
+# This file is distributed under the same license as the Laconica package.
+# Yasen Pramatarov <yasen@lindeas.com>, 2008
+# Stoyan Zhekov <laconica@zh.otherinbox.com>, 2008
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"#-#-#-#-#  laconica.pot (Laconica 0.6.4)  #-#-#-#-#\n"
+"Project-Id-Version: Laconica 0.6.4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-07-14 21:07+1200\n"
+"PO-Revision-Date: 2008-12-12 00:00+0300\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"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../actions/noticesearchrss.php:64
+#, php-format
+msgid " Search Stream for \"%s\""
+msgstr "Тър�ене на \"%s\" в потока"
+
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
+msgid ""
+" except this private data: password, email address, IM address, phone "
+"number."
+msgstr "о�вен тези лични данни: парола, е-поща, ме�инджър, телефон."
+
+#: ../actions/subscribe.php:84
+#, php-format
+msgid "%1$s is now listening to your notices on %2$s."
+msgstr "%1$s вече получава бележките ви в %2$s."
+
+#: ../actions/subscribe.php:86
+#, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s.\n"
+msgstr ""
+"%1$s вече получава бележките ви в %2$s.\n"
+"\n"
+"\t%3$s\n\nС уважение,\n%4$s.\n"
+
+#: ../actions/shownotice.php:45
+#, php-format
+msgid "%1$s's status on %2$s"
+msgstr "Бележка на %1$s от %2$s"
+
+#: ../actions/publicrss.php:60
+#, php-format
+msgid "%s Public Stream"
+msgstr "Общ поток в %s"
+
+#: ../actions/all.php:47 ../actions/allrss.php:70 ../lib/stream.php:45
+#, php-format
+msgid "%s and friends"
+msgstr "%s и при�тели"
+
+#: ../lib/util.php:233
+#, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by "
+"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+msgstr ""
+"**%%site.name%%** е у�луга за микроблогване, "
+"предо�тавена ви от [%%site.broughtby%%](%%site.broughtbyurl%%). "
+
+#: ../lib/util.php:235
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** е у�луга за микроблогване. "
+
+#: ../lib/util.php:250
+msgid ". Contributors should be attributed by full name or nickname."
+msgstr ". Изпи�ват �е пълните имена или п�евдоними на уча�тниците."
+
+#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
+#: ../actions/register.php:176
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "От 1 до 64 малки букви или цифри, без пунктоаци� и интервали"
+
+#: ../actions/password.php:42 ../actions/register.php:178
+msgid "6 or more characters"
+msgstr "6 или повече знака"
+
+#: ../actions/recoverpassword.php:165
+msgid "6 or more characters, and don't forget it!"
+msgstr "6 или повече знака. И не ги забрав�йте!"
+
+#: ../actions/imsettings.php:188
+#, php-format
+msgid ""
+"A confirmation code was sent to the IM address you added. You must approve "
+"%s for sending messages to you."
+msgstr ""
+"�а ме�инджъра ви е изпратен код за "
+"потвърждение. За да получавате �ъобщени� от %s, тр�бва да го одобрите."
+
+#: ../lib/util.php:296
+msgid "About"
+msgstr "Отно�но"
+
+#: ../actions/userauthorization.php:118
+msgid "Accept"
+msgstr "Приемане"
+
+#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
+msgid "Add"
+msgstr "Добав�не"
+
+#: ../actions/openidsettings.php:43
+msgid "Add OpenID"
+msgstr "Добав�не на OpenID"
+
+#: ../actions/imsettings.php:39
+msgid "Address"
+msgstr "�дре�"
+
+#: ../actions/showstream.php:254
+msgid "All subscriptions"
+msgstr "В�ички абонаменти"
+
+#: ../actions/publicrss.php:62
+#, php-format
+msgid "All updates for %s"
+msgstr "В�ички бележки за %s"
+
+#: ../actions/noticesearchrss.php:66
+#, php-format
+msgid "All updates matching search term \"%s\""
+msgstr "В�ички бележки, намерени � \"%s\""
+
+#: ../actions/finishopenidlogin.php:29 ../actions/login.php:27
+#: ../actions/openidlogin.php:29 ../actions/register.php:28
+msgid "Already logged in."
+msgstr "Вече �те влезли."
+
+#: ../actions/subscribe.php:48
+msgid "Already subscribed!."
+msgstr "Вече �те абонирани!"
+
+#: ../actions/userauthorization.php:76
+msgid "Authorize subscription"
+msgstr "Одобр�ване на абонамента"
+
+#: ../actions/login.php:100 ../actions/register.php:184
+msgid "Automatically login in the future; not for shared computers!"
+msgstr "�втоматично влизане занапред. Да не �е ползва на общи компютри!"
+
+#: ../actions/avatar.php:32
+msgid "Avatar"
+msgstr "�ватар"
+
+#: ../actions/avatar.php:113
+msgid "Avatar updated."
+msgstr "�ватарът е обновен."
+
+#: ../actions/imsettings.php:55
+#, 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 ""
+"Oчаква �е потвърждение на този адре�. "
+"Проверете акаунта �и в Jabber/GTalk за �ъобщение � ин�трукции. (Добавихте ли %s в �пи�ъка �и там?)"
+
+#: ../lib/util.php:1136
+msgid "Before »"
+msgstr "Преди »"
+
+#: ../actions/profilesettings.php:52
+msgid "Bio"
+msgstr "За мен"
+
+#: ../actions/profilesettings.php:93 ../actions/updateprofile.php:102
+msgid "Bio is too long (max 140 chars)."
+msgstr "�втобиографи�та е твърде дълга (до 140 �имвола)."
+
+#: ../actions/updateprofile.php:118
+#, php-format
+msgid "Can't read avatar URL '%s'"
+msgstr "Грешка при четене адре�а на аватара '%s'"
+
+#: ../actions/password.php:85 ../actions/recoverpassword.php:261
+msgid "Can't save new password."
+msgstr "Грешка при запазване на новата парола."
+
+#: ../actions/imsettings.php:59
+msgid "Cancel"
+msgstr "Отказ"
+
+#: ../lib/openid.php:121
+msgid "Cannot instantiate OpenID consumer object."
+msgstr "Грешка при �ъздаване на потребител�ки OpenID обект"
+
+#: ../actions/imsettings.php:154
+msgid "Cannot normalize that Jabber ID"
+msgstr "Грешка при нормализаци� на този Jabber ID"
+
+#: ../actions/password.php:45
+msgid "Change"
+msgstr "Пром�на"
+
+#: ../actions/password.php:32
+msgid "Change password"
+msgstr "См�на на паролата"
+
+#: ../actions/password.php:43 ../actions/recoverpassword.php:166
+#: ../actions/register.php:179
+msgid "Confirm"
+msgstr "Потвърждаване"
+
+#: ../actions/confirmaddress.php:84
+msgid "Confirm Address"
+msgstr "Потвърждаване на адре�а"
+
+#: ../actions/imsettings.php:213
+msgid "Confirmation cancelled."
+msgstr "Потвърждаването е прекъ�нато."
+
+#: ../actions/confirmaddress.php:38
+msgid "Confirmation code not found."
+msgstr "Кодът за потвърждение не е открит."
+
+#: ../actions/finishopenidlogin.php:91
+msgid "Connect"
+msgstr "Свързване"
+
+#: ../actions/finishopenidlogin.php:86
+msgid "Connect existing account"
+msgstr "Свързване на �ъще�твуваща �метка"
+
+#: ../lib/util.php:304
+msgid "Contact"
+msgstr "Контакт"
+
+#: ../lib/openid.php:178
+#, php-format
+msgid "Could not create OpenID form: %s"
+msgstr "Грешка при �ъздаване на OpenID форма: %s"
+
+#: ../lib/openid.php:160
+#, php-format
+msgid "Could not redirect to server: %s"
+msgstr "Грешка при прена�очване към �ървър: %s"
+
+#: ../actions/updateprofile.php:161
+msgid "Could not save avatar info"
+msgstr "Грешка при запазване данните на аватара"
+
+#: ../actions/updateprofile.php:154
+msgid "Could not save new profile info"
+msgstr "Грешка при запазване на нови� профил"
+
+#: ../actions/profilesettings.php:146
+msgid "Couldn't confirm email."
+msgstr "�е може да �е потвърди електронната поща."
+
+#: ../actions/finishremotesubscribe.php:99
+msgid "Couldn't convert request tokens to access tokens."
+msgstr "Грешка при преобразуване на tokens за одобрение в tokens за до�тъп."
+
+#: ../actions/subscribe.php:59
+msgid "Couldn't create subscription."
+msgstr "Грешка при �ъздаване на нов абонамент."
+
+#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
+msgid "Couldn't delete email confirmation."
+msgstr "Грешка при изтриване потвърждението по е-поща."
+
+#: ../actions/unsubscribe.php:56
+msgid "Couldn't delete subscription."
+msgstr "Грешка при изтриване на абонамента."
+
+#: ../actions/remotesubscribe.php:125
+msgid "Couldn't get a request token."
+msgstr "�е е получен token за одобрение."
+
+#: ../actions/imsettings.php:178
+msgid "Couldn't insert confirmation code."
+msgstr "�е може да �е вмъкне код за потвърждение."
+
+#: ../actions/finishremotesubscribe.php:180
+msgid "Couldn't insert new subscription."
+msgstr "Грешка при добав�не на нов абонамент."
+
+#: ../actions/profilesettings.php:175
+msgid "Couldn't save profile."
+msgstr "Грешка при запазване на профила."
+
+#: ../actions/confirmaddress.php:70 ../actions/imsettings.php:129
+#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
+msgid "Couldn't update user."
+msgstr "Грешка при обнов�ване на потребител�."
+
+#: ../actions/finishopenidlogin.php:84
+msgid "Create"
+msgstr "Създаване"
+
+#: ../actions/finishopenidlogin.php:70
+msgid "Create a new user with this nickname."
+msgstr "Създаване на нов потребител � този п�евдоним."
+
+#: ../actions/finishopenidlogin.php:68
+msgid "Create new account"
+msgstr "Създаване на нова �метка"
+
+#: ../actions/finishopenidlogin.php:191
+msgid "Creating new account for OpenID that already has a user."
+msgstr "Създаване на нов акаунт за OpenID, който вече има потребител."
+
+#: ../actions/imsettings.php:45
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "Текущ потвърден Jabber/GTalk адре�."
+
+#: ../actions/showstream.php:337
+msgid "Currently"
+msgstr "В момента"
+
+#: ../lib/util.php:893
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr "Грешка в базата от данни — отговор при вмъкването: %s"
+
+#: ../actions/profilesettings.php:54
+msgid "Describe yourself and your interests in 140 chars"
+msgstr "Опишете �ебе �и и интере�ите �и в до 140 букви"
+
+#: ../actions/register.php:181
+msgid "Email"
+msgstr "Е-поща"
+
+#: ../actions/profilesettings.php:46
+msgid "Email address"
+msgstr "�дре� на е-поща"
+
+#: ../actions/profilesettings.php:102 ../actions/register.php:63
+msgid "Email address already exists."
+msgstr "�дре�ът на е-поща вече �е използва."
+
+#: ../lib/mail.php:82
+msgid "Email address confirmation"
+msgstr "Потвърждаване адре�а на е-поща"
+
+#: ../actions/recoverpassword.php:176
+msgid "Enter a nickname or email address."
+msgstr "Въведете п�евдоним или е-поща."
+
+#: ../actions/userauthorization.php:136
+msgid "Error authorizing token"
+msgstr "Грешка при одобр�ване на token"
+
+#: ../actions/finishopenidlogin.php:282
+msgid "Error connecting user to OpenID."
+msgstr "Грешка при �вързване на потребител� към OpenID."
+
+#: ../actions/finishaddopenid.php:78
+msgid "Error connecting user."
+msgstr "Грешка при �вързване на потребител�."
+
+#: ../actions/finishremotesubscribe.php:151
+msgid "Error inserting avatar"
+msgstr "Грешка при вмъкване на аватар"
+
+#: ../actions/finishremotesubscribe.php:143
+msgid "Error inserting new profile"
+msgstr "Грешка при вмъкване на нов профил"
+
+#: ../actions/postnotice.php:88
+msgid "Error inserting notice"
+msgstr "Грешка при вмъкване на бележка"
+
+#: ../actions/finishremotesubscribe.php:167
+msgid "Error inserting remote profile"
+msgstr "Грешка при вмъкване на отдалечен профил"
+
+#: ../actions/recoverpassword.php:201
+msgid "Error saving address confirmation."
+msgstr "Грешка при запазване на потвърждение за адре�"
+
+#: ../actions/userauthorization.php:139
+msgid "Error saving remote profile"
+msgstr "Грешка при запазване на отдалечен профил"
+
+#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
+msgid "Error saving the profile."
+msgstr "Грешка при запазване на профил"
+
+#: ../lib/openid.php:237
+msgid "Error saving the user."
+msgstr "Грешка при запазване на потребител."
+
+#: ../actions/password.php:80
+msgid "Error saving user; invalid."
+msgstr "Грешка при запазване на потребител — невалидно�т."
+
+#: ../actions/login.php:43 ../actions/login.php:69
+#: ../actions/recoverpassword.php:268 ../actions/register.php:73
+msgid "Error setting user."
+msgstr "Грешка в на�тройките на потребител�."
+
+#: ../actions/finishaddopenid.php:83
+msgid "Error updating profile"
+msgstr "Грешка при обнов�ване на профил"
+
+#: ../actions/finishremotesubscribe.php:161
+msgid "Error updating remote profile"
+msgstr "Грешка при обнов�ване на отдалечен профил"
+
+#: ../actions/recoverpassword.php:79
+msgid "Error with confirmation code."
+msgstr "Грешка в кода за потвърждение."
+
+#: ../actions/finishopenidlogin.php:89
+msgid "Existing nickname"
+msgstr "Съще�твуващ п�евдоним"
+
+#: ../lib/util.php:298
+msgid "FAQ"
+msgstr "Въпро�и"
+
+#: ../actions/avatar.php:115
+msgid "Failed updating avatar."
+msgstr "�еу�пешно обнов�ване на аватара."
+
+#: ../actions/all.php:61 ../actions/allrss.php:74
+#, php-format
+msgid "Feed for friends of %s"
+msgstr "Еми�и� � при�телите на %s"
+
+#: ../actions/replies.php:61 ../actions/repliesrss.php:80
+#, php-format
+msgid "Feed for replies to %s"
+msgstr "Еми�и� � отговорите към %s"
+
+#: ../actions/login.php:118
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr ""
+"За по-гол�ма �игурно�т, мол� въведете "
+"отново потребител�кото �и име и парола при пром�на на на�тройките."
+
+#: ../actions/profilesettings.php:44
+msgid "Full name"
+msgstr "Пълно име"
+
+#: ../actions/profilesettings.php:90 ../actions/updateprofile.php:92
+msgid "Full name is too long (max 255 chars)."
+msgstr "Пълното име е твърде дълго (мак�. 255 знака)"
+
+#: ../lib/util.php:279
+msgid "Help"
+msgstr "Помощ"
+
+#: ../lib/util.php:274
+msgid "Home"
+msgstr "�ачало"
+
+#: ../actions/profilesettings.php:49
+msgid "Homepage"
+msgstr "Лична �траница"
+
+#: ../actions/profilesettings.php:87
+msgid "Homepage is not a valid URL."
+msgstr "�дре�ът на личната �траница не е правилен URL."
+
+#: ../actions/imsettings.php:61
+msgid "IM Address"
+msgstr "IM адре�"
+
+#: ../actions/imsettings.php:33
+msgid "IM Settings"
+msgstr "IM на�тройки"
+
+#: ../actions/finishopenidlogin.php:88
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your OpenID."
+msgstr ""
+"�ко вече имате �метка, за да � �вържете � "
+"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 към �метката "
+"�и, въведете го в кутийката отдолу и нати�нете \"Добав�не\"."
+
+#: ../actions/recoverpassword.php:122
+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 ""
+"�ко �те забравили или изгубили паролата "
+"�и, може да ви бъде изпратена нова на е-пощата, запи�ана в �метката ви."
+
+#: ../actions/password.php:69
+msgid "Incorrect old password"
+msgstr "Грешна �тара парола"
+
+#: ../actions/login.php:63
+msgid "Incorrect username or password."
+msgstr "Грешно име или парола."
+
+#: ../actions/recoverpassword.php:226
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr ""
+"�а е-пощата, � ко�то �те реги�трирани �а "
+"изпратени ин�трукции за въз�танов�ване на паролата."
+
+#: ../actions/updateprofile.php:113
+#, php-format
+msgid "Invalid avatar URL '%s'"
+msgstr "�еправилен адре� на аватар '%s'"
+
+#: ../actions/updateprofile.php:97
+#, php-format
+msgid "Invalid homepage '%s'"
+msgstr "�еправилен адре� на домашна �траница '%s'"
+
+#: ../actions/updateprofile.php:81
+#, php-format
+msgid "Invalid license URL '%s'"
+msgstr "�еправилен адре� на лиценз '%s'"
+
+#: ../actions/postnotice.php:61
+msgid "Invalid notice content"
+msgstr "�евалидно �ъдържание на бележка"
+
+#: ../actions/postnotice.php:67
+msgid "Invalid notice uri"
+msgstr "�еправилен адре� на бележка"
+
+#: ../actions/postnotice.php:72
+msgid "Invalid notice url"
+msgstr "�еправилен адре� на бележка"
+
+#: ../actions/updateprofile.php:86
+#, php-format
+msgid "Invalid profile URL '%s'."
+msgstr "�еправилен адре� на профил '%s'."
+
+#: ../actions/remotesubscribe.php:96
+msgid "Invalid profile URL (bad format)"
+msgstr "�еправилен адре� на профил (грешен формат)"
+
+#: ../actions/finishremotesubscribe.php:77
+msgid "Invalid profile URL returned by server."
+msgstr "Върнат от �ървъра неправилен адре� на профила."
+
+#: ../actions/avatarbynickname.php:37
+msgid "Invalid size."
+msgstr "�еправилен размер."
+
+#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
+#: ../actions/register.php:84
+msgid "Invalid username or password."
+msgstr "�еправилно име или парола."
+
+#: ../lib/util.php:237
+#, 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 ""
+"Ползва [Laconica](http://laconi.ca/) вер�и� %s, �и�тема "
+"за микроблогване, до�тъпна под [GNU Affero General "
+"Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+
+#: ../actions/imsettings.php:164
+msgid "Jabber ID already belongs to another user."
+msgstr "Този Jabber ID принадлежи на друг потребител."
+
+#: ../actions/imsettings.php:63
+#, 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 ""
+"Jabber или GTalk адре�, като \"UserName@example.org\". "
+"Първо �е уверете, че �те добавили %s в "
+"�пи�ъка �и � при�тели в IM или GTalk клиента �и."
+
+#: ../actions/profilesettings.php:55
+msgid "Location"
+msgstr "Ме�тоположение"
+
+#: ../actions/profilesettings.php:96 ../actions/updateprofile.php:107
+msgid "Location is too long (max 255 chars)."
+msgstr "Името на ме�тоположението е твърде дълго (мак�. 255 знака)."
+
+#: ../actions/login.php:93 ../actions/login.php:102
+#: ../actions/openidlogin.php:68 ../lib/util.php:286
+msgid "Login"
+msgstr "Вход"
+
+#: ../actions/openidlogin.php:44
+#, php-format
+msgid "Login with an [OpenID](%%doc.openid%%) account."
+msgstr "Влизане � [OpenID](%%doc.openid%%)."
+
+#: ../actions/login.php:122
+#, 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 ""
+"Влезте � име и парола. ��мате такива? "
+"[Реги�трирайте](%%action.register%%) нова �метка или опитайте � [OpenID](%%action.openidlogin%%). "
+
+#: ../lib/util.php:284
+msgid "Logout"
+msgstr "Изход"
+
+#: ../actions/login.php:106
+msgid "Lost or forgotten password?"
+msgstr "Загубена или забравена парола"
+
+#: ../actions/showstream.php:281
+msgid "Member since"
+msgstr "Уча�тник от"
+
+#: ../actions/userrss.php:70
+#, php-format
+msgid "Microblog by %s"
+msgstr "Микроблог на %s"
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
+msgid "My text and files are available under "
+msgstr "Тек�товете и файловите ми �а до�тъпни под"
+
+#: ../actions/finishopenidlogin.php:71
+msgid "New nickname"
+msgstr "�ов п�евдоним"
+
+#: ../actions/newnotice.php:100
+msgid "New notice"
+msgstr "�ова бележка"
+
+#: ../actions/password.php:41 ../actions/recoverpassword.php:164
+msgid "New password"
+msgstr "�ова парола"
+
+#: ../actions/recoverpassword.php:275
+msgid "New password successfully saved. You are now logged in."
+msgstr "�овата парола е запазена. Вл�зохте у�пешно."
+
+#: ../actions/login.php:97 ../actions/profilesettings.php:41
+#: ../actions/register.php:175
+msgid "Nickname"
+msgstr "П�евдоним"
+
+#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:99
+#: ../actions/register.php:59
+msgid "Nickname already in use. Try another one."
+msgstr "Опитайте друг п�евдоним, този вече е зает."
+
+#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:80
+#: ../actions/register.php:57 ../actions/updateprofile.php:76
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"П�евдонимът може да �ъдържа �амо малки "
+"букви, чи�ла и никакво раз�то�ние между т�х."
+
+#: ../actions/finishopenidlogin.php:170
+msgid "Nickname not allowed."
+msgstr "Този п�евдоним не е разрешен тук."
+
+#: ../actions/remotesubscribe.php:72
+msgid "Nickname of the user you want to follow"
+msgstr "П�евдоним на потребител, когото и�кате да �ледите"
+
+#: ../actions/recoverpassword.php:147
+msgid "Nickname or email"
+msgstr "П�евдоним или е-поща"
+
+#: ../actions/imsettings.php:147
+msgid "No Jabber ID."
+msgstr "��ма Jabber ID."
+
+#: ../actions/userauthorization.php:128
+msgid "No authorization request!"
+msgstr "��ма за�вка за одобрение."
+
+#: ../actions/confirmaddress.php:33
+msgid "No confirmation code."
+msgstr "��ма код за потвърждение."
+
+#: ../actions/newnotice.php:49
+msgid "No content!"
+msgstr "��ма �ъдържание!"
+
+#: ../actions/userbyid.php:27
+msgid "No id."
+msgstr "��ма id."
+
+#: ../actions/finishremotesubscribe.php:65
+msgid "No nickname provided by remote server."
+msgstr "Отдалечени�т �ървър не е предо�тавил п�евдоним."
+
+#: ../actions/avatarbynickname.php:27
+msgid "No nickname."
+msgstr "��ма п�евдоним."
+
+#: ../actions/imsettings.php:197
+msgid "No pending confirmation to cancel."
+msgstr "��ма потвърждени�, очакващи да бъдат отказани."
+
+#: ../actions/finishremotesubscribe.php:72
+msgid "No profile URL returned by server."
+msgstr "Сървърът не е върнал адре� на профила."
+
+#: ../actions/recoverpassword.php:189
+msgid "No registered email address for that user."
+msgstr "��ма указана е-поща за този потребител."
+
+#: ../actions/userauthorization.php:48
+msgid "No request found!"
+msgstr "За�вката не е намерена!"
+
+#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
+msgid "No results"
+msgstr "��ма резултати"
+
+#: ../actions/avatarbynickname.php:32
+msgid "No size."
+msgstr "��ма размер."
+
+#: ../actions/openidsettings.php:135
+msgid "No such OpenID."
+msgstr "��ма такъв OpenID-адре�."
+
+#: ../actions/doc.php:29
+msgid "No such document."
+msgstr "��ма такъв документ."
+
+#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
+msgid "No such notice."
+msgstr "��ма такава бележка."
+
+#: ../actions/recoverpassword.php:56
+msgid "No such recovery code."
+msgstr "��ма такъв код за въз�танов�ване."
+
+#: ../actions/postnotice.php:56
+msgid "No such subscription"
+msgstr "��ма такъв абонамент"
+
+#: ../actions/all.php:34 ../actions/allrss.php:35
+#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:36
+#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
+#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
+#: ../actions/showstream.php:95 ../actions/subscribe.php:43
+#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
+#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
+msgid "No such user."
+msgstr "��ма такъв потребител"
+
+#: ../lib/gallery.php:76
+msgid "Nobody to show!"
+msgstr "��ма никого за показване!"
+
+#: ../actions/recoverpassword.php:60
+msgid "Not a recovery code."
+msgstr "Това не е код за въз�танов�ване."
+
+#: ../actions/imsettings.php:158
+msgid "Not a valid Jabber ID"
+msgstr "�еправилен Jabber ID"
+
+#: ../lib/openid.php:131
+msgid "Not a valid OpenID."
+msgstr "�еправилен OpenID"
+
+#: ../actions/profilesettings.php:75 ../actions/register.php:53
+msgid "Not a valid email address."
+msgstr "�еправилен адре� на е-поща."
+
+#: ../actions/profilesettings.php:83 ../actions/register.php:61
+msgid "Not a valid nickname."
+msgstr "�еправилен п�евдоним."
+
+#: ../actions/remotesubscribe.php:118
+msgid "Not a valid profile URL (incorrect services)."
+msgstr "�еправилен адре� на профил (грешна у�луга)."
+
+#: ../actions/remotesubscribe.php:111
+msgid "Not a valid profile URL (no XRDS defined)."
+msgstr "�еправилен адре� на профил (н�ма зададен XRDS)."
+
+#: ../actions/remotesubscribe.php:104
+msgid "Not a valid profile URL (no YADIS document)."
+msgstr "�еправилен адре� на профил (н�ма YADIS документ)."
+
+#: ../actions/avatar.php:95
+msgid "Not an image or corrupt file."
+msgstr "Файлът не е изображение или е повреден."
+
+#: ../actions/finishremotesubscribe.php:51
+msgid "Not authorized."
+msgstr "Забранено."
+
+#: ../actions/finishremotesubscribe.php:38
+msgid "Not expecting this response!"
+msgstr "�еочакван отговор."
+
+#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
+#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
+#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+msgid "Not logged in."
+msgstr "�е �те влезли в �и�темата."
+
+#: ../actions/unsubscribe.php:43
+msgid "Not subscribed!."
+msgstr "�е �те абонирани!"
+
+#: ../actions/showstream.php:82
+#, php-format
+msgid "Notice feed for %s"
+msgstr "Еми�и� � бележки на %s"
+
+#: ../actions/shownotice.php:39
+msgid "Notice has no profile"
+msgstr "Бележката н�ма профил"
+
+#: ../actions/showstream.php:297
+msgid "Notices"
+msgstr "Бележки"
+
+#: ../actions/password.php:39
+msgid "Old password"
+msgstr "Стара парола"
+
+#: ../lib/util.php:288
+msgid "OpenID"
+msgstr "OpenID"
+
+#: ../actions/finishopenidlogin.php:61
+msgid "OpenID Account Setup"
+msgstr "�а�тройки на OpenID"
+
+#: ../lib/openid.php:180
+msgid "OpenID Auto-Submit"
+msgstr "�втоматично предаване на OpenID"
+
+#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
+#: ../actions/openidlogin.php:60
+msgid "OpenID Login"
+msgstr "Влизане � OpenID"
+
+#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
+msgid "OpenID URL"
+msgstr "OpenID URL"
+
+#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
+msgid "OpenID authentication cancelled."
+msgstr "Влизането � OpenID е прекратено."
+
+#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#, php-format
+msgid "OpenID authentication failed: %s"
+msgstr "Грешка при влизане � OpenID: %s"
+
+#: ../lib/openid.php:133
+#, php-format
+msgid "OpenID failure: %s"
+msgstr "Проблем � OpenID: %s"
+
+#: ../actions/openidsettings.php:144
+msgid "OpenID removed."
+msgstr "OpenID е премахнат."
+
+#: ../actions/openidsettings.php:37
+msgid "OpenID settings"
+msgstr "�а�тройки на OpenID"
+
+#: ../actions/avatar.php:84
+msgid "Partial upload."
+msgstr "Ча�тично качване на файла."
+
+#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
+#: ../actions/register.php:177
+msgid "Password"
+msgstr "Парола"
+
+#: ../actions/recoverpassword.php:249
+msgid "Password and confirmation do not match."
+msgstr "Паролата и потвърждението й не �ъвпадат."
+
+#: ../actions/recoverpassword.php:245
+msgid "Password must be 6 chars or more."
+msgstr "Паролата тр�бва да е от поне 6 знака."
+
+#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
+msgid "Password recovery requested"
+msgstr "Пои�кано е въз�танов�ване на парола"
+
+#: ../actions/password.php:89 ../actions/recoverpassword.php:274
+msgid "Password saved."
+msgstr "Паролата е запи�ана."
+
+#: ../actions/password.php:61 ../actions/register.php:65
+msgid "Passwords don't match."
+msgstr "Паролите не �ъвпадат."
+
+#: ../actions/peoplesearch.php:33
+msgid "People search"
+msgstr "Тър�ене на хора"
+
+#: ../lib/stream.php:44
+msgid "Personal"
+msgstr "Лично"
+
+#: ../actions/userauthorization.php:77
+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 \"Cancel\"."
+msgstr ""
+"Проверете тези детайли и �е уверете, че "
+"и�кате да �е абонирате за бележките на "
+"този потребител. �ко не и�кате абонамента, нати�нете \"Cancel\" (Отказ)."
+
+#: ../actions/imsettings.php:74
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr "Публикуване пром�ната на �ъ�то�нието ми в Jabber/GTalk."
+
+#: ../actions/imsettings.php:68
+msgid "Preferences"
+msgstr "�а�тройки"
+
+#: ../actions/imsettings.php:135
+msgid "Preferences saved."
+msgstr "�а�тройките �а запазени."
+
+#: ../lib/util.php:300
+msgid "Privacy"
+msgstr "Поверително�т"
+
+#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
+msgid "Problem saving notice."
+msgstr "Проблем при запи�ване на бележката."
+
+#: ../lib/stream.php:54
+msgid "Profile"
+msgstr "Профил"
+
+#: ../actions/remotesubscribe.php:73
+msgid "Profile URL"
+msgstr "�дре� на профила"
+
+#: ../actions/profilesettings.php:34
+msgid "Profile settings"
+msgstr "�а�тройки на профила"
+
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
+msgid "Profile unknown"
+msgstr "�епознат профил"
+
+#: ../lib/util.php:276
+msgid "Public"
+msgstr "Общ поток"
+
+#: ../actions/public.php:54
+msgid "Public Stream Feed"
+msgstr "Еми�и� на общи� поток"
+
+#: ../actions/public.php:33
+msgid "Public timeline"
+msgstr "Общ поток"
+
+#: ../actions/recoverpassword.php:151
+msgid "Recover"
+msgstr "Въз�танов�ване"
+
+#: ../actions/recoverpassword.php:141
+msgid "Recover password"
+msgstr "Въз�танов�ване на паролата"
+
+#: ../actions/recoverpassword.php:67
+msgid "Recovery code for unknown user."
+msgstr "Код за въз�танов�ване на непознат потребител."
+
+#: ../actions/register.php:171 ../actions/register.php:195 ../lib/util.php:287
+msgid "Register"
+msgstr "Реги�триране"
+
+#: ../actions/userauthorization.php:119
+msgid "Reject"
+msgstr "Охвърл�не"
+
+#: ../actions/login.php:99 ../actions/register.php:183
+msgid "Remember me"
+msgstr "Запомни ме"
+
+#: ../actions/updateprofile.php:69
+msgid "Remote profile with no matching profile"
+msgstr "Отдалечен профил без �ъответ�тващ локален"
+
+#: ../actions/remotesubscribe.php:65
+msgid "Remote subscribe"
+msgstr "Отдалечен абонамент"
+
+#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+msgid "Remove"
+msgstr "Премахване"
+
+#: ../actions/openidsettings.php:68
+msgid "Remove OpenID"
+msgstr "Премахване на 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 ""
+"Премахването на един�твени� OpenID ще "
+"направи влизането в �и�темата невъзможно. За да го изтриете, първо добавете друг OpenID."
+
+#: ../lib/stream.php:49
+msgid "Replies"
+msgstr "Отговори"
+
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
+#, php-format
+msgid "Replies to %s"
+msgstr "Отговори на %s"
+
+#: ../actions/recoverpassword.php:168
+msgid "Reset"
+msgstr "Обнов�ване"
+
+#: ../actions/recoverpassword.php:158
+msgid "Reset password"
+msgstr "�ова парола"
+
+#: ../actions/recoverpassword.php:167 ../actions/register.php:180
+msgid "Same as password above"
+msgstr "Също като паролата по-горе"
+
+#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
+msgid "Save"
+msgstr "Запазване"
+
+#: ../lib/searchaction.php:73 ../lib/util.php:277
+msgid "Search"
+msgstr "Тър�ене"
+
+#: ../actions/noticesearch.php:80
+msgid "Search Stream Feed"
+msgstr "Тър�ене в еми�и�та на потока"
+
+#: ../actions/noticesearch.php:30
+#, 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 ""
+"Тър�ене на бележки в %%site.name%% по "
+"�ъдържанието им. Отдел�йте фразите за "
+"тър�ене (тр�бва да �а по-дълги от 3 �имвола) � интервали."
+
+#: ../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 ""
+"Тър�ене на хора в %%site.name%% по техните име, "
+"м��то или интере�и. Отдел�йте фразите за "
+
+#: ../lib/util.php:982
+msgid "Send"
+msgstr "Прати"
+
+#: ../actions/imsettings.php:71
+msgid "Send me notices through Jabber/GTalk."
+msgstr "Изпращане на бележките по Jabber/GTalk."
+
+#: ../lib/util.php:282
+msgid "Settings"
+msgstr "�а�тройки"
+
+#: ../actions/profilesettings.php:183
+msgid "Settings saved."
+msgstr "�а�тройките �а запазени."
+
+#: ../actions/finishaddopenid.php:66
+msgid "Someone else already has this OpenID."
+msgstr "��кой друг вече използва този OpenID."
+
+#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
+msgid "Something weird happened."
+msgstr "Случи �е нещо �транно."
+
+#: ../lib/util.php:302
+msgid "Source"
+msgstr "Изходен код"
+
+#: ../actions/showstream.php:277
+msgid "Statistics"
+msgstr "Стати�тики"
+
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+msgid "Stored OpenID not found."
+msgstr "��ма запазен OpenID."
+
+#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
+#: ../actions/showstream.php:181
+msgid "Subscribe"
+msgstr "�бониране"
+
+#: ../actions/showstream.php:294 ../actions/subscribers.php:27
+msgid "Subscribers"
+msgstr "�бонати"
+
+#: ../actions/userauthorization.php:309
+msgid "Subscription authorized"
+msgstr "�бонаментът е одобрен"
+
+#: ../actions/userauthorization.php:319
+msgid "Subscription rejected"
+msgstr "�бонаментът е отказан"
+
+#: ../actions/showstream.php:212 ../actions/showstream.php:288
+#: ../actions/subscriptions.php:27
+msgid "Subscriptions"
+msgstr "�бонаменти"
+
+#: ../actions/avatar.php:87
+msgid "System error uploading file."
+msgstr "Си�темна грешка при качване на файл."
+
+#: ../actions/noticesearch.php:34
+msgid "Text search"
+msgstr "Тър�ене на тек�т"
+
+#: ../actions/openidsettings.php:140
+msgid "That OpenID does not belong to you."
+msgstr "Този OpenID не ви принадлежи."
+
+#: ../actions/confirmaddress.php:52
+msgid "That address has already been confirmed."
+msgstr "Този адре� е вече потвърден."
+
+#: ../actions/confirmaddress.php:43
+msgid "That confirmation code is not for you!"
+msgstr "Този код за потвърждение не е за ва�!"
+
+#: ../actions/avatar.php:80
+msgid "That file is too big."
+msgstr "Файлът е твърде гол�м."
+
+#: ../actions/imsettings.php:161
+msgid "That is already your Jabber ID."
+msgstr "Това вече е ваши�т Jabber ID."
+
+#: ../actions/imsettings.php:224
+msgid "That is not your Jabber ID."
+msgstr "Това не е ваши�т Jabber ID."
+
+#: ../actions/imsettings.php:201
+msgid "That is the wrong IM address."
+msgstr "Грешен IM адре�."
+
+#: ../actions/newnotice.php:52
+msgid "That's too long. Max notice size is 140 chars."
+msgstr "Твърде дълга бележка. Тр�бва да е най-много 140 знака."
+
+#: ../actions/confirmaddress.php:86
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "�дре�ът \"%s\" е потвърден за �метката ви."
+
+#: ../actions/imsettings.php:241
+msgid "The address was removed."
+msgstr "�дре�ът е премахнат."
+
+#: ../actions/userauthorization.php:311
+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 ""
+"�бонаментът е одобрен, но не е зададен "
+"callback URL. За да завършите одобр�ването, "
+"проверете ин�трукциите на �айта. Ваши�т token за абонамент е:"
+
+#: ../actions/userauthorization.php:321
+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 ""
+"�бонаментът е отказан, но не е зададен "
+"callback URL. За да откажете напълно абонамента, проверете ин�трукциите на �айта."
+
+#: ../actions/subscribers.php:35
+#, php-format
+msgid "These are the people who listen to %s's notices."
+msgstr "Това �а хората, които четат бележките на %s."
+
+#: ../actions/subscribers.php:33
+msgid "These are the people who listen to your notices."
+msgstr "Tова �а хората, които четат бележките ви."
+
+#: ../actions/subscriptions.php:35
+#, php-format
+msgid "These are the people whose notices %s listens to."
+msgstr "Хора, чийто бележки %s чете."
+
+#: ../actions/subscriptions.php:33
+msgid "These are the people whose notices you listen to."
+msgstr "��ма хора, чийто бележки четете."
+
+#: ../actions/recoverpassword.php:87
+msgid "This confirmation code is too old. Please start again."
+msgstr "Кодът за потвърждение е твърде �тар. Започнете проце�а отново."
+
+#: ../lib/openid.php:195
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+"Формата би тр�бвало да �е изпрати "
+"автоматично. �ко това не �е �лучи, за да "
+"преминете към OpenID до�тавчика �и нати�нете бутона за изпращане."
+
+#: ../actions/finishopenidlogin.php:56
+#, php-format
+msgid ""
+"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."
+msgstr ""
+"За първи път влизате в �и�темата като %s, "
+"затова тр�бва да при�ъединим OpenID към "
+"локални� ви профил. Можете да �ъздадете нова �метка или да използвате �ъще�твуваща, ако имате такава."
+
+#: ../lib/util.php:147
+msgid "This page is not available in a media type you accept"
+msgstr "Страницата не е до�тъпна във вида меди�, който приемате"
+
+#: ../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 ""
+"За да �е абонирате, можете да  "
+"[влезете](%%action.login%%) или да "
+"[реги�трирате](%%action.register%%) нова �метка. "
+"�ко имате �метка на друга, [подобна у�луга за микроблогване](%%doc.openmublog%%), въведете адре�а на профила �и в не� по-долу."
+
+#: ../actions/profilesettings.php:51
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "�дре� на личната ви �траница, блог или профил в друг �айт"
+
+#: ../actions/remotesubscribe.php:74
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "�дре� на профила ви в друга, �ъвме�тима у�луга за микроблогване"
+
+#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
+msgid "Unexpected form submission."
+msgstr "�еочаквано изпращане на форма."
+
+#: ../actions/recoverpassword.php:237
+msgid "Unexpected password reset."
+msgstr "�еочаквано поднов�ване на паролата."
+
+#: ../actions/finishremotesubscribe.php:58
+msgid "Unknown version of OMB protocol."
+msgstr "�епозната вер�и� на протокола OMB."
+
+#: ../lib/util.php:245
+msgid ""
+"Unless otherwise specified, contents of this site are copyright by the "
+"contributors and available under the "
+msgstr ""
+"О�вен ако не е указано друго, "
+"�ъдържанието на този �айт принадлежи на �ъздателите му и е до�тъпно под "
+
+#: ../actions/confirmaddress.php:48
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr "�еразпознат вид адре� %s"
+
+#: ../actions/showstream.php:193
+msgid "Unsubscribe"
+msgstr "Отпи�ване"
+
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
+msgid "Unsupported OMB version"
+msgstr "�еподдържана вер�и� на OMB"
+
+#: ../actions/avatar.php:105
+msgid "Unsupported image file format."
+msgstr "Форматът на файла � изображението не �е поддържа."
+
+#: ../actions/avatar.php:68
+msgid "Upload"
+msgstr "Качване"
+
+#: ../actions/avatar.php:27
+msgid ""
+"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 license, also. Use a picture that belongs to you and that you want to "
+"share."
+msgstr ""
+"Качете нов \"аватар\" (потребител�ко "
+"изображение) тук. �е можете да го "
+"промените по-къ�но, затова �е уверете, че "
+"е поне приблизително квадратен. Тр�бва да е � лиценз като �ами� �айт. Използвайте картинка, ко�то ви принадлежи и и�кате да �поделите."
+
+#: ../actions/profilesettings.php:48 ../actions/register.php:182
+msgid "Used only for updates, announcements, and password recovery"
+msgstr "Използва �е �амо за промени, об�ви или въз�танов�ване на паролата"
+
+#: ../actions/finishremotesubscribe.php:86
+msgid "User being listened to doesn't exist."
+msgstr "Потребител�т, когото про�лед�вате, не �ъще�твува. "
+
+#: ../actions/all.php:41 ../actions/avatarbynickname.php:48
+#: ../actions/foaf.php:43 ../actions/replies.php:41
+#: ../actions/showstream.php:44
+msgid "User has no profile."
+msgstr "Потребител�т н�ма профил."
+
+#: ../actions/remotesubscribe.php:71
+msgid "User nickname"
+msgstr "Потребител�ки п�евдоним"
+
+#: ../lib/util.php:969
+#, php-format
+msgid "What's up, %s?"
+msgstr "Какво �тава, %s?"
+
+#: ../actions/profilesettings.php:57
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "Къде �е намирате (град, община, държава и т.н.)"
+
+#: ../actions/updateprofile.php:127
+#, php-format
+msgid "Wrong image type for '%s'"
+msgstr "Грешен вид изображение за '%s'"
+
+#: ../actions/updateprofile.php:122
+#, php-format
+msgid "Wrong size image at '%s'"
+msgstr "Грешен размер на изображението '%s'"
+
+#: ../actions/finishaddopenid.php:64
+msgid "You already have this OpenID!"
+msgstr "Вече използвате този OpenID!"
+
+#: ../actions/recoverpassword.php:31
+msgid "You are already logged in!"
+msgstr "Вече �те влезли!"
+
+#: ../actions/password.php:27
+msgid "You can change your password here. Choose a good one!"
+msgstr "Тук можете да �мените паролата �и. Внимавайте колко е добра новата."
+
+#: ../actions/register.php:164
+msgid "You can create a new account to start posting notices."
+msgstr "Първо �е реги�трирайте, за да започнете да публикувате бележки."
+
+#: ../actions/openidsettings.php:86
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+"Можете да премахнете OpenID от �метката �и, "
+"като нати�нете бутона \"Премахване\"."
+
+#: ../actions/imsettings.php:28
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
+msgstr ""
+"Можете да получавате �ъобщени� по Jabber/GTalk "
+"[instant messages](%%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
+msgid "You can use the local subscription!"
+msgstr "Можете да ползвате локален абонамент!"
+
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
+msgid "You can't register if you don't agree to the license."
+msgstr "�е можете да �е реги�трате, ако не �те �ъгла�ни �  лиценза."
+
+#: ../actions/updateprofile.php:62
+msgid "You did not send us that profile"
+msgstr "�е �те ни изпратили този профил"
+
+#: ../actions/recoverpassword.php:134
+msgid "You've been identified. Enter a  new password below. "
+msgstr "Разпознати �те. Въведете паролата �и по-долу. "
+
+#: ../actions/openidlogin.php:67
+msgid "Your OpenID URL"
+msgstr "Ваши�т OpenID URL"
+
+#: ../actions/recoverpassword.php:149
+msgid "Your nickname on this server, or your registered email address."
+msgstr "П�евдонимът ви на този �ървър или е-пощата, � ко�то �те реги�трирани."
+
+#: ../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%%) ви позвол�ва влизане в "
+"различни �айтове � един и �ъщ акаунт. От тук �е управл�ват �ъответните OpenID."
+
+#: ../lib/util.php:814
+msgid "a few seconds ago"
+msgstr "преди н�колко �екунди"
+
+#: ../lib/util.php:826
+#, php-format
+msgid "about %d days ago"
+msgstr "преди около %d дни"
+
+#: ../lib/util.php:822
+#, php-format
+msgid "about %d hours ago"
+msgstr "преди около %d ча�а"
+
+#: ../lib/util.php:818
+#, php-format
+msgid "about %d minutes ago"
+msgstr "преди около %d минути"
+
+#: ../lib/util.php:830
+#, php-format
+msgid "about %d months ago"
+msgstr "преди около %d ме�еца"
+
+#: ../lib/util.php:824
+msgid "about a day ago"
+msgstr "преди около ден"
+
+#: ../lib/util.php:816
+msgid "about a minute ago"
+msgstr "преди около минута"
+
+#: ../lib/util.php:828
+msgid "about a month ago"
+msgstr "преди около ме�ец"
+
+#: ../lib/util.php:832
+msgid "about a year ago"
+msgstr "преди около година"
+
+#: ../lib/util.php:820
+msgid "about an hour ago"
+msgstr "преди около ча�"
+
+#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
+#: ../lib/stream.php:101
+msgid "in reply to..."
+msgstr "в отговор на..."
+
+#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
+#: ../lib/stream.php:108
+msgid "reply"
+msgstr "отговор"
+
+#: ../actions/password.php:44
+msgid "same as password above"
+msgstr "�ъщо като паролата по-горе"
+
+#: ../lib/util.php:1127
+msgid "« After"
+msgstr "« След"
+
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+msgid " from "
+msgstr "от"
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s ви кани да ползвате заедно %2$s"
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+"%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И�крено ваши, %2$s\n"
+
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
+
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#, php-format
+msgid "%s public timeline"
+msgstr "Общ поток на %s"
+
+#: ../lib/mail.php:206 lib/mail.php:212
+#, php-format
+msgid "%s status"
+msgstr "Съ�то�ние на %s"
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#, php-format
+msgid "%s timeline"
+msgstr "Поток на %s"
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+"(Тр�бва да получите веднага електронно "
+"пи�мо � указани� за потвърждаване адре�а на е-пощата ви.)"
+
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+"От 1 до 64 малки букви или цифри, без "
+"пунктоаци� и интервали. Задължително поле."
+
+#: ../actions/register.php:154 actions/register.php:168
+msgid "6 or more characters. Required."
+msgstr "6 или повече знака. Задължително поле."
+
+#: ../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 ""
+"�а адре�а на е-поща, който �те въвели, беше "
+"изпратен код за потвърждение. Проверете "
+"кути�та (или папката за �пам) за кода и указани�та за използването му."
+
+#: ../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 ""
+"�а телефонни� номер, който �те въвели, "
+"беше изпратен код за потвърждение. "
+"Проверете �ъобщени�та (или папката за �пам) за кода и указани�та за използването му."
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55
+msgid "API method not found!"
+msgstr "�е е открит методът в API."
+
+#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
+#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
+#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
+#: ../actions/twitapidirect_messages.php:49
+#: ../actions/twitapidirect_messages.php:56
+#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
+#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
+#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
+#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
+#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
+#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
+#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
+#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
+#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
+#: actions/twitapistatuses.php:690
+msgid "API method under construction."
+msgstr "Методът в API в�е още �е разработва."
+
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+msgid "Add or remove OpenIDs"
+msgstr "Добав�не или премахване OpenID"
+
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr "�дре�и на при�тели, които каните (по един на ред)"
+
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr "�аи�тина ли и�кате да изтриете тази бележка?"
+
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for "
+"non-humans)"
+msgstr ""
+"�втоматично абониране за в�еки, който �е "
+"абонира за мен (подход�що за ботове)."
+
+#: ../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 ""
+"Очаква �е потвърждение за този адре�. "
+"Проверете кути�та �и (или папката за �пам) за �ъобщение � указани�."
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr "Очаква �е потвърждение за този телефонен номер."
+
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr "Грешка при изтриване на бележката."
+
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+msgid "Cannot normalize that email address"
+msgstr "Грешка при нормализиране адре�а на е-пощата"
+
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+msgid "Change email handling"
+msgstr "Пром�на обработката на пи�мата"
+
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr "См�на на паролата"
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+msgid "Change your profile settings"
+msgstr "Пром�на на�тройките на профила"
+
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr "Код за потвърждение"
+
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"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."
+msgstr ""
+"Поздравлени�, %s! И добре дошли в %%%%site.name%%%%! "
+"от тук можете да...\n"
+"\n"
+"* Отидете в [профила �и](%s) и да публикувате "
+"първата �и бележка.\n"
+"* Добавите [адре� в Jabber/GTalk](%%%%action.imsettings%%%%), "
+"за да изпращате бележки от програмата �и "
+"за моментни �ъобщени�.\n"
+"* [Тър�ите хора](%%%%action.peoplesearch%%%%), които "
+"познавате или � които �подел�те общи "
+"интере�и. \n"
+"* Обновите [на�тройките на "
+"профила(%%%%action.profilesettings%%%%) �и, за да кажете повече за �ебе �и на другите. \n* Прочетете наличната [документаци�](%%%%doc.help%%%%) на �айта, за да �е запознаете � възможно�тите му. \n\nБлагодарим, че �е включихте в �айта и дано ползването на у�лугата ви но�и �амо при�тни мигове!"
+
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr "Грешка при про�лед�ване на потребител: %s вече е в �пи�ъка ви."
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+msgid "Could not follow user: User not found."
+msgstr "Грешка при про�лед�ване — потребител�т не е намерен."
+
+#: ../lib/subs.php:54 lib/subs.php:61
+msgid "Could not subscribe other to you."
+msgstr "Грешка при абониране на друг потребител за ва�."
+
+#: ../lib/subs.php:46 lib/subs.php:46
+msgid "Could not subscribe."
+msgstr "Грешка при абониране."
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+msgid "Couldn't find any statuses."
+msgstr "�е �а открити бележки."
+
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+msgid "Couldn't update user record."
+msgstr "Грешка при обнов�ване запи�а на потребител."
+
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "Текущ потвърден телефонен номер за SMS-и."
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr "Текущ потвърден адре� на е-поща."
+
+#: ../classes/Notice.php:72 classes/Notice.php:86
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr "Изтриване на бележката"
+
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr "�дре� на е-поща"
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr "�а�тройки на е-поща"
+
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr "�дре� на е-поща, като \"UserName@example.org\""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr "�дре�и на е-поща"
+
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr "Въведете кода, който получихте по телефона."
+
+#: ../actions/tag.php:55 actions/tag.php:55
+#, php-format
+msgid "Feed for tag %s"
+msgstr "Еми�и� за етикета %s"
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr "Тър�ене в �ъдържанието на бележките"
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr "Тър�ене на хора в �айта"
+
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+msgid "I want to post notices by email."
+msgstr "И�кам да изпращам бележки по пощата."
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+msgid "IM"
+msgstr "IM"
+
+#: ../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
+msgid "Incoming email"
+msgstr "Вход�ща поща"
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+msgid "Incoming email address removed."
+msgstr "Вход�щи�т адре� на е-поща е премахнат."
+
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "�еправилен адре� на е-поща: %s"
+
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr "Поканите �а изпратени."
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr "Изпратени �а покани до �ледните хора:"
+
+#: ../lib/util.php:306 lib/util.php:322
+msgid "Invite"
+msgstr "Покани"
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr "Покани за нови потребители"
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Language"
+msgstr "Език"
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+msgid "Language is too long (max 50 chars)."
+msgstr "Името на езика е твърде дълго (може да е до 50 знака)."
+
+#: ../actions/register.php:166 actions/register.php:180
+msgid "Longer name, preferably your \"real\" name"
+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 ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr "Управление на пощата, идваща от %%site.name%%."
+
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+"Мобилен оператор за SMS. �ко знаете "
+"оператор, поддържащ SMS от е-поща, който не фигурира тук, пишете ни на адре� %s."
+
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+#, fuzzy
+msgid "New"
+msgstr "�ово"
+
+#: ../lib/mail.php:144 lib/mail.php:144
+#, php-format
+msgid "New email address for posting to %s"
+msgstr "�ов адре� на е-поща за публикщуване в %s"
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+msgid "New incoming email address added."
+msgstr "Добавен е нов вход�щ адре� на е-поща."
+
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+msgid "No"
+msgstr "�е"
+
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr "�е е избран оператор."
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr "�е е въведен код."
+
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+msgid "No email address."
+msgstr "�е е въведена е-поща."
+
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+msgid "No incoming email address."
+msgstr "��ма вход�щ адре� на е-поща."
+
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr "�е е въведен телефонен номер."
+
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520
+msgid "No status found with that ID."
+msgstr "�е е открита бележка � такъв идентификатор."
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+msgid "No status with that ID found."
+msgstr "�е е открита бележка � такъв идентификатор."
+
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr "��ма потребител � такава е-поща или потребител�ко име."
+
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+msgid "Not a registered user."
+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
+msgid "Not a supported data format."
+msgstr "�еподдържан формат на данните"
+
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+msgid "Not a valid email address"
+msgstr "Това не е правилен адре� на е-поща."
+
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+msgid "Not found"
+msgstr "�е е открито."
+
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr "Тър�ене на бележки"
+
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr "Бележки � етикет %s"
+
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr "Може да добавите и лично �ъобщение към поканата."
+
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr "Хора"
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr "Тър�ене на хора"
+
+#: ../actions/invite.php:133 actions/invite.php:141
+msgid "Personal message"
+msgstr "Лично �ъобщение"
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "Телефонен номер — � код, без пунктоаци� и без интервали."
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Preferred language"
+msgstr "Предпочитан език"
+
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Публикуване на MicroID за адре�а в Jabber/GTalk."
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+msgid "Publish a MicroID for my email address."
+msgstr "Публикуване на MicroID за адре�а на е-пощата."
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr "Скорошни етикети"
+
+#: ../actions/register.php:28 actions/register.php:28
+msgid "Registration not allowed."
+msgstr "Запи�ването не е позволено."
+
+#: ../actions/register.php:200 actions/register.php:214
+msgid "Registration successful"
+msgstr "Запи�ването е у�пешно."
+
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+msgid "SMS"
+msgstr "SMS"
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr "Телефонен номер за SMS"
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr "�а�тройки за SMS"
+
+#: ../lib/mail.php:219 lib/mail.php:225
+msgid "SMS confirmation"
+msgstr "Потвърждение за SMS"
+
+#: ../actions/register.php:156 actions/register.php:170
+msgid "Same as password above. Required."
+msgstr "Същото като паролата по-горе. Задължително поле."
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr "Изберете оператор"
+
+#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
+#: actions/emailsettings.php:74 actions/smssettings.php:82
+msgid "Send email to this address to post new notices."
+msgstr "Изпратете пи�мо до този адре� за публикуване като бележка."
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr "Изпращане на уведомлени� за нови абонаменти по пощата."
+
+#: ../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 ""
+"Получаване на бележки в SMS. Имайте "
+"предвид, че може да има допълнителни так�и от оператора."
+
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+"Изпращане по Jabber/GTalk на отговори от хора, "
+
+#: ../actions/tag.php:60 actions/tag.php:60
+msgid "Showing most popular tags from the last week"
+msgstr "�ай-попул�рните етикети за изминалата �едмица"
+
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr "Вход�щата поща не е разрешена."
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr "Това не е ваши�т вход�щ адре�."
+
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317
+msgid "Tags"
+msgstr "Етикети"
+
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
+msgid "Text"
+msgstr "Тек�т"
+
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+msgid "That email address already belongs to another user."
+msgstr "Тази е-поща вече �е използва от друг потребител."
+
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+msgid "That is already your email address."
+msgstr "Това и �ега е адре�ът на е-пощата ви."
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr "Това  �ега е номерът на телефона ви."
+
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+msgid "That is not your email address."
+msgstr "Това не е ваши�т адре� на е-поща."
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+msgid "That is not your phone number."
+msgstr "Това не е ваши�т телефонен номер."
+
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr "Този код за потвърждение е грешен."
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr "Този телефонен номер вече �е използва от друг потребител."
+
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+msgid "That's too long. Max notice size is 255 chars."
+msgstr "Това е твърде дълго. Тр�бва да е най-много 255 знака."
+
+#: ../actions/invite.php:89 actions/invite.php:96
+msgid ""
+"These people are already users and you were automatically subscribed to "
+"them:"
+msgstr "Тези хора �а потребители тук и автоматично �те абонирани за т�х:"
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511
+msgid "This method requires a POST or DELETE."
+msgstr "Този метод изи�ква за�вка POST или DELETE."
+
+#: ../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
+msgid "This method requires a POST."
+msgstr "Този метод изи�ква за�вка POST."
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "Timezone"
+msgstr "Ча�ови по��"
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+msgid "Timezone not selected."
+msgstr "�е е избран ча�ови по��"
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+msgid "Two user ids or screen_names must be supplied."
+msgstr ""
+
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr "�епознато дей�твие"
+
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+msgid "Updates by SMS"
+msgstr "Бележки през SMS"
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+msgid "Updates by instant messenger (IM)"
+msgstr "Бележки през ме�инджър (IM)"
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr "Качване на нова �нимка за профила"
+
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this "
+"service."
+msgstr ""
+"Използвайте това поле, за да поканите "
+"при�тели и колеги да използват у�лугата на �айта."
+
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr "Потребител�т не е открит."
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "What timezone are you normally in?"
+msgstr "В кой ча�ови по�� �те обикновено?"
+
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+msgid "Yes"
+msgstr "Да"
+
+#: ../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 "Ще изтриете напълно бележката. Изтриването е невъзвратимо."
+
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr "Вече �те абонирани за �ледните потребители:"
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+msgid "You are not friends with the specified user."
+msgstr "С указани� потребител не �те запи�ани като при�тели."
+
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+msgid "You may not delete another user's status."
+msgstr "�е може да изтривате бележки на друг потребител."
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr "За да каните хора в %s, тр�бва да �те влезли."
+
+#: ../actions/invite.php:103 actions/invite.php:110
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
+msgstr ""
+"Ще ви уведомим при приемане на покана и "
+"запи�ване в �айта. Благодарим ви за увеличаването на общно�тта тук!"
+
+#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99
+msgid "delete"
+msgstr "изтриване"
+
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+msgid "unsupported file type"
+msgstr "неподдържан вид файл"
+
+#: actions/deletenotice.php:74 actions/disfavor.php:43
+#: actions/emailsettings.php:127 actions/favor.php:45
+#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
+#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
+#: actions/openidsettings.php:123 actions/profilesettings.php:47
+#: actions/recoverpassword.php:282 actions/register.php:42
+#: actions/remotesubscribe.php:40 actions/smssettings.php:124
+#: actions/subscribe.php:44 actions/twittersettings.php:97
+#: actions/unsubscribe.php:41 actions/userauthorization.php:35
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Имаше проблем �ъ� �е�и�та ви в �айта. Мол�, опитайте отново!"
+
+#: actions/disfavor.php:55
+msgid "This notice is not a favorite!"
+msgstr "Тази бележка не е отбел�зана като любима!"
+
+#: actions/disfavor.php:63
+msgid "Could not delete favorite."
+msgstr "Грешка при изтриване на любима бележка."
+
+#: actions/disfavor.php:72
+msgid "Favor"
+msgstr "Любимо"
+
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr "Изпращане на пи�мо при отбел�зване на мо� бележка като любима."
+
+#: actions/emailsettings.php:95
+msgid "Send me email when someone sends me a private message."
+msgstr "Изпращане на пи�мо при ново лично �ъобщение."
+
+#: actions/favor.php:53 actions/twitapifavorites.php:142
+msgid "This notice is already a favorite!"
+msgstr "Тази бележка вече е отбел�зана като любима!"
+
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132
+msgid "Could not create favorite."
+msgstr "Грешка при отбел�зване като любима."
+
+#: actions/favor.php:70
+msgid "Disfavor"
+msgstr "�елюбимо"
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#, php-format
+msgid "%s favorite notices"
+msgstr "%s любими бележки"
+
+#: actions/favoritesrss.php:64
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr "Еми�и� � любимите бележки на %s"
+
+#: actions/inbox.php:28
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr "Вход�ща кути� за %s — �траница %d"
+
+#: actions/inbox.php:30
+#, php-format
+msgid "Inbox for %s"
+msgstr "Вход�ща кути� за %s"
+
+#: actions/inbox.php:53
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr "Това е вход�щата ви кути� � лични �ъобщени� от други потребители."
+
+#: actions/invite.php:178
+#, php-format
+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
+msgid "Automatically login in the future; "
+msgstr "�втоматично влизане за в бъдеще:"
+
+#: actions/login.php:122
+msgid "For security reasons, please re-enter your "
+msgstr ""
+
+#: actions/login.php:126
+msgid "Login with your username and password. "
+msgstr "Влезте � името и паролата �и."
+
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+msgid "That's too long. Max message size is 140 chars."
+msgstr "Твърде дълго. Може да е най-много 140 знака."
+
+#: actions/newmessage.php:65
+msgid "No recipient specified."
+msgstr "�е е указан получател."
+
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206
+msgid "You can't send a message to this user."
+msgstr "�е може да изпращате �ъобщени� до този потребител."
+
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly "
+"instead."
+msgstr ""
+"�е може да изпращате �ъобщени� до �ебе �и. "
+"По-добре �и го кажете на �ебе �и тихичко."
+
+#: actions/newmessage.php:108
+msgid "No such user"
+msgstr "��ма такъв потребител"
+
+#: actions/newmessage.php:117
+msgid "New message"
+msgstr "�ово �ъобщение"
+
+#: actions/noticesearch.php:95
+msgid "Notice without matching profile"
+msgstr "Бележка без �ъответ�тващ профил"
+
+#: actions/openidsettings.php:28
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr "[OpenID](%%doc.openid%%) ви позвол�ва да влизате в различни �айтове"
+
+#: actions/openidsettings.php:46
+msgid "If you want to add an OpenID to your account, "
+msgstr ""
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr "�ко премахнете един�твени� �и OpenID, н�ма да можете да влизате!"
+
+#: actions/openidsettings.php:87
+msgid "You can remove an OpenID from your account "
+msgstr "Можете да премахнете OpenID от профила �и"
+
+#: actions/outbox.php:28
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr "Изход�ща кути� за %s — �траница %d"
+
+#: actions/outbox.php:30
+#, php-format
+msgid "Outbox for %s"
+msgstr "Изход�ща кути� за %s"
+
+#: actions/outbox.php:53
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr "Това е изход�щата ви кути� � лични �ъобщени� до други потребители. "
+
+#: actions/peoplesearch.php:28
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+msgstr "Тър�ене на хора в %%site.name%% по име, ме�тоположение или интере�и."
+
+#: actions/profilesettings.php:27
+msgid "You can update your personal profile info here "
+msgstr "Можете а обновите личните �и данни тук"
+
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+msgid "User without matching profile"
+msgstr "Потребител без �ъответ�тващ профил"
+
+#: actions/recoverpassword.php:91
+msgid "This confirmation code is too old. "
+msgstr "Кодът ви за потвърждение е твърде �тар."
+
+#: actions/recoverpassword.php:141
+msgid "If you've forgotten or lost your"
+msgstr ""
+
+#: actions/recoverpassword.php:154
+msgid "You've been identified. Enter a "
+msgstr ""
+
+#: actions/recoverpassword.php:169
+msgid "Your nickname on this server, "
+msgstr "П�евдонимът ви на този �ървър."
+
+#: actions/recoverpassword.php:271
+msgid "Instructions for recovering your password "
+msgstr "Упътване за въз�танов�ване на паролата"
+
+#: actions/recoverpassword.php:327
+msgid "New password successfully saved. "
+msgstr "�овата парола е запи�ана."
+
+#: actions/register.php:95
+msgid "Password must be 6 or more characters."
+msgstr "Паролата тр�бва да е 6 или повече знака."
+
+#: actions/register.php:216
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
+msgstr ""
+"Поздравлени�, %s! И добре дошли в %%%%site.name%%%%. "
+
+#: actions/register.php:227
+msgid "(You should receive a message by email momentarily, with "
+msgstr ""
+
+#: actions/remotesubscribe.php:51
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
+msgstr ""
+
+#: actions/showfavorites.php:61
+#, php-format
+msgid "Feed for favorites of %s"
+msgstr "Еми�и� � любимите бележки на %s"
+
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+msgid "Could not retrieve favorite notices."
+msgstr "Грешка при изтегл�не на любимите бележки"
+
+#: actions/showmessage.php:33
+msgid "No such message."
+msgstr "��ма такова �ъобщение"
+
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
+msgstr "Само подател�т и получател�т могат да четат това �ъобщение."
+
+#: actions/showmessage.php:61
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr "Съобщение до %1$s в %2$s"
+
+#: actions/showmessage.php:66
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr "Съобщение от %1$s в %2$s"
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr "Изпращане на �ъобщение"
+
+#: actions/smssettings.php:312
+#, php-format
+msgid "Mobile carrier for your phone. "
+msgstr "Мобилен оператор на телефона ви."
+
+#: actions/twitapidirect_messages.php:76
+#, php-format
+msgid "Direct messages to %s"
+msgstr "Преки �ъобщени� до %s"
+
+#: actions/twitapidirect_messages.php:77
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr "В�ички преки �ъобщени�, изпратени до %s"
+
+#: actions/twitapidirect_messages.php:81
+msgid "Direct Messages You've Sent"
+msgstr "Изпратени от ва� преки �ъобщени�"
+
+#: actions/twitapidirect_messages.php:82
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr "В�ички преки �ъобщени�, изпратени от %s"
+
+#: actions/twitapidirect_messages.php:128
+msgid "No message text!"
+msgstr "Лип�ва тек�т на �ъобщението"
+
+#: actions/twitapidirect_messages.php:138
+msgid "Recipient user not found."
+msgstr "Получател�т не е открит"
+
+#: actions/twitapidirect_messages.php:141
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+"�е може да изпращате преки �ъобщени� до "
+"хора, които не �а в �пи�ъка ви � при�тели."
+
+#: actions/twitapifavorites.php:92
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr "%s / Отбел�зани като любими от %s"
+
+#: actions/twitapifavorites.php:95
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr "%s бележки отбел�зани като любими от %s / %s."
+
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#, php-format
+msgid "%s added your notice as a favorite"
+msgstr "%s отбел�за бележката ви като любима"
+
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+msgstr "%1$s току-що отбел�за като любима бележката ви от %2$s.\n\n"
+
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+msgstr ""
+"Добав�не на профила ви в Twitter за "
+"автоматично препращане на бележките ви и там."
+
+#: actions/twittersettings.php:41
+msgid "Twitter settings"
+msgstr "�а�тройки за Twitter"
+
+#: actions/twittersettings.php:48
+msgid "Twitter Account"
+msgstr "Профил в Twitter"
+
+#: actions/twittersettings.php:56
+msgid "Current verified Twitter account."
+msgstr "Текущ проверен профил в Twitter"
+
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr "Име в Twitter"
+
+#: actions/twittersettings.php:65
+msgid "No spaces, please."
+msgstr "Без интервали, мол�!"
+
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr "Парола за Twitter"
+
+#: actions/twittersettings.php:72
+msgid "Automatically send my notices to Twitter."
+msgstr "�втоматично препращане на бележките ми към Twitter"
+
+#: actions/twittersettings.php:75
+msgid "Send local \"@\" replies to Twitter."
+msgstr "Препращане на локалните отговори � \"@\" и към Twitter"
+
+#: actions/twittersettings.php:78
+msgid "Subscribe to my Twitter friends here."
+msgstr "�бониране за при�телите ми от Twitter тук"
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+"Потребител�кото име може да �ъдържа �амо "
+"цифри, малки и главни букви и добна черта. Може да е най-много 15 знака."
+
+#: actions/twittersettings.php:128
+msgid "Could not verify your Twitter credentials!"
+msgstr "Грешка при �вер�ване на данните ви � Twitter"
+
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgstr "Грешка при извличане данните на профила \"%s\" от Twitter."
+
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+msgid "Unable to save your Twitter settings!"
+msgstr "Грешка при запи�ване на�тройките за Twitter"
+
+#: actions/twittersettings.php:174
+msgid "Twitter settings saved."
+msgstr "�а�тройките за Twitter �а запазени."
+
+#: actions/twittersettings.php:192
+msgid "That is not your Twitter account."
+msgstr "Това не е ваши�т профил в Twitter."
+
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+msgid "Couldn't remove Twitter user."
+msgstr "Грешка при премахване на профила от Twitter"
+
+#: actions/twittersettings.php:212
+msgid "Twitter account removed."
+msgstr "Профилът от Twitter е премахнат."
+
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+msgid "Couldn't save Twitter preferences."
+msgstr "Грешка при запи�ване на�тройките за Twitter"
+
+#: actions/twittersettings.php:245
+msgid "Twitter preferences saved."
+msgstr "�а�тройките за Twitter �а запазени."
+
+#: actions/userauthorization.php:84
+msgid "Please check these details to make sure "
+msgstr ""
+
+#: actions/userauthorization.php:324
+msgid "The subscription has been authorized, but no "
+msgstr ""
+
+#: actions/userauthorization.php:334
+msgid "The subscription has been rejected, but no "
+msgstr ""
+
+#: classes/Channel.php:113
+msgid "Command results"
+msgstr "Резултат от командата"
+
+#: classes/Channel.php:148
+msgid "Command complete"
+msgstr "Командата е изпълнена"
+
+#: classes/Channel.php:158
+msgid "Command failed"
+msgstr "Грешка при изпълнение на командата"
+
+#: classes/Command.php:39
+msgid "Sorry, this command is not yet implemented."
+msgstr "За �ъжаление тази команда в�е още не �е поддържа."
+
+#: classes/Command.php:96
+#, php-format
+msgid "Subscriptions: %1$s\n"
+msgstr "�бонаменти: %1$s\n"
+
+#: classes/Command.php:125 classes/Command.php:242
+msgid "User has no last notice"
+msgstr "Потребител�т н�ма по�ледна бележка"
+
+#: classes/Command.php:146
+msgid "Notice marked as fave."
+msgstr "Бележката е отбел�зана като любима."
+
+#: classes/Command.php:166
+#, php-format
+#, fuzzy
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#: classes/Command.php:169
+#, php-format
+msgid "Fullname: %s"
+msgstr "Пълно име: %s"
+
+#: classes/Command.php:172
+#, php-format
+msgid "Location: %s"
+msgstr "Ме�тоположение: %s"
+
+#: classes/Command.php:175
+#, php-format
+msgid "Homepage: %s"
+msgstr "Домашна �траница: %s"
+
+#: classes/Command.php:178
+#, php-format
+msgid "About: %s"
+msgstr "Отно�но: %s"
+
+#: classes/Command.php:200
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
+"Съобщението е твърде дълго. �ай-много "
+"може да е 140 знака, а �те въвели %d."
+
+#: classes/Command.php:214
+#, php-format
+msgid "Direct message to %s sent"
+msgstr "Пр�кото �ъобщение до %s е изпратено."
+
+#: classes/Command.php:216
+msgid "Error sending direct message."
+msgstr "Грешка при изпращане на пр�кото �ъобщение"
+
+#: classes/Command.php:263
+msgid "Specify the name of the user to subscribe to"
+msgstr "Уточнете името на потребител�, за когото �е абонирате."
+
+#: classes/Command.php:270
+#, php-format
+msgid "Subscribed to %s"
+msgstr "�бонирани �те за %s."
+
+#: classes/Command.php:288
+msgid "Specify the name of the user to unsubscribe from"
+msgstr "Уточнете името на потребител�, от когото �е отпи�вате."
+
+#: classes/Command.php:295
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr "Отпи�ани �те от %s."
+
+#: classes/Command.php:310 classes/Command.php:330
+msgid "Command not yet implemented."
+msgstr "Командата в�е още не �е поддържа."
+
+#: classes/Command.php:313
+msgid "Notification off."
+msgstr "Уведомлението е изключено."
+
+#: classes/Command.php:315
+msgid "Can't turn off notification."
+msgstr "Грешка при изключване на уведомлението."
+
+#: classes/Command.php:333
+msgid "Notification on."
+msgstr "Уведомлението е включено."
+
+#: classes/Command.php:335
+msgid "Can't turn on notification."
+msgstr "Грешка при включване на уведомлението."
+
+#: classes/Command.php:344
+msgid "Commands:\n"
+msgstr "Команди:\n"
+
+#: classes/Message.php:53
+msgid "Could not insert message."
+msgstr "Грешка при вмъкване на �ъобщението."
+
+#: classes/Message.php:63
+msgid "Could not update message with new URI."
+msgstr "Грешка при обнов�ване на бележката � нов URL-адре�."
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr "Потребител без �ъответ�тващ профил в �и�темата."
+
+#: lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:249
+#, php-format
+msgid "New private message from %s"
+msgstr "�ово лично �ъобщение от %s"
+
+#: lib/mail.php:253
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+msgstr "%1$s (%2$s) ви изпрати лично �ъобщение:\n\n"
+
+#: lib/mailbox.php:43
+msgid "Only the user can read their own mailboxes."
+msgstr "Само потребител�т може да отвар� �об�твената �и кути�."
+
+#: lib/openid.php:195
+msgid "This form should automatically submit itself. "
+msgstr "Тази форма �ама ще �е изпрати автоматично."
+
+#: lib/personal.php:65
+msgid "Favorites"
+msgstr "Любими"
+
+#: lib/personal.php:66
+#, php-format
+msgid "%s's favorite notices"
+msgstr "Любими бележки на %s"
+
+#: lib/personal.php:66
+msgid "User"
+msgstr "Потребител"
+
+#: lib/personal.php:75
+msgid "Inbox"
+msgstr "Вход�щи"
+
+#: lib/personal.php:76
+msgid "Your incoming messages"
+msgstr "Получените от ва� �ъобщени�"
+
+#: lib/personal.php:80
+msgid "Outbox"
+msgstr "Изход�щи"
+
+#: lib/personal.php:81
+msgid "Your sent messages"
+msgstr "Изпратените от ва� �ъобщени�"
+
+#: lib/settingsaction.php:99
+msgid "Twitter"
+msgstr "Twitter"
+
+#: lib/settingsaction.php:100
+msgid "Twitter integration options"
+msgstr "�а�тройки за интеграци� � Twitter"
+
+#: lib/util.php:1718
+msgid "To"
+msgstr "До"
+
+#: scripts/maildaemon.php:45
+msgid "Could not parse message."
+msgstr "Грешка при обработка на �ъобщението"
diff --git a/locale/ca_ES/LC_MESSAGES/laconica.mo b/locale/ca_ES/LC_MESSAGES/laconica.mo
index 043c51c22..4710aa6c5 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 d4a05005a..7de9466c6 100644
--- a/locale/ca_ES/LC_MESSAGES/laconica.po
+++ b/locale/ca_ES/LC_MESSAGES/laconica.po
@@ -6,79 +6,46 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-27 14:57-0400\n"
+"POT-Creation-Date: 2008-07-14 21:07+1200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Oscar Ciutat <oscarciutat@gmail.com>\n"
 "Language-Team: Catalan <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: ../actions/noticesearchrss.php:64
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "Cerca \"%s\" al flux"
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
 msgid ""
-" except this private data: password, email address, IM address, phone number."
+" except this private data: password, email address, IM address, phone "
+"number."
 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."
 
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-msgid " from "
-msgstr ""
-
-#: ../actions/twitapistatuses.php:478
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/invite.php:168
-#, fuzzy, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s ara està escoltant els teus avisos a %2$s."
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-
-#: ../lib/mail.php:124
+#: ../actions/subscribe.php:84
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s ara està escoltant els teus avisos a %2$s."
 
-#: ../lib/mail.php:126
+#: ../actions/subscribe.php:86
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -95,157 +62,73 @@ msgstr ""
 "Atentament,\n"
 "%4$s.\n"
 
-#: ../actions/twitapistatuses.php:482
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-
 #: ../actions/shownotice.php:45
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "estat de %1$s a %2$s"
 
-#: ../actions/invite.php:84 ../actions/invite.php:92
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:60
 #, php-format
 msgid "%s Public Stream"
 msgstr "Flux públic de %s"
 
-#: ../actions/all.php:47 ../actions/allrss.php:60
-#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51
+#: ../actions/all.php:47 ../actions/allrss.php:70 ../lib/stream.php:45
 #, php-format
 msgid "%s and friends"
 msgstr "%s i amics"
 
-#: ../actions/twitapistatuses.php:49
-#, fuzzy, php-format
-msgid "%s public timeline"
-msgstr "Línia temporal pública"
-
-#: ../lib/mail.php:206
-#, fuzzy, php-format
-msgid "%s status"
-msgstr "estat de %1$s a %2$s"
-
-#: ../actions/twitapistatuses.php:338
-#, fuzzy, php-format
-msgid "%s timeline"
-msgstr "Línia temporal pública"
-
-#: ../actions/twitapistatuses.php:52
+#: ../lib/util.php:233
 #, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:213
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr ""
-
-#: ../lib/util.php:257
-#, php-format
-msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** is a microblogging service brought to you by "
+"[%%site.broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
-"**%%site.name%%** és un servei de microblogging de [%%site.broughtby%%**](%%"
-"site.broughtbyurl%%)."
+"**%%site.name%%** és un servei de microblogging de "
+"[%%site.broughtby%%**](%%site.broughtbyurl%%)."
 
-#: ../lib/util.php:259
+#: ../lib/util.php:235
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** és un servei de microblogging."
 
-#: ../lib/util.php:274
+#: ../lib/util.php:250
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ""
 ". Els col·laboradors han de ser citats pel seu nom complet o sobrenom. "
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
+#: ../actions/register.php:176
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
-"1-64 lletres en minúscula o números, sense signes de puntuació o espais"
+"1-64 lletres en minúscula o números, sense signes de puntuació o "
+"espais"
 
-#: ../actions/register.php:152
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 lletres en minúscula o números, sense signes de puntuació o espais"
-
-#: ../actions/password.php:42
+#: ../actions/password.php:42 ../actions/register.php:178
 msgid "6 or more characters"
 msgstr "6 o més caràcters"
 
-#: ../actions/recoverpassword.php:180
+#: ../actions/recoverpassword.php:165
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 o més caràcters, i no te n'oblidis!"
 
-#: ../actions/register.php:154
-#, fuzzy
-msgid "6 or more characters. Required."
-msgstr "6 o més caràcters"
-
-#: ../actions/imsettings.php:197
+#: ../actions/imsettings.php:188
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
-msgstr ""
-"S'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."
-
-#: ../actions/emailsettings.php:213
-#, fuzzy
-msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
-msgstr ""
-"S'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."
-
-#: ../actions/smssettings.php:216
-#, fuzzy
-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ó a l'adreça de missatgeria instantània que "
-"has afegit. Has d'acceptar que %s et pugui enviar missatges."
-
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122
-msgid "API method not found!"
-msgstr ""
-
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-msgid "API method under construction."
+"A confirmation code was sent to the IM address you added. You must approve "
+"%s for sending messages to you."
 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."
 
-#: ../lib/util.php:324
+#: ../lib/util.php:296
 msgid "About"
 msgstr "Sobre"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/userauthorization.php:118
 msgid "Accept"
 msgstr "Acceptar"
 
-#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
-#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
 msgid "Add"
 msgstr "Afegir"
 
@@ -253,25 +136,15 @@ msgstr "Afegir"
 msgid "Add OpenID"
 msgstr "Afegir OpenID"
 
-#: ../lib/settingsaction.php:97
-#, fuzzy
-msgid "Add or remove OpenIDs"
-msgstr "Eliminar OpenID"
-
-#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39
+#: ../actions/imsettings.php:39
 msgid "Address"
 msgstr "Adreça"
 
-#: ../actions/invite.php:131
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../actions/showstream.php:273
+#: ../actions/showstream.php:254
 msgid "All subscriptions"
 msgstr "Totes les subscripcions"
 
-#: ../actions/publicrss.php:64
+#: ../actions/publicrss.php:62
 #, php-format
 msgid "All updates for %s"
 msgstr "Totes les actualitzacions per a %s"
@@ -281,35 +154,26 @@ msgstr "Totes les actualitzacions per a %s"
 msgid "All updates matching search term \"%s\""
 msgstr "Totes les actualitzacions que corresponen a la frase a cercar \"%s\" "
 
-#: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
-#: ../actions/openidlogin.php:29 ../actions/register.php:30
+#: ../actions/finishopenidlogin.php:29 ../actions/login.php:27
+#: ../actions/openidlogin.php:29 ../actions/register.php:28
 msgid "Already logged in."
 msgstr "Ja estàs connectat."
 
-#: ../lib/subs.php:42
+#: ../actions/subscribe.php:48
 msgid "Already subscribed!."
 msgstr "Ja estàs subscrit!"
 
-#: ../actions/deletenotice.php:54
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/userauthorization.php:77
+#: ../actions/userauthorization.php:76
 msgid "Authorize subscription"
 msgstr "Autoritzar subscripció"
 
-#: ../actions/login.php:104 ../actions/register.php:178
+#: ../actions/login.php:100 ../actions/register.php:184
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Iniciar sessió automàticament en el futur; no utilitzar en ordinadors "
 "compartits!"
 
-#: ../actions/profilesettings.php:65
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr ""
-
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: ../actions/avatar.php:32
 msgid "Avatar"
 msgstr "Avatar"
 
@@ -327,49 +191,28 @@ msgstr ""
 "Jabber/GTalk un missatge amb més instruccions. (Has afegit a %s a la teva "
 "llista d'amics?)"
 
-#: ../actions/emailsettings.php:54
-#, fuzzy
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-msgstr ""
-"A l'espera d'una confirmació per a aquesta adreça. Busca al teu compte "
-"Jabber/GTalk un missatge amb més instruccions. (Has afegit a %s a la teva "
-"llista d'amics?)"
-
-#: ../actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
-
-#: ../lib/util.php:1318
+#: ../lib/util.php:1136
 msgid "Before »"
 msgstr "Anterior »"
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: ../actions/profilesettings.php:52
 msgid "Bio"
 msgstr "Biografia"
 
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103
+#: ../actions/profilesettings.php:93 ../actions/updateprofile.php:102
 msgid "Bio is too long (max 140 chars)."
 msgstr "La biografia és massa llarga (màx. 140 caràcters)."
 
-#: ../lib/deleteaction.php:41
-#, fuzzy
-msgid "Can't delete this notice."
-msgstr "No s'ha pogut eliminar la confirmació de correu electrònic."
-
-#: ../actions/updateprofile.php:119
+#: ../actions/updateprofile.php:118
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "No es pot llegir l'URL de l'avatar '%s'"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
+#: ../actions/password.php:85 ../actions/recoverpassword.php:261
 msgid "Can't save new password."
 msgstr "No es pot guardar la nova contrasenya."
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62
+#: ../actions/imsettings.php:59
 msgid "Cancel"
 msgstr "Cancel·lar"
 
@@ -377,79 +220,35 @@ msgstr "Cancel·lar"
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Impossible crear una instància de l'objecte OpenID"
 
-#: ../actions/imsettings.php:163
+#: ../actions/imsettings.php:154
 msgid "Cannot normalize that Jabber ID"
 msgstr "Impossible normalitzar aquest Jabber ID"
 
-#: ../actions/emailsettings.php:181
-#, fuzzy
-msgid "Cannot normalize that email address"
-msgstr "Impossible normalitzar aquest Jabber ID"
-
 #: ../actions/password.php:45
 msgid "Change"
 msgstr "Canviar"
 
-#: ../lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
 #: ../actions/password.php:32
 msgid "Change password"
 msgstr "Canviar contrasenya"
 
-#: ../lib/settingsaction.php:94
-#, fuzzy
-msgid "Change your password"
-msgstr "Canviar contrasenya"
-
-#: ../lib/settingsaction.php:85
-#, fuzzy
-msgid "Change your profile settings"
-msgstr "Configuració del perfil"
-
-#: ../actions/password.php:43 ../actions/recoverpassword.php:181
-#: ../actions/register.php:155 ../actions/smssettings.php:65
+#: ../actions/password.php:43 ../actions/recoverpassword.php:166
+#: ../actions/register.php:179
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: ../actions/confirmaddress.php:90
+#: ../actions/confirmaddress.php:84
 msgid "Confirm Address"
 msgstr "Confirmar adreça"
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245
+#: ../actions/imsettings.php:213
 msgid "Confirmation cancelled."
 msgstr "Confirmació cancel·lada."
 
-#: ../actions/smssettings.php:63
-#, fuzzy
-msgid "Confirmation code"
-msgstr "Cap codi de confirmació."
-
 #: ../actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr "Codi de confirmació no trobat. "
 
-#: ../actions/register.php:202
-#, php-format
-msgid ""
-"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."
-msgstr ""
-
 #: ../actions/finishopenidlogin.php:91
 msgid "Connect"
 msgstr "Connectar-se"
@@ -458,7 +257,7 @@ msgstr "Connectar-se"
 msgid "Connect existing account"
 msgstr "Connectar-se a un compte existent"
 
-#: ../lib/util.php:332
+#: ../lib/util.php:304
 msgid "Contact"
 msgstr "Posar-se en contacte"
 
@@ -467,66 +266,44 @@ msgstr "Posar-se en contacte"
 msgid "Could not create OpenID form: %s"
 msgstr "No s'ha pogut crear el formulari OpenID: %s"
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr ""
-
 #: ../lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "No s'ha pogut redirigir al servidor: %s"
 
-#: ../actions/updateprofile.php:162
+#: ../actions/updateprofile.php:161
 msgid "Could not save avatar info"
 msgstr "No s'ha pogut guardar la informació de l'avatar"
 
-#: ../actions/updateprofile.php:155
+#: ../actions/updateprofile.php:154
 msgid "Could not save new profile info"
 msgstr "No s'ha pogut guardar la informació del nou perfil"
 
-#: ../lib/subs.php:54
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../lib/subs.php:46
-#, fuzzy
-msgid "Could not subscribe."
-msgstr "No estàs subscrit!"
-
-#: ../actions/recoverpassword.php:102
-#, fuzzy
-msgid "Could not update user with confirmed email address."
-msgstr "No s'ha pogut inserir el codi de confirmació."
+#: ../actions/profilesettings.php:146
+msgid "Couldn't confirm email."
+msgstr "No s'ha pogut confirmar el correu electrònic."
 
 #: ../actions/finishremotesubscribe.php:99
 msgid "Couldn't convert request tokens to access tokens."
 msgstr "No s'han pogut convertir els senyals de petició a senyals d'accés."
 
-#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
-#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#: ../actions/subscribe.php:59
+msgid "Couldn't create subscription."
+msgstr "No s'ha pogut crear la subscripció."
+
+#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
 msgid "Couldn't delete email confirmation."
 msgstr "No s'ha pogut eliminar la confirmació de correu electrònic."
 
-#: ../lib/subs.php:103
+#: ../actions/unsubscribe.php:56
 msgid "Couldn't delete subscription."
 msgstr "No s'ha pogut eliminar la subscripció."
 
-#: ../actions/twitapistatuses.php:93
-#, fuzzy
-msgid "Couldn't find any statuses."
-msgstr "No s'ha pogut actualitzar l'usuari."
-
-#: ../actions/remotesubscribe.php:127
+#: ../actions/remotesubscribe.php:125
 msgid "Couldn't get a request token."
 msgstr "No s'ha pogut obtenir un senyal de petició."
 
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206
+#: ../actions/imsettings.php:178
 msgid "Couldn't insert confirmation code."
 msgstr "No s'ha pogut inserir el codi de confirmació."
 
@@ -534,24 +311,12 @@ msgstr "No s'ha pogut inserir el codi de confirmació."
 msgid "Couldn't insert new subscription."
 msgstr "No s'ha pogut inserir una nova subscripció."
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: ../actions/profilesettings.php:175
 msgid "Couldn't save profile."
 msgstr "No s'ha pogut guardar el perfil."
 
-#: ../actions/profilesettings.php:161
-#, fuzzy
-msgid "Couldn't update user for autosubscribe."
-msgstr "No s'ha pogut actualitzar l'usuari."
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#, fuzzy
-msgid "Couldn't update user record."
-msgstr "No s'ha pogut actualitzar l'usuari."
-
-#: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
-#: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
-#: ../actions/imsettings.php:243 ../actions/profilesettings.php:141
-#: ../actions/smssettings.php:157 ../actions/smssettings.php:269
+#: ../actions/confirmaddress.php:70 ../actions/imsettings.php:129
+#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
 msgid "Couldn't update user."
 msgstr "No s'ha pogut actualitzar l'usuari."
 
@@ -575,83 +340,44 @@ msgstr "Crear nou compte per a un OpenID que ja té un usuari."
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Adreça actual Jabber/Gtalk confirmada."
 
-#: ../actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:44
-#, fuzzy
-msgid "Current confirmed email address."
-msgstr "Adreça actual Jabber/Gtalk confirmada."
-
-#: ../actions/showstream.php:356
+#: ../actions/showstream.php:337
 msgid "Currently"
 msgstr "Actualment"
 
-#: ../classes/Notice.php:72
-#, fuzzy, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "Error de BD en inserir resposta: %s"
-
-#: ../lib/util.php:1061
+#: ../lib/util.php:893
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Error de BD en inserir resposta: %s"
 
-#: ../actions/deletenotice.php:41
-#, fuzzy
-msgid "Delete notice"
-msgstr "Nou avís"
-
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: ../actions/profilesettings.php:54
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Explica'ns alguna cosa sobre tu i els teus interessos en 140 caràcters"
 
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87
+#: ../actions/register.php:181
 msgid "Email"
 msgstr "Correu electrònic"
 
-#: ../actions/emailsettings.php:59
-#, fuzzy
-msgid "Email Address"
+#: ../actions/profilesettings.php:46
+msgid "Email address"
 msgstr "Adreça de correu electrònic"
 
-#: ../actions/emailsettings.php:32
-#, fuzzy
-msgid "Email Settings"
-msgstr "Configuració"
-
-#: ../actions/register.php:73
+#: ../actions/profilesettings.php:102 ../actions/register.php:63
 msgid "Email address already exists."
 msgstr "L'adreça de correu electrònic ja existeix."
 
-#: ../lib/mail.php:90
+#: ../lib/mail.php:82
 msgid "Email address confirmation"
 msgstr "Confirmació de l'adreça de correu electrònic"
 
-#: ../actions/emailsettings.php:61
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/invite.php:129
-#, fuzzy
-msgid "Email addresses"
-msgstr "Adreça de correu electrònic"
-
-#: ../actions/recoverpassword.php:191
+#: ../actions/recoverpassword.php:176
 msgid "Enter a nickname or email address."
 msgstr "Escriu un sobrenom o una adreça de correu electrònic."
 
-#: ../actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/userauthorization.php:137
+#: ../actions/userauthorization.php:136
 msgid "Error authorizing token"
 msgstr "Error en autoritzar senyal"
 
-#: ../actions/finishopenidlogin.php:253
+#: ../actions/finishopenidlogin.php:282
 msgid "Error connecting user to OpenID."
 msgstr "Error en connectar usuari a OpenID."
 
@@ -667,19 +393,23 @@ msgstr "Error en inserir avatar"
 msgid "Error inserting new profile"
 msgstr "Error en inserir el nou perfil"
 
+#: ../actions/postnotice.php:88
+msgid "Error inserting notice"
+msgstr "Error en inserir avís"
+
 #: ../actions/finishremotesubscribe.php:167
 msgid "Error inserting remote profile"
 msgstr "Error en inserir perfil remot"
 
-#: ../actions/recoverpassword.php:240
+#: ../actions/recoverpassword.php:201
 msgid "Error saving address confirmation."
 msgstr "Error en guardar confirmació de l'adreça."
 
-#: ../actions/userauthorization.php:140
+#: ../actions/userauthorization.php:139
 msgid "Error saving remote profile"
 msgstr "Error en guardar perfil remot"
 
-#: ../lib/openid.php:226
+#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
 msgid "Error saving the profile."
 msgstr "Error en guardar perfil."
 
@@ -691,8 +421,8 @@ msgstr "Error en guardar l'usuari."
 msgid "Error saving user; invalid."
 msgstr "Error en guardar usuari; invàlid."
 
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
+#: ../actions/login.php:43 ../actions/login.php:69
+#: ../actions/recoverpassword.php:268 ../actions/register.php:73
 msgid "Error setting user."
 msgstr "Error en configurar l'usuari."
 
@@ -704,7 +434,7 @@ msgstr "Error en actualitzar el perfil"
 msgid "Error updating remote profile"
 msgstr "Error en actualitzar el perfil remot"
 
-#: ../actions/recoverpassword.php:80
+#: ../actions/recoverpassword.php:79
 msgid "Error with confirmation code."
 msgstr "Error amb el codi de confirmació."
 
@@ -712,7 +442,7 @@ msgstr "Error amb el codi de confirmació."
 msgid "Existing nickname"
 msgstr "Sobrenom ja existent."
 
-#: ../lib/util.php:326
+#: ../lib/util.php:298
 msgid "FAQ"
 msgstr "Preguntes freqüents"
 
@@ -720,30 +450,17 @@ msgstr "Preguntes freqüents"
 msgid "Failed updating avatar."
 msgstr "Error en actualitzar avatar."
 
-#: ../actions/all.php:61 ../actions/allrss.php:64
+#: ../actions/all.php:61 ../actions/allrss.php:74
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Feed per a amics de %s"
 
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: ../actions/replies.php:61 ../actions/repliesrss.php:80
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Feed per a respostes a %s"
 
-#: ../actions/tag.php:55
-#, fuzzy, php-format
-msgid "Feed for tag %s"
-msgstr "Feed per a respostes a %s"
-
-#: ../lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/login.php:122
+#: ../actions/login.php:118
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -751,40 +468,31 @@ msgstr ""
 "Per raons de seguretat, si us plau torna a escriure el teu nom d'usuari i "
 "contrasenya abans de canviar la teva configuració."
 
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: ../actions/profilesettings.php:44
 msgid "Full name"
 msgstr "Nom complet"
 
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93
+#: ../actions/profilesettings.php:90 ../actions/updateprofile.php:92
 msgid "Full name is too long (max 255 chars)."
 msgstr "El teu nom és massa llarg (màx. 255 caràcters)."
 
-#: ../lib/util.php:322
+#: ../lib/util.php:279
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:274
 msgid "Home"
 msgstr "Inici"
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: ../actions/profilesettings.php:49
 msgid "Homepage"
 msgstr "Pàgina personal"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: ../actions/profilesettings.php:87
 msgid "Homepage is not a valid URL."
 msgstr "La pàgina personal no és un URL vàlid."
 
-#: ../actions/emailsettings.php:91
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102
-msgid "IM"
-msgstr ""
-
-#: ../actions/imsettings.php:60
+#: ../actions/imsettings.php:61
 msgid "IM Address"
 msgstr "Adreça de missatgeria instantània"
 
@@ -808,34 +516,24 @@ msgstr ""
 "Si vols afegir un compte OpenID, introdueix-lo en el camp de sota i clica "
 "\"Afegir\"."
 
-#: ../actions/recoverpassword.php:137
-#, fuzzy
+#: ../actions/recoverpassword.php:122
 msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
+"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 ""
 "Si has oblidat o has perdut la teva contrasenya, pots rebre una de nova a "
 "l'adreça de correu electrònic que vas utilitzar per a registrar el teu "
 "compte."
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283
-#, fuzzy
-msgid "Incoming email address removed."
-msgstr "L'adreça ha estat eliminada."
-
 #: ../actions/password.php:69
 msgid "Incorrect old password"
 msgstr "Contrasenya antiga incorrecta"
 
-#: ../actions/login.php:67
+#: ../actions/login.php:63
 msgid "Incorrect username or password."
 msgstr "Nom d'usuari o contrasenya incorrectes."
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:226
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -843,22 +541,17 @@ msgstr ""
 "S'han enviat instruccions per a recuperar la teva contrasenya a l'adreça de "
 "correu electrònic registrada."
 
-#: ../actions/updateprofile.php:114
+#: ../actions/updateprofile.php:113
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "L'URL de l'avatar '%s' és invàlid"
 
-#: ../actions/invite.php:55
-#, fuzzy, php-format
-msgid "Invalid email address: %s"
-msgstr "Adreça de correu electrònic no vàlida."
-
-#: ../actions/updateprofile.php:98
+#: ../actions/updateprofile.php:97
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "La pàgina personal '%s' és invàlida"
 
-#: ../actions/updateprofile.php:82
+#: ../actions/updateprofile.php:81
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "L'URL de la llicència '%s' és invàlid"
@@ -875,7 +568,7 @@ msgstr "L'URI de l'avís '%s' és invàlid"
 msgid "Invalid notice url"
 msgstr "L'URL de l'avís '%s' és invàlid"
 
-#: ../actions/updateprofile.php:87
+#: ../actions/updateprofile.php:86
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "L'URL del perfil '%s' és invàlid."
@@ -892,43 +585,27 @@ msgstr "URL del perfil retornat pel servidor invàlid."
 msgid "Invalid size."
 msgstr "Mida invàlida."
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111
+#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
+#: ../actions/register.php:84
 msgid "Invalid username or password."
 msgstr "Nom d'usuari o contrasenya invàlids."
 
-#: ../actions/invite.php:79
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123
-msgid "Invite new users"
-msgstr ""
-
-#: ../lib/util.php:261
+#: ../lib/util.php:237
 #, 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)."
+"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 ""
-"Utilitza el software de microblogging [Laconica](http://laconi.ca), versió %"
-"s, disponible sota la [GNU Affero General Public License](http://www.fsf.org/"
-"licensing/licenses/agpl-3.0.html)."
+"Utilitza el software de microblogging [Laconica](http://laconi.ca), versió "
+"%s, disponible sota la [GNU Affero General Public "
+"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:173
+#: ../actions/imsettings.php:164
 msgid "Jabber ID already belongs to another user."
 msgstr "Aquest Jabber ID ja està sent utilitzat per un altre usuari."
 
-#: ../actions/imsettings.php:62
+#: ../actions/imsettings.php:63
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -938,26 +615,16 @@ msgstr ""
 "assegura't d'afegir a %s a la teva llista d'amics en el teu client de "
 "missatgeria instantània o a GTalk."
 
-#: ../actions/profilesettings.php:57
-msgid "Language"
-msgstr ""
-
-#: ../actions/profilesettings.php:113
-#, fuzzy
-msgid "Language is too long (max 50 chars)."
-msgstr "La ubicació és massa llarga (màx. 255 caràcters)."
-
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: ../actions/profilesettings.php:55
 msgid "Location"
 msgstr "Ubicació"
 
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108
+#: ../actions/profilesettings.php:96 ../actions/updateprofile.php:107
 msgid "Location is too long (max 255 chars)."
 msgstr "La ubicació és massa llarga (màx. 255 caràcters)."
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310
+#: ../actions/login.php:93 ../actions/login.php:102
+#: ../actions/openidlogin.php:68 ../lib/util.php:286
 msgid "Login"
 msgstr "Inici de sessió"
 
@@ -966,39 +633,26 @@ msgstr "Inici de sessió"
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Inici de sessió amb un compte [OpenID](%%doc.openid%%)."
 
-#: ../actions/login.php:126
+#: ../actions/login.php:122
 #, 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%"
-"%). "
+"Login with your username and password. Don't have a username yet? "
+"[Register](%%action.register%%) a new account, or try "
+"[OpenID](%%action.openidlogin%%). "
 msgstr ""
 "Inicia una sessió amb el teu nom d'usuari i la teva contrasenya. Encara no "
 "tens un nom d'usuari? [Crea](%%action.register%%) un nou compte o prova "
 "[OpenID] (%%action.openidlogin%%)."
 
-#: ../lib/util.php:308
+#: ../lib/util.php:284
 msgid "Logout"
 msgstr "Sortir"
 
-#: ../actions/register.php:166
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
-
-#: ../actions/login.php:110
+#: ../actions/login.php:106
 msgid "Lost or forgotten password?"
 msgstr "Contrasenya oblidada o perduda?"
 
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr ""
-
-#: ../actions/showstream.php:300
+#: ../actions/showstream.php:281
 msgid "Member since"
 msgstr "Membre des de"
 
@@ -1007,59 +661,38 @@ msgstr "Membre des de"
 msgid "Microblog by %s"
 msgstr "Microblog de %s"
 
-#: ../actions/smssettings.php:304
-#, php-format
-msgid ""
-"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
-"email but isn't listed here, send email to let us know at %s."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
 msgid "My text and files are available under "
 msgstr "El meu text i els meus fitxers estan disponibles sota "
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-msgid "New"
-msgstr ""
-
-#: ../lib/mail.php:144
-#, fuzzy, php-format
-msgid "New email address for posting to %s"
-msgstr "Cap adreça de correu electrònic registrada per aquest usuari."
-
-#: ../actions/emailsettings.php:297
-#, fuzzy
-msgid "New incoming email address added."
-msgstr "Adreça de correu electrònic no vàlida."
-
 #: ../actions/finishopenidlogin.php:71
 msgid "New nickname"
 msgstr "Nou sobrenom"
 
-#: ../actions/newnotice.php:87
+#: ../actions/newnotice.php:100
 msgid "New notice"
 msgstr "Nou avís"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
+#: ../actions/password.php:41 ../actions/recoverpassword.php:164
 msgid "New password"
 msgstr "Nova contrasenya"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:275
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nova contrasenya guardada correctament. Has iniciat una sessió."
 
-#: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151
+#: ../actions/login.php:97 ../actions/profilesettings.php:41
+#: ../actions/register.php:175
 msgid "Nickname"
 msgstr "Sobrenom"
 
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69
+#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:99
+#: ../actions/register.php:59
 msgid "Nickname already in use. Try another one."
 msgstr "Aquest sobrenom ja existeix. Prova un altre. "
 
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:67 ../actions/updateprofile.php:77
+#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:80
+#: ../actions/register.php:57 ../actions/updateprofile.php:76
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "El sobrenom ha de tenir només lletres minúscules i números i no pot tenir "
@@ -1073,53 +706,30 @@ msgstr "Sobrenom no permès."
 msgid "Nickname of the user you want to follow"
 msgstr "Sobrenom de l'usuari que vols seguir"
 
-#: ../actions/recoverpassword.php:162
+#: ../actions/recoverpassword.php:147
 msgid "Nickname or email"
 msgstr "Sobrenom o correu electrònic"
 
-#: ../actions/deletenotice.php:59
-msgid "No"
-msgstr ""
-
-#: ../actions/imsettings.php:156
+#: ../actions/imsettings.php:147
 msgid "No Jabber ID."
 msgstr "Cap Jabber ID."
 
-#: ../actions/userauthorization.php:129
+#: ../actions/userauthorization.php:128
 msgid "No authorization request!"
 msgstr "Cap petició d'autorització!"
 
-#: ../actions/smssettings.php:181
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316
-#, fuzzy
-msgid "No code entered"
-msgstr "Cap contingut!"
-
 #: ../actions/confirmaddress.php:33
 msgid "No confirmation code."
 msgstr "Cap codi de confirmació."
 
-#: ../actions/newnotice.php:44
+#: ../actions/newnotice.php:49
 msgid "No content!"
 msgstr "Cap contingut!"
 
-#: ../actions/emailsettings.php:174
-#, fuzzy
-msgid "No email address."
-msgstr "Adreça de correu electrònic"
-
-#: ../actions/userbyid.php:32
+#: ../actions/userbyid.php:27
 msgid "No id."
 msgstr "Cap identificador."
 
-#: ../actions/emailsettings.php:271
-#, fuzzy
-msgid "No incoming email address."
-msgstr "Adreça de correu electrònic no vàlida."
-
 #: ../actions/finishremotesubscribe.php:65
 msgid "No nickname provided by remote server."
 msgstr "Cap sobrenom retornat pel servidor remot."
@@ -1128,25 +738,19 @@ msgstr "Cap sobrenom retornat pel servidor remot."
 msgid "No nickname."
 msgstr "Cap sobrenom."
 
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229
+#: ../actions/imsettings.php:197
 msgid "No pending confirmation to cancel."
 msgstr "Cap confirmació pendent per a cancel·lar."
 
-#: ../actions/smssettings.php:176
-#, fuzzy
-msgid "No phone number."
-msgstr "No existeix aquest usuari."
-
 #: ../actions/finishremotesubscribe.php:72
 msgid "No profile URL returned by server."
 msgstr "Cap URL de perfil retornar pel servidor."
 
-#: ../actions/recoverpassword.php:226
+#: ../actions/recoverpassword.php:189
 msgid "No registered email address for that user."
 msgstr "Cap adreça de correu electrònic registrada per aquest usuari."
 
-#: ../actions/userauthorization.php:49
+#: ../actions/userauthorization.php:48
 msgid "No request found!"
 msgstr "Cap petició trobada!"
 
@@ -1158,14 +762,6 @@ msgstr "Cap resultat"
 msgid "No size."
 msgstr "Cap mida."
 
-#: ../actions/twitapistatuses.php:595
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555
-msgid "No status with that ID found."
-msgstr ""
-
 #: ../actions/openidsettings.php:135
 msgid "No such OpenID."
 msgstr "No existeix aquest compte OpenID."
@@ -1174,8 +770,7 @@ msgstr "No existeix aquest compte OpenID."
 msgid "No such document."
 msgstr "No existeix aquest document."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30
+#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
 msgid "No such notice."
 msgstr "No existeix aquest avís."
 
@@ -1188,21 +783,16 @@ msgid "No such subscription"
 msgstr "No existeix aquesta subscripció"
 
 #: ../actions/all.php:34 ../actions/allrss.php:35
-#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
-#: ../actions/remotesubscribe.php:84 ../actions/remotesubscribe.php:91
-#: ../actions/replies.php:57 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:110 ../actions/userbyid.php:36
-#: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
-#: ../lib/subs.php:33 ../lib/subs.php:82
+#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:36
+#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
+#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
+#: ../actions/showstream.php:95 ../actions/subscribe.php:43
+#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
+#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
 msgid "No such user."
 msgstr "No existeix aquest usuari."
 
-#: ../actions/recoverpassword.php:211
-#, fuzzy
-msgid "No user with that email address or username."
-msgstr "Cap adreça de correu electrònic registrada per aquest usuari."
-
-#: ../lib/gallery.php:80
+#: ../lib/gallery.php:76
 msgid "Nobody to show!"
 msgstr "Ningú a mostrar!"
 
@@ -1210,18 +800,7 @@ msgstr "Ningú a mostrar!"
 msgid "Not a recovery code."
 msgstr "No és un codi de recuperació."
 
-#: ../scripts/maildaemon.php:50
-#, fuzzy
-msgid "Not a registered user."
-msgstr "No és un codi de recuperació."
-
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332
-#, fuzzy
-msgid "Not a supported data format."
-msgstr "Format d'imatge no suportat."
-
-#: ../actions/imsettings.php:167
+#: ../actions/imsettings.php:158
 msgid "Not a valid Jabber ID"
 msgstr "Jabber ID no vàlid"
 
@@ -1229,24 +808,19 @@ msgstr "Jabber ID no vàlid"
 msgid "Not a valid OpenID."
 msgstr "OpenID no vàlid."
 
-#: ../actions/emailsettings.php:185
-#, fuzzy
-msgid "Not a valid email address"
-msgstr "Adreça de correu electrònic no vàlida."
-
-#: ../actions/register.php:63
+#: ../actions/profilesettings.php:75 ../actions/register.php:53
 msgid "Not a valid email address."
 msgstr "Adreça de correu electrònic no vàlida."
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
+#: ../actions/profilesettings.php:83 ../actions/register.php:61
 msgid "Not a valid nickname."
 msgstr "Sobrenom no vàlid."
 
-#: ../actions/remotesubscribe.php:120
+#: ../actions/remotesubscribe.php:118
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "URL de perfil no vàlid (serveis incorrectes)."
 
-#: ../actions/remotesubscribe.php:113
+#: ../actions/remotesubscribe.php:111
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "URL de perfil no vàlid (XRDS no definit)."
 
@@ -1266,27 +840,16 @@ msgstr "No autoritzat."
 msgid "Not expecting this response!"
 msgstr "Resposta inesperada!"
 
-#: ../actions/twitapistatuses.php:422
-#, fuzzy
-msgid "Not found"
-msgstr "Cap petició trobada!"
-
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:28
-#: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
-#: ../lib/settingsaction.php:27
+#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
+#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
+#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
 msgid "Not logged in."
 msgstr "No connectat."
 
-#: ../lib/subs.php:91
+#: ../actions/unsubscribe.php:43
 msgid "Not subscribed!."
 msgstr "No estàs subscrit!"
 
-#: ../actions/opensearch.php:35
-#, fuzzy
-msgid "Notice Search"
-msgstr "Cercar"
-
 #: ../actions/showstream.php:82
 #, php-format
 msgid "Notice feed for %s"
@@ -1296,20 +859,15 @@ msgstr "Feed d'avisos de %s"
 msgid "Notice has no profile"
 msgstr "Avís sense perfil"
 
-#: ../actions/showstream.php:316
+#: ../actions/showstream.php:297
 msgid "Notices"
 msgstr "Avisos"
 
-#: ../actions/tag.php:35 ../actions/tag.php:81
-#, fuzzy, php-format
-msgid "Notices tagged with %s"
-msgstr "Feed d'avisos de %s"
-
 #: ../actions/password.php:39
 msgid "Old password"
 msgstr "Antiga contrasenya"
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314
+#: ../lib/util.php:288
 msgid "OpenID"
 msgstr "OpenID"
 
@@ -1352,69 +910,44 @@ msgstr "OpenID eliminat."
 msgid "OpenID settings"
 msgstr "Configuració OpenID"
 
-#: ../actions/invite.php:135
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
 #: ../actions/avatar.php:84
 msgid "Partial upload."
 msgstr "Càrrega parcial."
 
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
-#: ../actions/register.php:153 ../lib/settingsaction.php:93
+#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
+#: ../actions/register.php:177
 msgid "Password"
 msgstr "Contrasenya"
 
-#: ../actions/recoverpassword.php:288
+#: ../actions/recoverpassword.php:249
 msgid "Password and confirmation do not match."
 msgstr "La contrasenya i la confirmació no coincideixen."
 
-#: ../actions/recoverpassword.php:284
+#: ../actions/recoverpassword.php:245
 msgid "Password must be 6 chars or more."
 msgstr "La contrasenya ha de tenir 6 o més caràcters."
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
 msgid "Password recovery requested"
 msgstr "Recuperació de contrasenya sol·licitada"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: ../actions/password.php:89 ../actions/recoverpassword.php:274
 msgid "Password saved."
 msgstr "Contrasenya guardada."
 
-#: ../actions/password.php:61 ../actions/register.php:88
+#: ../actions/password.php:61 ../actions/register.php:65
 msgid "Passwords don't match."
 msgstr "Les contrasenyes no coincideixen."
 
-#: ../lib/searchaction.php:100
-#, fuzzy
-msgid "People"
-msgstr "Cerca de gent"
-
-#: ../actions/opensearch.php:33
-#, fuzzy
-msgid "People Search"
-msgstr "Cerca de gent"
-
 #: ../actions/peoplesearch.php:33
 msgid "People search"
 msgstr "Cerca de gent"
 
-#: ../lib/stream.php:50
+#: ../lib/stream.php:44
 msgid "Personal"
 msgstr "Personal"
 
-#: ../actions/invite.php:133
-#, fuzzy
-msgid "Personal message"
-msgstr "Personal"
-
-#: ../actions/smssettings.php:69
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-"1-64 lletres en minúscula o números, sense signes de puntuació o espais"
-
-#: ../actions/userauthorization.php:78
+#: ../actions/userauthorization.php:77
 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, "
@@ -1424,34 +957,27 @@ msgstr ""
 "subscriure't als avisos d'aquest usuari. Si no has demanat subscriure't als "
 "avisos de ningú, clica \"Cancel·lar\"."
 
-#: ../actions/imsettings.php:73
+#: ../actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Enviar un avís quan el meu estat Jabber/GTalk canvii."
 
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94
+#: ../actions/imsettings.php:68
 msgid "Preferences"
 msgstr "Preferències"
 
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163
+#: ../actions/imsettings.php:135
 msgid "Preferences saved."
 msgstr "Preferències guardades."
 
-#: ../actions/profilesettings.php:57
-#, fuzzy
-msgid "Preferred language"
-msgstr "Preferències"
-
-#: ../lib/util.php:328
+#: ../lib/util.php:300
 msgid "Privacy"
 msgstr "Privacitat"
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106
+#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
 msgid "Problem saving notice."
 msgstr "Problema en guardar l'avís."
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60
+#: ../lib/stream.php:54
 msgid "Profile"
 msgstr "Perfil"
 
@@ -1463,10 +989,14 @@ msgstr "URL del perfil"
 msgid "Profile settings"
 msgstr "Configuració del perfil"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
 msgid "Profile unknown"
 msgstr "Perfil desconegut"
 
+#: ../lib/util.php:276
+msgid "Public"
+msgstr "Públic"
+
 #: ../actions/public.php:54
 msgid "Public Stream Feed"
 msgstr "Feed del flux públic"
@@ -1475,25 +1005,11 @@ msgstr "Feed del flux públic"
 msgid "Public timeline"
 msgstr "Línia temporal pública"
 
-#: ../actions/imsettings.php:79
-#, fuzzy
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Adreça actual Jabber/Gtalk confirmada."
-
-#: ../actions/emailsettings.php:94
-#, fuzzy
-msgid "Publish a MicroID for my email address."
-msgstr "Escriu un sobrenom o una adreça de correu electrònic."
-
-#: ../actions/tag.php:75 ../actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
-
-#: ../actions/recoverpassword.php:166
+#: ../actions/recoverpassword.php:151
 msgid "Recover"
 msgstr "Recuperar"
 
-#: ../actions/recoverpassword.php:156
+#: ../actions/recoverpassword.php:141
 msgid "Recover password"
 msgstr "Recuperar contrasenya"
 
@@ -1501,28 +1017,19 @@ msgstr "Recuperar contrasenya"
 msgid "Recovery code for unknown user."
 msgstr "Codi de recuperació d'un usuari desconegut."
 
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: ../actions/register.php:171 ../actions/register.php:195 ../lib/util.php:287
 msgid "Register"
 msgstr "Registrar-se"
 
-#: ../actions/register.php:28
-#, fuzzy
-msgid "Registration not allowed."
-msgstr "Sobrenom no permès."
-
-#: ../actions/register.php:200
-msgid "Registration successful"
-msgstr ""
-
-#: ../actions/userauthorization.php:120
+#: ../actions/userauthorization.php:119
 msgid "Reject"
 msgstr "Rebutjar"
 
-#: ../actions/login.php:103 ../actions/register.php:176
+#: ../actions/login.php:99 ../actions/register.php:183
 msgid "Remember me"
 msgstr "Recorda'm"
 
-#: ../actions/updateprofile.php:70
+#: ../actions/updateprofile.php:69
 msgid "Remote profile with no matching profile"
 msgstr "Perfil remot sense perfil corresponent"
 
@@ -1530,9 +1037,7 @@ msgstr "Perfil remot sense perfil corresponent"
 msgid "Remote subscribe"
 msgstr "Subscripció remota"
 
-#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
-#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -1548,56 +1053,32 @@ msgstr ""
 "Si elimines el teu únic OpenID no podràs tornar a entrar! Si necessites "
 "eliminar-lo, afegeix un altre abans."
 
-#: ../lib/stream.php:55
+#: ../lib/stream.php:49
 msgid "Replies"
 msgstr "Respostes"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
 #, php-format
 msgid "Replies to %s"
 msgstr "Respostes a %s"
 
-#: ../actions/recoverpassword.php:183
+#: ../actions/recoverpassword.php:168
 msgid "Reset"
 msgstr "Restablir"
 
-#: ../actions/recoverpassword.php:173
+#: ../actions/recoverpassword.php:158
 msgid "Reset password"
 msgstr "Restablir contrasenya"
 
-#: ../lib/settingsaction.php:99
-msgid "SMS"
-msgstr ""
-
-#: ../actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
-
-#: ../actions/smssettings.php:33
-#, fuzzy
-msgid "SMS Settings"
-msgstr "Configuració de missatgeria instantània"
-
-#: ../lib/mail.php:219
-#, fuzzy
-msgid "SMS confirmation"
-msgstr "Cap codi de confirmació."
-
-#: ../actions/recoverpassword.php:182
+#: ../actions/recoverpassword.php:167 ../actions/register.php:180
 msgid "Same as password above"
 msgstr "Igual a la contrasenya de dalt"
 
-#: ../actions/register.php:156
-#, fuzzy
-msgid "Same as password above. Required."
-msgstr "Igual a la contrasenya de dalt"
-
-#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
-#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
+#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
 msgid "Save"
 msgstr "Guardar"
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300
+#: ../lib/searchaction.php:73 ../lib/util.php:277
 msgid "Search"
 msgstr "Cercar"
 
@@ -1620,53 +1101,25 @@ 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 ""
-"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."
+"Troba gent a %%site.name%% per nom, ubicació o interessos. Separa els "
+"termes de cerca amb espais; han de ser majors a 3 caràcters."
 
-#: ../actions/smssettings.php:296
-msgid "Select a carrier"
-msgstr ""
-
-#: ../actions/invite.php:137 ../lib/util.php:1172
+#: ../lib/util.php:982
 msgid "Send"
 msgstr "Enviar"
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
-msgstr ""
-
-#: ../actions/emailsettings.php:88
-#, fuzzy
-msgid "Send me notices of new subscriptions through email."
-msgstr "Enviar-me avisos per Jabber/GTalk."
-
-#: ../actions/imsettings.php:70
+#: ../actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Enviar-me avisos per Jabber/GTalk."
 
-#: ../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
-#, fuzzy
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr "Enviar-me avisos per Jabber/GTalk."
-
-#: ../lib/util.php:304
+#: ../lib/util.php:282
 msgid "Settings"
 msgstr "Configuració"
 
-#: ../actions/profilesettings.php:192
+#: ../actions/profilesettings.php:183
 msgid "Settings saved."
 msgstr "Configuració guardada."
 
-#: ../actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
 #: ../actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr "Algú ja té aquest OpenID."
@@ -1675,45 +1128,36 @@ msgstr "Algú ja té aquest OpenID."
 msgid "Something weird happened."
 msgstr "Alguna cosa estranya ha passat."
 
-#: ../scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54
-#, fuzzy
-msgid "Sorry, that is not your incoming email address."
-msgstr "Aquesta adreça de missatgeria instantània és incorrecta."
-
-#: ../lib/util.php:330
+#: ../lib/util.php:302
 msgid "Source"
 msgstr "Font"
 
-#: ../actions/showstream.php:296
+#: ../actions/showstream.php:277
 msgid "Statistics"
 msgstr "Estadístiques"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
 msgid "Stored OpenID not found."
 msgstr "No s'ha trobat l'OpenID emmagatzemat."
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197
+#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
+#: ../actions/showstream.php:181
 msgid "Subscribe"
 msgstr "Subscriure's"
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: ../actions/showstream.php:294 ../actions/subscribers.php:27
 msgid "Subscribers"
 msgstr "Subscriptors"
 
-#: ../actions/userauthorization.php:310
+#: ../actions/userauthorization.php:309
 msgid "Subscription authorized"
 msgstr "Subscripció autoritzada"
 
-#: ../actions/userauthorization.php:320
+#: ../actions/userauthorization.php:319
 msgid "Subscription rejected"
 msgstr "Subscripció rebutjada"
 
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
+#: ../actions/showstream.php:212 ../actions/showstream.php:288
 #: ../actions/subscriptions.php:27
 msgid "Subscriptions"
 msgstr "Subscripcions"
@@ -1722,14 +1166,6 @@ msgstr "Subscripcions"
 msgid "System error uploading file."
 msgstr "Error del sistema en pujar el fitxer."
 
-#: ../actions/tag.php:41 ../lib/util.php:301
-msgid "Tags"
-msgstr ""
-
-#: ../lib/searchaction.php:104
-msgid "Text"
-msgstr ""
-
 #: ../actions/noticesearch.php:34
 msgid "Text search"
 msgstr "Cerca de text"
@@ -1746,77 +1182,36 @@ msgstr "Aquesta adreça ja ha estat confirmada."
 msgid "That confirmation code is not for you!"
 msgstr "Aquest codi de confirmació no és per a tu!"
 
-#: ../actions/emailsettings.php:191
-#, fuzzy
-msgid "That email address already belongs to another user."
-msgstr "Aquest Jabber ID ja està sent utilitzat per un altre usuari."
-
 #: ../actions/avatar.php:80
 msgid "That file is too big."
 msgstr "Aquest fitxer és massa gran."
 
-#: ../actions/imsettings.php:170
+#: ../actions/imsettings.php:161
 msgid "That is already your Jabber ID."
 msgstr "Aquest ja és el teu Jabber ID."
 
-#: ../actions/emailsettings.php:188
-#, fuzzy
-msgid "That is already your email address."
-msgstr "Aquest ja és el teu Jabber ID."
-
-#: ../actions/smssettings.php:188
-#, fuzzy
-msgid "That is already your phone number."
-msgstr "Aquest ja és el teu Jabber ID."
-
-#: ../actions/imsettings.php:233
+#: ../actions/imsettings.php:224
 msgid "That is not your Jabber ID."
 msgstr "Aquest no és el teu Jabber ID."
 
-#: ../actions/emailsettings.php:249
-#, fuzzy
-msgid "That is not your email address."
-msgstr "Aquesta adreça de missatgeria instantània és incorrecta."
-
-#: ../actions/smssettings.php:257
-#, fuzzy
-msgid "That is not your phone number."
-msgstr "Aquest no és el teu Jabber ID."
-
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
+#: ../actions/imsettings.php:201
 msgid "That is the wrong IM address."
 msgstr "Aquesta adreça de missatgeria instantània és incorrecta."
 
-#: ../actions/smssettings.php:233
-#, fuzzy
-msgid "That is the wrong confirmation number."
-msgstr "Aquesta adreça de missatgeria instantània és incorrecta."
-
-#: ../actions/smssettings.php:191
-#, fuzzy
-msgid "That phone number already belongs to another user."
-msgstr "Aquest Jabber ID ja està sent utilitzat per un altre usuari."
-
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: ../actions/newnotice.php:52
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "Massa llarg. La longitud màxima és de 140 caràcters."
 
-#: ../actions/twitapiaccount.php:74
-#, fuzzy
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "Massa llarg. La longitud màxima és de 140 caràcters."
-
-#: ../actions/confirmaddress.php:92
+#: ../actions/confirmaddress.php:86
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "L'adreça \"%s\" ha estat confirmada per al teu compte."
 
-#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274
+#: ../actions/imsettings.php:241
 msgid "The address was removed."
 msgstr "L'adreça ha estat eliminada."
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:311
 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 "
@@ -1826,14 +1221,15 @@ msgstr ""
 "Llegeix de nou les instruccions per a saber com autoritzar la subscripció. "
 "El teu identificador de subscripció és:"
 
-#: ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:321
 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 ""
-"S'ha rebutjat la subscripció, però no s'ha enviat un URL de retorn. Llegeix "
-"de nou les instruccions per a saber com rebutjar la subscripció completament."
+"S'ha rebutjat la subscripció, però no s'ha enviat un URL de retorn. "
+"Llegeix de nou les instruccions per a saber com rebutjar la subscripció "
+"completament."
 
 #: ../actions/subscribers.php:35
 #, php-format
@@ -1853,12 +1249,7 @@ msgstr "Aquestes són les persones que %s escolta."
 msgid "These are the people whose notices you listen to."
 msgstr "Aquestes són les persones que escoltes."
 
-#: ../actions/invite.php:89
-msgid ""
-"These people are already users and you were automatically subscribed to them:"
-msgstr ""
-
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:87
 msgid "This confirmation code is too old. Please start again."
 msgstr "Aquest codi de confirmació és massa vell. Si us plau comença de nou."
 
@@ -1867,8 +1258,8 @@ msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr ""
-"Aquest formulari s'hauria d'enviar automàticament. En cas contrari, clica el "
-"botó d'enviament per a anar al teu proveïdor d'OpenID."
+"Aquest formulari s'hauria d'enviar automàticament. En cas contrari, clica "
+"el botó d'enviament per a anar al teu proveïdor d'OpenID."
 
 #: ../actions/finishopenidlogin.php:56
 #, php-format
@@ -1877,48 +1268,28 @@ msgid ""
 "to a local account. You can either create a new account, or connect with "
 "your existing account, if you have one."
 msgstr ""
-"Aquesta és la primera vegada que accedeixes a %s. Per tant, hem de connectar "
-"el teu OpenID a un compte local. Pots crear-ne un de nou o connectar-te amb "
-"el teu, si el tens."
+"Aquesta és la primera vegada que accedeixes a %s. Per tant, hem de "
+"connectar el teu OpenID a un compte local. Pots crear-ne un de nou o "
+"connectar-te amb el teu, si el tens."
 
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-msgid "This method requires a POST or DELETE."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381
-msgid "This method requires a POST."
-msgstr ""
-
-#: ../lib/util.php:164
+#: ../lib/util.php:147
 msgid "This page is not available in a media type you accept"
 msgstr "Aquesta pàgina no està disponible en un tipus de mèdia que acceptis."
 
-#: ../actions/profilesettings.php:63
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107
-msgid "Timezone not selected."
-msgstr ""
-
 #: ../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."
+"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 ""
 "Per a subscriure't, pots [iniciar una sessió](%%action.login%%), o "
 "[registrar](%%action.register%%) un nou compte. Si ja tens un en un [servei "
 "de microblogging compatible](%%doc.openmublog%%), escriu l'URL del teu "
 "perfil a sota."
 
-#: ../actions/twitapifriendships.php:163
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
-
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: ../actions/profilesettings.php:51
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL del teu web, blog o perfil en un altre lloc"
 
@@ -1926,24 +1297,19 @@ msgstr "URL del teu web, blog o perfil en un altre lloc"
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL del teu perfil en un altre servei de microblogging compatible"
 
-#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
-#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
 msgid "Unexpected form submission."
 msgstr "Enviament de formulari inesperat."
 
-#: ../actions/recoverpassword.php:276
+#: ../actions/recoverpassword.php:237
 msgid "Unexpected password reset."
 msgstr "Restabliment de contrasenya inesperat."
 
-#: ../index.php:57
-msgid "Unknown action"
-msgstr ""
-
 #: ../actions/finishremotesubscribe.php:58
 msgid "Unknown version of OMB protocol."
 msgstr "Versió desconeguda del protocol OMB."
 
-#: ../lib/util.php:269
+#: ../lib/util.php:245
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
@@ -1956,11 +1322,11 @@ msgstr ""
 msgid "Unrecognized address type %s"
 msgstr "Tipus d'adreça %s desconeguda"
 
-#: ../actions/showstream.php:209
+#: ../actions/showstream.php:193
 msgid "Unsubscribe"
 msgstr "Cancel·lar subscripció"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
 msgid "Unsupported OMB version"
 msgstr "Versió OMB no suportada"
 
@@ -1968,24 +1334,6 @@ msgstr "Versió OMB no suportada"
 msgid "Unsupported image file format."
 msgstr "Format d'imatge no suportat."
 
-#: ../lib/settingsaction.php:100
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:241
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:341
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
 #: ../actions/avatar.php:68
 msgid "Upload"
 msgstr "Pujar"
@@ -1998,34 +1346,23 @@ msgid ""
 "share."
 msgstr ""
 "Puja un nou \"avatar\" (imatge d'usuari) aquí. No pots editar la imatge una "
-"vegada carregada, per tant assegura't que sigui més o menys quadrada. A més, "
-"ha d'estar sota la llicència del lloc web. Utilitza una foto que sigui teva "
-"i que vulguis compartir."
+"vegada carregada, per tant assegura't que sigui més o menys quadrada. A "
+"més, ha d'estar sota la llicència del lloc web. Utilitza una foto que "
+"sigui teva i que vulguis compartir."
 
-#: ../lib/settingsaction.php:91
-#, fuzzy
-msgid "Upload a new profile image"
-msgstr "No s'ha pogut guardar la informació del nou perfil"
-
-#: ../actions/invite.php:114
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
-msgstr ""
-
-#: ../actions/register.php:159 ../actions/register.php:162
+#: ../actions/profilesettings.php:48 ../actions/register.php:182
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
-"Utilitzat només per a actualitzacions, anuncis i recuperació de contrasenyes"
+"Utilitzat només per a actualitzacions, anuncis i recuperació de "
+"contrasenyes"
 
 #: ../actions/finishremotesubscribe.php:86
 msgid "User being listened to doesn't exist."
 msgstr "L'usuari que vols seguir no existeix."
 
 #: ../actions/all.php:41 ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:47 ../actions/replies.php:41
-#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
-#: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
-#: ../actions/twitapiusers.php:82
+#: ../actions/foaf.php:43 ../actions/replies.php:41
+#: ../actions/showstream.php:44
 msgid "User has no profile."
 msgstr "L'usuari no té perfil."
 
@@ -2033,73 +1370,41 @@ msgstr "L'usuari no té perfil."
 msgid "User nickname"
 msgstr "Sobrenom de l'usuari"
 
-#: ../actions/twitapiusers.php:75
-#, fuzzy
-msgid "User not found."
-msgstr "No s'ha trobat l'OpenID emmagatzemat."
-
-#: ../actions/profilesettings.php:63
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../lib/util.php:1159
+#: ../lib/util.php:969
 #, php-format
 msgid "What's up, %s?"
 msgstr "Què tal, %s?"
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: ../actions/profilesettings.php:57
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "On ets, per exemple \"Ciutat, Estat (o Regió), País\""
 
-#: ../actions/updateprofile.php:128
+#: ../actions/updateprofile.php:127
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Tipus d'imatge incorrecte per a '%s'"
 
-#: ../actions/updateprofile.php:123
+#: ../actions/updateprofile.php:122
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Mida d'imatge incorrecta per a '%s'"
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-msgid "Yes"
-msgstr ""
-
 #: ../actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr "Ja tens aquest OpenID!"
 
-#: ../actions/deletenotice.php:37
-msgid ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
-msgstr ""
-
 #: ../actions/recoverpassword.php:31
 msgid "You are already logged in!"
 msgstr "Ja t'has connectat!"
 
-#: ../actions/invite.php:81
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr ""
-
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
 msgstr "Pots canviar la teva contrasenya aquí. Tria una de bona!"
 
-#: ../actions/register.php:135
+#: ../actions/register.php:164
 msgid "You can create a new account to start posting notices."
 msgstr "Pots crear un nou compte i començar a enviar avisos."
 
-#: ../actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
@@ -2109,15 +1414,16 @@ msgstr "Pots eliminar un OpenID del teu compte clicant el botó \"Eliminar\"."
 #: ../actions/imsettings.php:28
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
-"Pots enviar i rebre avisos via [missatges instantanis](%%doc.im%%) de Jabber/"
-"GTalk. Configura la teva adreça i opcions a sota."
+"Pots enviar i rebre avisos via [missatges instantanis](%%doc.im%%) de "
+"Jabber/GTalk. Configura la teva adreça i opcions a sota."
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about you."
+"You can update your personal profile info here so people know more about "
+"you."
 msgstr ""
 "Pots actualitzar la informació del teu perfil personal per a que la gent "
 "sàpiga més sobre tu."
@@ -2126,43 +1432,15 @@ msgstr ""
 msgid "You can use the local subscription!"
 msgstr "Pots utilitzar la subscripció local!"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
 msgid "You can't register if you don't agree to the license."
 msgstr "No pots registrar-te si no estàs d'acord amb la llicència."
 
-#: ../actions/updateprofile.php:63
+#: ../actions/updateprofile.php:62
 msgid "You did not send us that profile"
 msgstr "No ens vas enviar aquest perfil"
 
-#: ../lib/mail.php:147
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
-"Send email to %2$s to post new messages.\n"
-"\n"
-"More email instructions at %3$s.\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:612
-msgid "You may not delete another user's status."
-msgstr ""
-
-#: ../actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr ""
-
-#: ../actions/invite.php:103
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
-
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:134
 msgid "You've been identified. Enter a  new password below. "
 msgstr "T'has identificat. Escriu una nova contrasenya a continuació."
 
@@ -2170,7 +1448,7 @@ msgstr "T'has identificat. Escriu una nova contrasenya a continuació."
 msgid "Your OpenID URL"
 msgstr "El teu URL OpenID"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:149
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 "El teu nom d'usuari en aquest servidor, o la teva adreça de correu "
@@ -2185,61 +1463,57 @@ msgstr ""
 "[OpenID](%%doc.openid%%) et permet accedir a molts llocs amb un mateix "
 "compte d'usuari. Administra els teus OpenID associats aquí."
 
-#: ../lib/util.php:943
+#: ../lib/util.php:814
 msgid "a few seconds ago"
 msgstr "fa pocs segons"
 
-#: ../lib/util.php:955
+#: ../lib/util.php:826
 #, php-format
 msgid "about %d days ago"
 msgstr "fa %d dies"
 
-#: ../lib/util.php:951
+#: ../lib/util.php:822
 #, php-format
 msgid "about %d hours ago"
 msgstr "fa %d hores"
 
-#: ../lib/util.php:947
+#: ../lib/util.php:818
 #, php-format
 msgid "about %d minutes ago"
 msgstr "fa %d minuts"
 
-#: ../lib/util.php:959
+#: ../lib/util.php:830
 #, php-format
 msgid "about %d months ago"
 msgstr "fa %d mesos"
 
-#: ../lib/util.php:953
+#: ../lib/util.php:824
 msgid "about a day ago"
 msgstr "fa un dia"
 
-#: ../lib/util.php:945
+#: ../lib/util.php:816
 msgid "about a minute ago"
 msgstr "fa un minut"
 
-#: ../lib/util.php:957
+#: ../lib/util.php:828
 msgid "about a month ago"
 msgstr "fa un mes"
 
-#: ../lib/util.php:961
+#: ../lib/util.php:832
 msgid "about a year ago"
 msgstr "fa un any"
 
-#: ../lib/util.php:949
+#: ../lib/util.php:820
 msgid "about an hour ago"
 msgstr "fa una hora"
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-msgid "delete"
-msgstr ""
-
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117
+#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
+#: ../lib/stream.php:101
 msgid "in reply to..."
 msgstr "en resposta a..."
 
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124
+#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
+#: ../lib/stream.php:108
 msgid "reply"
 msgstr "resposta"
 
@@ -2247,23 +1521,1311 @@ msgstr "resposta"
 msgid "same as password above"
 msgstr "repeteix la contrasenya anterior"
 
-#: ../actions/twitapistatuses.php:755
-#, fuzzy
-msgid "unsupported file type"
-msgstr "Format d'imatge no suportat."
-
-#: ../lib/util.php:1309
+#: ../lib/util.php:1127
 msgid "« After"
 msgstr "« Següent"
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "No s'ha pogut confirmar el correu electrònic."
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+msgid " from "
+msgstr ""
 
-#~ msgid "Couldn't create subscription."
-#~ msgstr "No s'ha pogut crear la subscripció."
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Error en inserir avís"
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
 
-#~ msgid "Public"
-#~ msgstr "Públic"
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
+
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#, php-format
+msgid "%s public timeline"
+msgstr ""
+
+#: ../lib/mail.php:206 lib/mail.php:212
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/register.php:154 actions/register.php:168
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55
+msgid "API method not found!"
+msgstr ""
+
+#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
+#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
+#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
+#: ../actions/twitapidirect_messages.php:49
+#: ../actions/twitapidirect_messages.php:56
+#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
+#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
+#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
+#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
+#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
+#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
+#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
+#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
+#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
+#: actions/twitapistatuses.php:690
+msgid "API method under construction."
+msgstr ""
+
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
+
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for "
+"non-humans)"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
+
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr ""
+
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+msgid "Change email handling"
+msgstr ""
+
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+msgid "Change your profile settings"
+msgstr ""
+
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+msgid "Could not follow user: User not found."
+msgstr ""
+
+#: ../lib/subs.php:54 lib/subs.php:61
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: ../lib/subs.php:46 lib/subs.php:46
+msgid "Could not subscribe."
+msgstr ""
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+msgid "Couldn't update user record."
+msgstr ""
+
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr ""
+
+#: ../classes/Notice.php:72 classes/Notice.php:86
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr ""
+
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr ""
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr ""
+
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: ../actions/tag.php:55 actions/tag.php:55
+#, php-format
+msgid "Feed for tag %s"
+msgstr ""
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr ""
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr ""
+
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+msgid "I want to post notices by email."
+msgstr ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+msgid "IM"
+msgstr ""
+
+#: ../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
+msgid "Incoming email"
+msgstr ""
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+msgid "Incoming email address removed."
+msgstr ""
+
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Language"
+msgstr ""
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+msgid "Language is too long (max 50 chars)."
+msgstr ""
+
+#: ../actions/register.php:166 actions/register.php:180
+msgid "Longer name, preferably your \"real\" name"
+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 ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr ""
+
+#: ../lib/mail.php:144 lib/mail.php:144
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+msgid "New incoming email address added."
+msgstr ""
+
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+msgid "No"
+msgstr ""
+
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr ""
+
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+msgid "No email address."
+msgstr ""
+
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+msgid "No incoming email address."
+msgstr ""
+
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+msgid "No status with that ID found."
+msgstr ""
+
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+msgid "Not a registered user."
+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
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+msgid "Not found"
+msgstr ""
+
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr ""
+
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
+
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr ""
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr ""
+
+#: ../actions/invite.php:133 actions/invite.php:141
+msgid "Personal message"
+msgstr ""
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Preferred language"
+msgstr ""
+
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/register.php:28 actions/register.php:28
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+msgid "Registration successful"
+msgstr ""
+
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/register.php:156 actions/register.php:170
+msgid "Same as password above. Required."
+msgstr ""
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr ""
+
+#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
+#: actions/emailsettings.php:74 actions/smssettings.php:82
+msgid "Send email to this address to post new notices."
+msgstr ""
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../actions/tag.php:60 actions/tag.php:60
+msgid "Showing most popular tags from the last week"
+msgstr ""
+
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317
+msgid "Tags"
+msgstr ""
+
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
+msgid "Text"
+msgstr ""
+
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+msgid "That is not your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+msgid "That is not your phone number."
+msgstr ""
+
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/invite.php:89 actions/invite.php:96
+msgid ""
+"These people are already users and you were automatically subscribed to "
+"them:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511
+msgid "This method requires a POST or 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
+msgid "This method requires a POST."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+msgid "Timezone not selected."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+msgid "Two user ids or screen_names must be supplied."
+msgstr ""
+
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this "
+"service."
+msgstr ""
+
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+msgid "Yes"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+msgid "You are not friends with the specified user."
+msgstr ""
+
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr ""
+
+#: ../actions/invite.php:103 actions/invite.php:110
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
+msgstr ""
+
+#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99
+msgid "delete"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+msgid "unsupported file type"
+msgstr ""
+
+#: actions/deletenotice.php:74 actions/disfavor.php:43
+#: actions/emailsettings.php:127 actions/favor.php:45
+#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
+#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
+#: actions/openidsettings.php:123 actions/profilesettings.php:47
+#: actions/recoverpassword.php:282 actions/register.php:42
+#: actions/remotesubscribe.php:40 actions/smssettings.php:124
+#: actions/subscribe.php:44 actions/twittersettings.php:97
+#: actions/unsubscribe.php:41 actions/userauthorization.php:35
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/disfavor.php:55
+msgid "This notice is not a favorite!"
+msgstr ""
+
+#: actions/disfavor.php:63
+msgid "Could not delete favorite."
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Favor"
+msgstr ""
+
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+
+#: actions/emailsettings.php:95
+msgid "Send me email when someone sends me a private message."
+msgstr ""
+
+#: actions/favor.php:53 actions/twitapifavorites.php:142
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132
+msgid "Could not create favorite."
+msgstr ""
+
+#: actions/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#, php-format
+msgid "%s favorite notices"
+msgstr ""
+
+#: actions/favoritesrss.php:64
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr ""
+
+#: actions/inbox.php:28
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+
+#: actions/invite.php:178
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+msgstr ""
+
+#: actions/login.php:104
+msgid "Automatically login in the future; "
+msgstr ""
+
+#: actions/login.php:122
+msgid "For security reasons, please re-enter your "
+msgstr ""
+
+#: actions/login.php:126
+msgid "Login with your username and password. "
+msgstr ""
+
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+msgid "That's too long. Max message size is 140 chars."
+msgstr ""
+
+#: actions/newmessage.php:65
+msgid "No recipient specified."
+msgstr ""
+
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206
+msgid "You can't send a message to this user."
+msgstr ""
+
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly "
+"instead."
+msgstr ""
+
+#: actions/newmessage.php:108
+msgid "No such user"
+msgstr ""
+
+#: actions/newmessage.php:117
+msgid "New message"
+msgstr ""
+
+#: actions/noticesearch.php:95
+msgid "Notice without matching profile"
+msgstr ""
+
+#: actions/openidsettings.php:28
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr ""
+
+#: actions/openidsettings.php:46
+msgid "If you want to add an OpenID to your account, "
+msgstr ""
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr ""
+
+#: actions/openidsettings.php:87
+msgid "You can remove an OpenID from your account "
+msgstr ""
+
+#: actions/outbox.php:28
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr ""
+
+#: actions/outbox.php:30
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#: actions/outbox.php:53
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+
+#: actions/peoplesearch.php:28
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+msgstr ""
+
+#: actions/profilesettings.php:27
+msgid "You can update your personal profile info here "
+msgstr ""
+
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+msgid "User without matching profile"
+msgstr ""
+
+#: actions/recoverpassword.php:91
+msgid "This confirmation code is too old. "
+msgstr ""
+
+#: actions/recoverpassword.php:141
+msgid "If you've forgotten or lost your"
+msgstr ""
+
+#: actions/recoverpassword.php:154
+msgid "You've been identified. Enter a "
+msgstr ""
+
+#: actions/recoverpassword.php:169
+msgid "Your nickname on this server, "
+msgstr ""
+
+#: actions/recoverpassword.php:271
+msgid "Instructions for recovering your password "
+msgstr ""
+
+#: actions/recoverpassword.php:327
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95
+msgid "Password must be 6 or more characters."
+msgstr ""
+
+#: actions/register.php:216
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
+msgstr ""
+
+#: actions/register.php:227
+msgid "(You should receive a message by email momentarily, with "
+msgstr ""
+
+#: actions/remotesubscribe.php:51
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
+msgstr ""
+
+#: actions/showfavorites.php:61
+#, php-format
+msgid "Feed for favorites of %s"
+msgstr ""
+
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+msgid "Could not retrieve favorite notices."
+msgstr ""
+
+#: actions/showmessage.php:33
+msgid "No such message."
+msgstr ""
+
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
+msgstr ""
+
+#: actions/showmessage.php:61
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr ""
+
+#: actions/showmessage.php:66
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr ""
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr ""
+
+#: actions/smssettings.php:312
+#, php-format
+msgid "Mobile carrier for your phone. "
+msgstr ""
+
+#: actions/twitapidirect_messages.php:76
+#, php-format
+msgid "Direct messages to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:77
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:81
+msgid "Direct Messages You've Sent"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:82
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:128
+msgid "No message text!"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:138
+msgid "Recipient user not found."
+msgstr ""
+
+#: actions/twitapidirect_messages.php:141
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
+#: actions/twitapifavorites.php:92
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr ""
+
+#: actions/twitapifavorites.php:95
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr ""
+
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#, php-format
+msgid "%s added your notice as a favorite"
+msgstr ""
+
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+msgstr ""
+
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+msgstr ""
+
+#: actions/twittersettings.php:41
+msgid "Twitter settings"
+msgstr ""
+
+#: actions/twittersettings.php:48
+msgid "Twitter Account"
+msgstr ""
+
+#: actions/twittersettings.php:56
+msgid "Current verified Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr ""
+
+#: actions/twittersettings.php:65
+msgid "No spaces, please."
+msgstr ""
+
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr ""
+
+#: actions/twittersettings.php:72
+msgid "Automatically send my notices to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:75
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:78
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+
+#: actions/twittersettings.php:128
+msgid "Could not verify your Twitter credentials!"
+msgstr ""
+
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+msgid "Unable to save your Twitter settings!"
+msgstr ""
+
+#: actions/twittersettings.php:174
+msgid "Twitter settings saved."
+msgstr ""
+
+#: actions/twittersettings.php:192
+msgid "That is not your Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+msgid "Couldn't remove Twitter user."
+msgstr ""
+
+#: actions/twittersettings.php:212
+msgid "Twitter account removed."
+msgstr ""
+
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+msgid "Couldn't save Twitter preferences."
+msgstr ""
+
+#: actions/twittersettings.php:245
+msgid "Twitter preferences saved."
+msgstr ""
+
+#: actions/userauthorization.php:84
+msgid "Please check these details to make sure "
+msgstr ""
+
+#: actions/userauthorization.php:324
+msgid "The subscription has been authorized, but no "
+msgstr ""
+
+#: actions/userauthorization.php:334
+msgid "The subscription has been rejected, but no "
+msgstr ""
+
+#: classes/Channel.php:113
+msgid "Command results"
+msgstr ""
+
+#: classes/Channel.php:148
+msgid "Command complete"
+msgstr ""
+
+#: classes/Channel.php:158
+msgid "Command failed"
+msgstr ""
+
+#: classes/Command.php:39
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: classes/Command.php:96
+#, php-format
+msgid "Subscriptions: %1$s\n"
+msgstr ""
+
+#: classes/Command.php:125 classes/Command.php:242
+msgid "User has no last notice"
+msgstr ""
+
+#: classes/Command.php:146
+msgid "Notice marked as fave."
+msgstr ""
+
+#: classes/Command.php:166
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr ""
+
+#: classes/Command.php:169
+#, php-format
+msgid "Fullname: %s"
+msgstr ""
+
+#: classes/Command.php:172
+#, php-format
+msgid "Location: %s"
+msgstr ""
+
+#: classes/Command.php:175
+#, php-format
+msgid "Homepage: %s"
+msgstr ""
+
+#: classes/Command.php:178
+#, php-format
+msgid "About: %s"
+msgstr ""
+
+#: classes/Command.php:200
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
+
+#: classes/Command.php:214
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
+
+#: classes/Command.php:216
+msgid "Error sending direct message."
+msgstr ""
+
+#: classes/Command.php:263
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: classes/Command.php:270
+#, php-format
+msgid "Subscribed to %s"
+msgstr ""
+
+#: classes/Command.php:288
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
+
+#: classes/Command.php:295
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr ""
+
+#: classes/Command.php:310 classes/Command.php:330
+msgid "Command not yet implemented."
+msgstr ""
+
+#: classes/Command.php:313
+msgid "Notification off."
+msgstr ""
+
+#: classes/Command.php:315
+msgid "Can't turn off notification."
+msgstr ""
+
+#: classes/Command.php:333
+msgid "Notification on."
+msgstr ""
+
+#: classes/Command.php:335
+msgid "Can't turn on notification."
+msgstr ""
+
+#: classes/Command.php:344
+msgid "Commands:\n"
+msgstr ""
+
+#: classes/Message.php:53
+msgid "Could not insert message."
+msgstr ""
+
+#: classes/Message.php:63
+msgid "Could not update message with new URI."
+msgstr ""
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr ""
+
+#: lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:249
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:253
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+msgstr ""
+
+#: lib/mailbox.php:43
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/openid.php:195
+msgid "This form should automatically submit itself. "
+msgstr ""
+
+#: lib/personal.php:65
+msgid "Favorites"
+msgstr ""
+
+#: lib/personal.php:66
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
+#: lib/personal.php:66
+msgid "User"
+msgstr ""
+
+#: lib/personal.php:75
+msgid "Inbox"
+msgstr ""
+
+#: lib/personal.php:76
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personal.php:80
+msgid "Outbox"
+msgstr ""
+
+#: lib/personal.php:81
+msgid "Your sent messages"
+msgstr ""
+
+#: lib/settingsaction.php:99
+msgid "Twitter"
+msgstr ""
+
+#: lib/settingsaction.php:100
+msgid "Twitter integration options"
+msgstr ""
+
+#: lib/util.php:1718
+msgid "To"
+msgstr ""
+
+#: scripts/maildaemon.php:45
+msgid "Could not parse message."
+msgstr ""
diff --git a/locale/cs_CZ/LC_MESSAGES/laconica.mo b/locale/cs_CZ/LC_MESSAGES/laconica.mo
index 405bc7246..8957da675 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 677f196ec..002d9c0ab 100644
--- a/locale/cs_CZ/LC_MESSAGES/laconica.po
+++ b/locale/cs_CZ/LC_MESSAGES/laconica.po
@@ -6,9 +6,20 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-27 14:57-0400\n"
+"POT-Creation-Date: 2008-07-14 21:07+1200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-10-13 21:07+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,68 +27,29 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../actions/noticesearchrss.php:64
-#, fuzzy, php-format
-msgid " Search Stream for \"%s\""
-msgstr "Hledej ve Streamu \"%s\""
-
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
-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."
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-msgid " from "
-msgstr ""
-
-#: ../actions/twitapistatuses.php:478
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
 #, php-format
-msgid "%1$s / Updates replying to %2$s"
+#, fuzzy
+msgid " Search Stream for \"%s\""
 msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Hledej ve Streamu \"%s\"\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/invite.php:168
-#, fuzzy, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1 od te� naslouchá tvým sdělením v %2"
-
-#: ../actions/invite.php:170
-#, php-format
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
 msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
+" 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."
 
-#: ../lib/mail.php:124
+#: ../actions/subscribe.php:84
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1 od te� naslouchá tvým sdělením v %2"
 
-#: ../lib/mail.php:126
+#: ../actions/subscribe.php:86
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -91,157 +63,72 @@ msgstr ""
 "\n"
 "\t%3\n"
 "\n"
-"S úctou váš,\n"
-"%4$s.\n"
-
-#: ../actions/twitapistatuses.php:482
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
+"S úctou váš,\n%4$s.\n"
 
 #: ../actions/shownotice.php:45
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1 statusů na %2"
 
-#: ../actions/invite.php:84 ../actions/invite.php:92
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:60
 #, php-format
 msgid "%s Public Stream"
 msgstr "Veřejný \"Stream\""
 
-#: ../actions/all.php:47 ../actions/allrss.php:60
-#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51
+#: ../actions/all.php:47 ../actions/allrss.php:70 ../lib/stream.php:45
 #, php-format
 msgid "%s and friends"
 msgstr "%s a přátelé"
 
-#: ../actions/twitapistatuses.php:49
-#, fuzzy, php-format
-msgid "%s public timeline"
-msgstr "Veřejné zprávy"
-
-#: ../lib/mail.php:206
-#, fuzzy, php-format
-msgid "%s status"
-msgstr "%1 statusů na %2"
-
-#: ../actions/twitapistatuses.php:338
-#, fuzzy, php-format
-msgid "%s timeline"
-msgstr "Veřejné zprávy"
-
-#: ../actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:213
-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:233
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** is a microblogging service brought to you by "
+"[%%site.broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
-"**%%site.name%%** je služba microblogů, kterou pro vás poskytuje [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** je služba microblogů, kterou pro vás poskytuje "
+"[%%site.broughtby%%](%%site.broughtbyurl%%). "
 
-#: ../lib/util.php:259
+#: ../lib/util.php:235
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** je služba mikroblogů."
 
-#: ../lib/util.php:274
+#: ../lib/util.php:250
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr "Přispěvatelá by měly být zmíněny přezdívkou nebo celým jménem"
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
+#: ../actions/register.php:176
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 znaků nebo �ísel, bez te�ek, �árek a mezer"
 
-#: ../actions/register.php:152
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64 znaků nebo �ísel, bez te�ek, �árek a mezer"
-
-#: ../actions/password.php:42
+#: ../actions/password.php:42 ../actions/register.php:178
 msgid "6 or more characters"
 msgstr "6 a více znaků"
 
-#: ../actions/recoverpassword.php:180
+#: ../actions/recoverpassword.php:165
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 a více znaků, a nezapomeňte"
 
-#: ../actions/register.php:154
-#, fuzzy
-msgid "6 or more characters. Required."
-msgstr "6 a více znaků"
-
-#: ../actions/imsettings.php:197
+#: ../actions/imsettings.php:188
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
-msgstr ""
-"Ověřující kód byl poslán na vloženou IM adresu. Musíte prokázat %s pro "
-"posílání zpráv."
-
-#: ../actions/emailsettings.php:213
-#, fuzzy
-msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
-msgstr ""
-"Ověřující kód byl poslán na vloženou IM adresu. Musíte prokázat %s pro "
-"posílání zpráv."
-
-#: ../actions/smssettings.php:216
-#, fuzzy
-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 ""
-"Ověřující kód byl poslán na vloženou IM adresu. Musíte prokázat %s pro "
-"posílání zpráv."
-
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122
-msgid "API method not found!"
+"A confirmation code was sent to the IM address you added. You must approve "
+"%s for sending messages to you."
 msgstr ""
+"Ověřující kód byl poslán na vloženou IM adresu. Musíte prokázat %s "
+"pro posílání zpráv."
 
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-msgid "API method under construction."
-msgstr ""
-
-#: ../lib/util.php:324
+#: ../lib/util.php:296
 msgid "About"
 msgstr "O nás"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/userauthorization.php:118
 msgid "Accept"
 msgstr "Přijmout"
 
-#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
-#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
 msgid "Add"
 msgstr "Přidat"
 
@@ -249,25 +136,15 @@ msgstr "Přidat"
 msgid "Add OpenID"
 msgstr "Přidej OpenID"
 
-#: ../lib/settingsaction.php:97
-#, fuzzy
-msgid "Add or remove OpenIDs"
-msgstr "Odstranit OpenID"
-
-#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39
+#: ../actions/imsettings.php:39
 msgid "Address"
 msgstr "Adresa"
 
-#: ../actions/invite.php:131
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../actions/showstream.php:273
+#: ../actions/showstream.php:254
 msgid "All subscriptions"
 msgstr "Všechny odběry"
 
-#: ../actions/publicrss.php:64
+#: ../actions/publicrss.php:62
 #, php-format
 msgid "All updates for %s"
 msgstr "VÅ¡echny aktualizace pro %s"
@@ -277,33 +154,24 @@ msgstr "VÅ¡echny aktualizace pro %s"
 msgid "All updates matching search term \"%s\""
 msgstr "Všechny položky obsahující \"%s\""
 
-#: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
-#: ../actions/openidlogin.php:29 ../actions/register.php:30
+#: ../actions/finishopenidlogin.php:29 ../actions/login.php:27
+#: ../actions/openidlogin.php:29 ../actions/register.php:28
 msgid "Already logged in."
 msgstr "Již přihlášen"
 
-#: ../lib/subs.php:42
+#: ../actions/subscribe.php:48
 msgid "Already subscribed!."
 msgstr "Již přihlášeno"
 
-#: ../actions/deletenotice.php:54
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/userauthorization.php:77
+#: ../actions/userauthorization.php:76
 msgid "Authorize subscription"
 msgstr "Autorizovaný odběr"
 
-#: ../actions/login.php:104 ../actions/register.php:178
+#: ../actions/login.php:100 ../actions/register.php:184
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Příště automaticky přihlásit; ne pro po�íta�e, které používá "
 
-#: ../actions/profilesettings.php:65
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr ""
-
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: ../actions/avatar.php:32
 msgid "Avatar"
 msgstr "Obrázek"
 
@@ -317,51 +185,31 @@ 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 ""
-"Čakám na potvrzení této adresy. Zkontrolujte zprávy na vašem Jabber/GTalk "
-"ú�tu. (Přidal jste si %s do vašich kontaktů?)"
-
-#: ../actions/emailsettings.php:54
-#, fuzzy
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-msgstr ""
-"Čakám na potvrzení této adresy. Zkontrolujte zprávy na vašem Jabber/GTalk "
-"ú�tu. (Přidal jste si %s do vašich kontaktů?)"
-
-#: ../actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
+"Čakám na potvrzení této adresy. Zkontrolujte zprávy na vašem "
+"Jabber/GTalk ú�tu. (Přidal jste si %s do vašich kontaktů?)"
 
-#: ../lib/util.php:1318
+#: ../lib/util.php:1136
 msgid "Before »"
 msgstr "Starší »"
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: ../actions/profilesettings.php:52
 msgid "Bio"
 msgstr "O mÄ›"
 
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103
+#: ../actions/profilesettings.php:93 ../actions/updateprofile.php:102
 msgid "Bio is too long (max 140 chars)."
 msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)"
 
-#: ../lib/deleteaction.php:41
-#, fuzzy
-msgid "Can't delete this notice."
-msgstr "Nelze smazat potvrzení emailu"
-
-#: ../actions/updateprofile.php:119
+#: ../actions/updateprofile.php:118
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Nelze pře�íst adresu obrázku '%s'"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
+#: ../actions/password.php:85 ../actions/recoverpassword.php:261
 msgid "Can't save new password."
 msgstr "Nelze uložit nové heslo"
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62
+#: ../actions/imsettings.php:59
 msgid "Cancel"
 msgstr "Zrušit"
 
@@ -369,79 +217,35 @@ msgstr "Zrušit"
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Nelze dolozit zákaznický objekt OpenID"
 
-#: ../actions/imsettings.php:163
+#: ../actions/imsettings.php:154
 msgid "Cannot normalize that Jabber ID"
 msgstr "Nelze normalizovat JabberID"
 
-#: ../actions/emailsettings.php:181
-#, fuzzy
-msgid "Cannot normalize that email address"
-msgstr "Nelze normalizovat JabberID"
-
 #: ../actions/password.php:45
 msgid "Change"
 msgstr "Změnit"
 
-#: ../lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
 #: ../actions/password.php:32
 msgid "Change password"
 msgstr "Změnit heslo"
 
-#: ../lib/settingsaction.php:94
-#, fuzzy
-msgid "Change your password"
-msgstr "Změnit heslo"
-
-#: ../lib/settingsaction.php:85
-#, fuzzy
-msgid "Change your profile settings"
-msgstr "Nastavené Profilu"
-
-#: ../actions/password.php:43 ../actions/recoverpassword.php:181
-#: ../actions/register.php:155 ../actions/smssettings.php:65
+#: ../actions/password.php:43 ../actions/recoverpassword.php:166
+#: ../actions/register.php:179
 msgid "Confirm"
 msgstr "Heslo znovu"
 
-#: ../actions/confirmaddress.php:90
+#: ../actions/confirmaddress.php:84
 msgid "Confirm Address"
 msgstr "Potvr� adresu"
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245
+#: ../actions/imsettings.php:213
 msgid "Confirmation cancelled."
 msgstr "Potvr� zrušení"
 
-#: ../actions/smssettings.php:63
-#, fuzzy
-msgid "Confirmation code"
-msgstr "Žádný potvrzující kód."
-
 #: ../actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr "Potvrzující kód nebyl nalezen"
 
-#: ../actions/register.php:202
-#, php-format
-msgid ""
-"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."
-msgstr ""
-
 #: ../actions/finishopenidlogin.php:91
 msgid "Connect"
 msgstr "Připojit"
@@ -450,7 +254,7 @@ msgstr "Připojit"
 msgid "Connect existing account"
 msgstr "Zruš existující ú�et"
 
-#: ../lib/util.php:332
+#: ../lib/util.php:304
 msgid "Contact"
 msgstr "Kontakt"
 
@@ -459,66 +263,44 @@ msgstr "Kontakt"
 msgid "Could not create OpenID form: %s"
 msgstr "Nelze vytvořit OpenID z: %s"
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr ""
-
 #: ../lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Nelze přesměrovat na server: %s"
 
-#: ../actions/updateprofile.php:162
+#: ../actions/updateprofile.php:161
 msgid "Could not save avatar info"
 msgstr "Nelze uložin informace o obrázku"
 
-#: ../actions/updateprofile.php:155
+#: ../actions/updateprofile.php:154
 msgid "Could not save new profile info"
 msgstr "Nelze uložit nové informace do profilu"
 
-#: ../lib/subs.php:54
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../lib/subs.php:46
-#, fuzzy
-msgid "Could not subscribe."
-msgstr "Nepřihlášen!"
-
-#: ../actions/recoverpassword.php:102
-#, fuzzy
-msgid "Could not update user with confirmed email address."
-msgstr "Nelze vložit potvrzující kód"
+#: ../actions/profilesettings.php:146
+msgid "Couldn't confirm email."
+msgstr "Nelze potvrdit email"
 
 #: ../actions/finishremotesubscribe.php:99
 msgid "Couldn't convert request tokens to access tokens."
 msgstr "Nelze konvertovat řetězec požadavku na přístupový řetězec."
 
-#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
-#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#: ../actions/subscribe.php:59
+msgid "Couldn't create subscription."
+msgstr "Nelze vytvořit odebírat"
+
+#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
 msgid "Couldn't delete email confirmation."
 msgstr "Nelze smazat potvrzení emailu"
 
-#: ../lib/subs.php:103
+#: ../actions/unsubscribe.php:56
 msgid "Couldn't delete subscription."
 msgstr "Nelze smazat odebírání"
 
-#: ../actions/twitapistatuses.php:93
-#, fuzzy
-msgid "Couldn't find any statuses."
-msgstr "Nelze aktualizovat uživatele"
-
-#: ../actions/remotesubscribe.php:127
+#: ../actions/remotesubscribe.php:125
 msgid "Couldn't get a request token."
 msgstr "Nelze získat řetězec požadavku."
 
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206
+#: ../actions/imsettings.php:178
 msgid "Couldn't insert confirmation code."
 msgstr "Nelze vložit potvrzující kód"
 
@@ -526,24 +308,12 @@ msgstr "Nelze vložit potvrzující kód"
 msgid "Couldn't insert new subscription."
 msgstr "Nelze vložit odebírání"
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: ../actions/profilesettings.php:175
 msgid "Couldn't save profile."
 msgstr "Nelze uložit profil"
 
-#: ../actions/profilesettings.php:161
-#, fuzzy
-msgid "Couldn't update user for autosubscribe."
-msgstr "Nelze aktualizovat uživatele"
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#, fuzzy
-msgid "Couldn't update user record."
-msgstr "Nelze aktualizovat uživatele"
-
-#: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
-#: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
-#: ../actions/imsettings.php:243 ../actions/profilesettings.php:141
-#: ../actions/smssettings.php:157 ../actions/smssettings.php:269
+#: ../actions/confirmaddress.php:70 ../actions/imsettings.php:129
+#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
 msgid "Couldn't update user."
 msgstr "Nelze aktualizovat uživatele"
 
@@ -567,83 +337,44 @@ msgstr "Pro toto OpenID již uživatel existuje"
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Potvrzené Jabber/GTalk adresy"
 
-#: ../actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:44
-#, fuzzy
-msgid "Current confirmed email address."
-msgstr "Potvrzené Jabber/GTalk adresy"
-
-#: ../actions/showstream.php:356
+#: ../actions/showstream.php:337
 msgid "Currently"
 msgstr "Nyní"
 
-#: ../classes/Notice.php:72
-#, fuzzy, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "Chyba v DB při vkládání odpovědi: %s"
-
-#: ../lib/util.php:1061
+#: ../lib/util.php:893
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Chyba v DB při vkládání odpovědi: %s"
 
-#: ../actions/deletenotice.php:41
-#, fuzzy
-msgid "Delete notice"
-msgstr "Nové sdělení"
-
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: ../actions/profilesettings.php:54
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Popiš sebe a své zájmy ve 140 znacích"
 
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87
+#: ../actions/register.php:181
 msgid "Email"
 msgstr "Email"
 
-#: ../actions/emailsettings.php:59
-#, fuzzy
-msgid "Email Address"
+#: ../actions/profilesettings.php:46
+msgid "Email address"
 msgstr "Emailová adresa"
 
-#: ../actions/emailsettings.php:32
-#, fuzzy
-msgid "Email Settings"
-msgstr "Nastavení"
-
-#: ../actions/register.php:73
+#: ../actions/profilesettings.php:102 ../actions/register.php:63
 msgid "Email address already exists."
 msgstr "Emailová adresa již existuje"
 
-#: ../lib/mail.php:90
+#: ../lib/mail.php:82
 msgid "Email address confirmation"
 msgstr "Potvrzení emailové adresy"
 
-#: ../actions/emailsettings.php:61
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/invite.php:129
-#, fuzzy
-msgid "Email addresses"
-msgstr "Emailová adresa"
-
-#: ../actions/recoverpassword.php:191
+#: ../actions/recoverpassword.php:176
 msgid "Enter a nickname or email address."
 msgstr "Zadej přezdívku nebo emailovou adresu"
 
-#: ../actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/userauthorization.php:137
+#: ../actions/userauthorization.php:136
 msgid "Error authorizing token"
 msgstr "Chyba potvrujícího řetězce"
 
-#: ../actions/finishopenidlogin.php:253
+#: ../actions/finishopenidlogin.php:282
 msgid "Error connecting user to OpenID."
 msgstr "Chyba při propojení uživatele na OpenID"
 
@@ -659,19 +390,23 @@ msgstr "Chyba při kládání obrázku"
 msgid "Error inserting new profile"
 msgstr "Chyba při vkládání nového profilu"
 
+#: ../actions/postnotice.php:88
+msgid "Error inserting notice"
+msgstr "Chyba při vkládání nového sdělení"
+
 #: ../actions/finishremotesubscribe.php:167
 msgid "Error inserting remote profile"
 msgstr "Chyba při vkládaní vzdáleného profilu"
 
-#: ../actions/recoverpassword.php:240
+#: ../actions/recoverpassword.php:201
 msgid "Error saving address confirmation."
 msgstr "Chyba při ukládání potvrzení adresy"
 
-#: ../actions/userauthorization.php:140
+#: ../actions/userauthorization.php:139
 msgid "Error saving remote profile"
 msgstr "Chyba při ukládnání vzdáleného profilu"
 
-#: ../lib/openid.php:226
+#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
 msgid "Error saving the profile."
 msgstr "Chyba při ukládaní profilu"
 
@@ -683,8 +418,8 @@ msgstr "Chyba při ukládaní uživatele"
 msgid "Error saving user; invalid."
 msgstr "Chyba při ukládaní uživatele; neplatný"
 
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
+#: ../actions/login.php:43 ../actions/login.php:69
+#: ../actions/recoverpassword.php:268 ../actions/register.php:73
 msgid "Error setting user."
 msgstr "Chyba nastavení uživatele"
 
@@ -696,7 +431,7 @@ msgstr "Chyba při aktualizaci profilu"
 msgid "Error updating remote profile"
 msgstr "Chyba při aktualizaci vzdáleného profilu"
 
-#: ../actions/recoverpassword.php:80
+#: ../actions/recoverpassword.php:79
 msgid "Error with confirmation code."
 msgstr "Chyba v ověřovacím kódu"
 
@@ -704,7 +439,7 @@ msgstr "Chyba v ověřovacím kódu"
 msgid "Existing nickname"
 msgstr "Existující jméno"
 
-#: ../lib/util.php:326
+#: ../lib/util.php:298
 msgid "FAQ"
 msgstr "FAQ"
 
@@ -712,69 +447,57 @@ msgstr "FAQ"
 msgid "Failed updating avatar."
 msgstr "Nahrávání obrázku selhalo."
 
-#: ../actions/all.php:61 ../actions/allrss.php:64
-#, fuzzy, php-format
+#: ../actions/all.php:61 ../actions/allrss.php:74 ../actions/allrss.php:64
+#: actions/all.php:61 actions/allrss.php:64
+#, php-format
+#, fuzzy
 msgid "Feed for friends of %s"
-msgstr "Feed přítel uživatele: %s"
-
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#, fuzzy, php-format
-msgid "Feed for replies to %s"
-msgstr "Feed odpovědí na %s"
-
-#: ../actions/tag.php:55
-#, fuzzy, php-format
-msgid "Feed for tag %s"
-msgstr "Feed odpovědí na %s"
-
-#: ../lib/searchaction.php:105
-msgid "Find content of notices"
 msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Feed přítel uživatele: %s\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../lib/searchaction.php:101
-msgid "Find people on this site"
+#: ../actions/replies.php:61 ../actions/repliesrss.php:80
+#: ../actions/replies.php:65 actions/replies.php:65 actions/repliesrss.php:66
+#, php-format
+#, fuzzy
+msgid "Feed for replies to %s"
 msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Feed odpovědí na %s\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/login.php:122
+#: ../actions/login.php:118
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr "Z bezpe�nostních důvodů, prosím zadejte znovu své jméno a heslo."
 
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: ../actions/profilesettings.php:44
 msgid "Full name"
 msgstr "Celé jméno"
 
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93
+#: ../actions/profilesettings.php:90 ../actions/updateprofile.php:92
 msgid "Full name is too long (max 255 chars)."
 msgstr "Jméno je moc dlouhé (maximální délka je 255 znaků)"
 
-#: ../lib/util.php:322
+#: ../lib/util.php:279
 msgid "Help"
 msgstr "Nápověda"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:274
 msgid "Home"
 msgstr "Domů"
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: ../actions/profilesettings.php:49
 msgid "Homepage"
 msgstr "Moje stránky"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: ../actions/profilesettings.php:87
 msgid "Homepage is not a valid URL."
 msgstr "Stránka není platnou URL."
 
-#: ../actions/emailsettings.php:91
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102
-msgid "IM"
-msgstr ""
-
-#: ../actions/imsettings.php:60
+#: ../actions/imsettings.php:61
 msgid "IM Address"
 msgstr "IM adresa"
 
@@ -787,67 +510,52 @@ msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
 msgstr ""
-"Pokud již máte ú�et, přihlašte se pomocí přezdívky a hesla. A poté propojte "
-"ú�et s OpenID."
+"Pokud již máte ú�et, přihlašte se pomocí přezdívky a hesla. A poté "
+"propojte ú�et s 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 ""
-"Pokud chcete přidat OpenID k vašemu ú�tu, zadejte OpenID do pole níže a "
-"klikněte na \"Přidat\"."
+"Pokud chcete přidat OpenID k vašemu ú�tu, zadejte OpenID do pole níže "
+"a klikněte na \"Přidat\"."
 
-#: ../actions/recoverpassword.php:137
-#, fuzzy
+#: ../actions/recoverpassword.php:122
 msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
+"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 ""
-"Pokud jste zapomněl nebo stratil heslo, můžete si nechat zaslat nové na vaší "
-"emailovou adresu uloženou u vašeho ú�tu."
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283
-#, fuzzy
-msgid "Incoming email address removed."
-msgstr "Adresa byla odstraněna"
+"Pokud jste zapomněl nebo stratil heslo, můžete si nechat zaslat nové na "
+"vaší emailovou adresu uloženou u vašeho ú�tu."
 
 #: ../actions/password.php:69
 msgid "Incorrect old password"
 msgstr "Neplatné heslo"
 
-#: ../actions/login.php:67
+#: ../actions/login.php:63
 msgid "Incorrect username or password."
 msgstr "Neplatné jméno nebo heslo"
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:226
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
-"Návod jak obnovit heslo byl odeslát na vaší emailovou adresu zaregistrovanou "
-"u vašeho ú�tu."
+"Návod jak obnovit heslo byl odeslát na vaší emailovou adresu "
+"zaregistrovanou u vašeho ú�tu."
 
-#: ../actions/updateprofile.php:114
+#: ../actions/updateprofile.php:113
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "Neplatná adresa obrázku '%s'"
 
-#: ../actions/invite.php:55
-#, fuzzy, php-format
-msgid "Invalid email address: %s"
-msgstr "Není platnou mailovou adresou."
-
-#: ../actions/updateprofile.php:98
+#: ../actions/updateprofile.php:97
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Neplatná adresa '%s'"
 
-#: ../actions/updateprofile.php:82
+#: ../actions/updateprofile.php:81
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "Neplatná adresa licence '%s'"
@@ -864,7 +572,7 @@ msgstr "Neplatná uri sdělení"
 msgid "Invalid notice url"
 msgstr "Neplatná url sdělení"
 
-#: ../actions/updateprofile.php:87
+#: ../actions/updateprofile.php:86
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "Neplatná adresa profilu '%s'."
@@ -881,71 +589,45 @@ msgstr "Neplatná adresa profilu, vrácená serverem"
 msgid "Invalid size."
 msgstr "Neplatná velikost"
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111
+#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
+#: ../actions/register.php:84
 msgid "Invalid username or password."
 msgstr "Neplatné jméno nebo heslo"
 
-#: ../actions/invite.php:79
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123
-msgid "Invite new users"
-msgstr ""
-
-#: ../lib/util.php:261
+#: ../lib/util.php:237
 #, 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)."
+"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 ""
 "Běží na [Laconica](http://laconi.ca/) mikroblogovací program, verze %s, "
-"dostupná pod [GNU Affero General Public License](http://www.fsf.org/"
-"licensing/licenses/agpl-3.0.html)."
+"dostupná pod [GNU Affero General Public "
+"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:173
+#: ../actions/imsettings.php:164
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID již patří jinému uživateli"
 
-#: ../actions/imsettings.php:62
+#: ../actions/imsettings.php:63
 #, 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 ""
-"Jabber nebo GTalk adresy, například \"jmeno@neco.cz\". Neprve se ujistěte že "
-"jste přidal %s do vašeho seznamu kontaktů."
-
-#: ../actions/profilesettings.php:57
-msgid "Language"
-msgstr ""
+"Jabber nebo GTalk adresy, například \"jmeno@neco.cz\". Neprve se ujistěte "
+"že jste přidal %s do vašeho seznamu kontaktů."
 
-#: ../actions/profilesettings.php:113
-#, fuzzy
-msgid "Language is too long (max 50 chars)."
-msgstr "Umístění příliš dlouhé (maximálně 255 znaků)"
-
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: ../actions/profilesettings.php:55
 msgid "Location"
 msgstr "Umístění"
 
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108
+#: ../actions/profilesettings.php:96 ../actions/updateprofile.php:107
 msgid "Location is too long (max 255 chars)."
 msgstr "Umístění příliš dlouhé (maximálně 255 znaků)"
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310
+#: ../actions/login.php:93 ../actions/login.php:102
+#: ../actions/openidlogin.php:68 ../lib/util.php:286
 msgid "Login"
 msgstr "Přihlásit"
 
@@ -954,39 +636,26 @@ msgstr "Přihlásit"
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Přihlaste se pomocí [OpenID](%%doc.openid%%) ú�tu."
 
-#: ../actions/login.php:126
+#: ../actions/login.php:122
 #, 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%"
-"%). "
+"Login with your username and password. Don't have a username yet? "
+"[Register](%%action.register%%) a new account, or try "
+"[OpenID](%%action.openidlogin%%). "
 msgstr ""
-"Přihlaste se pomocí vaší prezdívky a hesla. Zatím nejste zaregistrován? "
-"[Registrovat](%%action.register%%) nový ú�et, nebo vyzkoušejte [OpenID](%%"
-"action.openidlogin%%)."
+"Přihlaste se pomocí vaší prezdívky a hesla. Zatím nejste "
+"zaregistrován? [Registrovat](%%action.register%%) nový ú�et, nebo "
+"vyzkoušejte [OpenID](%%action.openidlogin%%)."
 
-#: ../lib/util.php:308
+#: ../lib/util.php:284
 msgid "Logout"
 msgstr "Odhlásit"
 
-#: ../actions/register.php:166
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
-
-#: ../actions/login.php:110
+#: ../actions/login.php:106
 msgid "Lost or forgotten password?"
 msgstr "Ztracené nebo zapomenuté heslo?"
 
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr ""
-
-#: ../actions/showstream.php:300
+#: ../actions/showstream.php:281
 msgid "Member since"
 msgstr "ÄŒlenem od"
 
@@ -995,59 +664,38 @@ msgstr "ÄŒlenem od"
 msgid "Microblog by %s"
 msgstr "Mikroblog od %s"
 
-#: ../actions/smssettings.php:304
-#, php-format
-msgid ""
-"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
-"email but isn't listed here, send email to let us know at %s."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
 msgid "My text and files are available under "
 msgstr "Mé texty a soubory jsou k dispozici pod"
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-msgid "New"
-msgstr ""
-
-#: ../lib/mail.php:144
-#, fuzzy, php-format
-msgid "New email address for posting to %s"
-msgstr "Žádný registrovaný email pro tohoto uživatele."
-
-#: ../actions/emailsettings.php:297
-#, fuzzy
-msgid "New incoming email address added."
-msgstr "Není platnou mailovou adresou."
-
 #: ../actions/finishopenidlogin.php:71
 msgid "New nickname"
 msgstr "Nová přezdívka"
 
-#: ../actions/newnotice.php:87
+#: ../actions/newnotice.php:100
 msgid "New notice"
 msgstr "Nové sdělení"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
+#: ../actions/password.php:41 ../actions/recoverpassword.php:164
 msgid "New password"
 msgstr "Nové heslo"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:275
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nové heslo bylo uloženo. Nyní jste přihlášen."
 
-#: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151
+#: ../actions/login.php:97 ../actions/profilesettings.php:41
+#: ../actions/register.php:175
 msgid "Nickname"
 msgstr "Přezdívka"
 
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69
+#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:99
+#: ../actions/register.php:59
 msgid "Nickname already in use. Try another one."
 msgstr "Přezdívku již někdo používá. Zkuste jinou"
 
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:67 ../actions/updateprofile.php:77
+#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:80
+#: ../actions/register.php:57 ../actions/updateprofile.php:76
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Přezdívka může obsahovat pouze malá písmena a �ísla bez mezer"
 
@@ -1059,53 +707,30 @@ msgstr "Přezdívka není povolena"
 msgid "Nickname of the user you want to follow"
 msgstr "Přezdívka uživatele, kterého chcete sledovat"
 
-#: ../actions/recoverpassword.php:162
+#: ../actions/recoverpassword.php:147
 msgid "Nickname or email"
 msgstr "Přezdívka nebo email"
 
-#: ../actions/deletenotice.php:59
-msgid "No"
-msgstr ""
-
-#: ../actions/imsettings.php:156
+#: ../actions/imsettings.php:147
 msgid "No Jabber ID."
 msgstr "Žádné Jabber ID."
 
-#: ../actions/userauthorization.php:129
+#: ../actions/userauthorization.php:128
 msgid "No authorization request!"
 msgstr "Žádné potvrení!"
 
-#: ../actions/smssettings.php:181
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316
-#, fuzzy
-msgid "No code entered"
-msgstr "Žádný obsah!"
-
 #: ../actions/confirmaddress.php:33
 msgid "No confirmation code."
 msgstr "Žádný potvrzující kód."
 
-#: ../actions/newnotice.php:44
+#: ../actions/newnotice.php:49
 msgid "No content!"
 msgstr "Žádný obsah!"
 
-#: ../actions/emailsettings.php:174
-#, fuzzy
-msgid "No email address."
-msgstr "Emailová adresa"
-
-#: ../actions/userbyid.php:32
+#: ../actions/userbyid.php:27
 msgid "No id."
 msgstr "Žádné id"
 
-#: ../actions/emailsettings.php:271
-#, fuzzy
-msgid "No incoming email address."
-msgstr "Není platnou mailovou adresou."
-
 #: ../actions/finishremotesubscribe.php:65
 msgid "No nickname provided by remote server."
 msgstr "Nebyla poskytnuta žádná přezdívka od servru."
@@ -1114,25 +739,19 @@ msgstr "Nebyla poskytnuta žádná přezdívka od servru."
 msgid "No nickname."
 msgstr "Žádná přezdívka."
 
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229
+#: ../actions/imsettings.php:197
 msgid "No pending confirmation to cancel."
 msgstr "Ne�eká žádné potvrzení na zrušení."
 
-#: ../actions/smssettings.php:176
-#, fuzzy
-msgid "No phone number."
-msgstr "Žádný takový uživatel."
-
 #: ../actions/finishremotesubscribe.php:72
 msgid "No profile URL returned by server."
 msgstr "Nebylo vráceno žádné URL profilu od servu."
 
-#: ../actions/recoverpassword.php:226
+#: ../actions/recoverpassword.php:189
 msgid "No registered email address for that user."
 msgstr "Žádný registrovaný email pro tohoto uživatele."
 
-#: ../actions/userauthorization.php:49
+#: ../actions/userauthorization.php:48
 msgid "No request found!"
 msgstr "Žádný požadavek nebyl nalezen!"
 
@@ -1144,14 +763,6 @@ msgstr "Žádné výsledky."
 msgid "No size."
 msgstr "Žádná velikost"
 
-#: ../actions/twitapistatuses.php:595
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555
-msgid "No status with that ID found."
-msgstr ""
-
 #: ../actions/openidsettings.php:135
 msgid "No such OpenID."
 msgstr "Žádné takové OpenID"
@@ -1160,8 +771,7 @@ msgstr "Žádné takové OpenID"
 msgid "No such document."
 msgstr "Žádný takový dokument."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30
+#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
 msgid "No such notice."
 msgstr "Žádné takové oznámení."
 
@@ -1174,21 +784,16 @@ msgid "No such subscription"
 msgstr "Žádné takové odebírání"
 
 #: ../actions/all.php:34 ../actions/allrss.php:35
-#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
-#: ../actions/remotesubscribe.php:84 ../actions/remotesubscribe.php:91
-#: ../actions/replies.php:57 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:110 ../actions/userbyid.php:36
-#: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
-#: ../lib/subs.php:33 ../lib/subs.php:82
+#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:36
+#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
+#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
+#: ../actions/showstream.php:95 ../actions/subscribe.php:43
+#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
+#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
 msgid "No such user."
 msgstr "Žádný takový uživatel."
 
-#: ../actions/recoverpassword.php:211
-#, fuzzy
-msgid "No user with that email address or username."
-msgstr "Žádný registrovaný email pro tohoto uživatele."
-
-#: ../lib/gallery.php:80
+#: ../lib/gallery.php:76
 msgid "Nobody to show!"
 msgstr "Nikdo k zobrazení!"
 
@@ -1196,18 +801,7 @@ msgstr "Nikdo k zobrazení!"
 msgid "Not a recovery code."
 msgstr "Není obnovujícím kódem"
 
-#: ../scripts/maildaemon.php:50
-#, fuzzy
-msgid "Not a registered user."
-msgstr "Není obnovujícím kódem"
-
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332
-#, fuzzy
-msgid "Not a supported data format."
-msgstr "Nepodporovaný formát obrázku."
-
-#: ../actions/imsettings.php:167
+#: ../actions/imsettings.php:158
 msgid "Not a valid Jabber ID"
 msgstr "Není platným Jabber ID"
 
@@ -1215,24 +809,19 @@ msgstr "Není platným Jabber ID"
 msgid "Not a valid OpenID."
 msgstr "Není platným OpenID."
 
-#: ../actions/emailsettings.php:185
-#, fuzzy
-msgid "Not a valid email address"
-msgstr "Není platnou mailovou adresou."
-
-#: ../actions/register.php:63
+#: ../actions/profilesettings.php:75 ../actions/register.php:53
 msgid "Not a valid email address."
 msgstr "Není platnou mailovou adresou."
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
+#: ../actions/profilesettings.php:83 ../actions/register.php:61
 msgid "Not a valid nickname."
 msgstr "Není platnou přezdívkou."
 
-#: ../actions/remotesubscribe.php:120
+#: ../actions/remotesubscribe.php:118
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "Neplatný adresa profilu (nesprává služba)"
 
-#: ../actions/remotesubscribe.php:113
+#: ../actions/remotesubscribe.php:111
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "Není platnou adresou profulu (XRDS nedefinováno)."
 
@@ -1252,50 +841,38 @@ msgstr "Neautorizován."
 msgid "Not expecting this response!"
 msgstr "Ne�ekaná odpově�."
 
-#: ../actions/twitapistatuses.php:422
-#, fuzzy
-msgid "Not found"
-msgstr "Žádný požadavek nebyl nalezen!"
-
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:28
-#: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
-#: ../lib/settingsaction.php:27
+#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
+#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
+#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
 msgid "Not logged in."
 msgstr "Nepřihlášen"
 
-#: ../lib/subs.php:91
+#: ../actions/unsubscribe.php:43
 msgid "Not subscribed!."
 msgstr "Nepřihlášen!"
 
-#: ../actions/opensearch.php:35
+#: ../actions/showstream.php:82 actions/showstream.php:82
+#, php-format
 #, fuzzy
-msgid "Notice Search"
-msgstr "Hledat"
-
-#: ../actions/showstream.php:82
-#, fuzzy, php-format
 msgid "Notice feed for %s"
-msgstr "Feed sdělení pro %s"
+msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Feed sdělení pro %s\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
 #: ../actions/shownotice.php:39
 msgid "Notice has no profile"
 msgstr "Sdělení nemá profil"
 
-#: ../actions/showstream.php:316
+#: ../actions/showstream.php:297
 msgid "Notices"
 msgstr "Sdělení"
 
-#: ../actions/tag.php:35 ../actions/tag.php:81
-#, fuzzy, php-format
-msgid "Notices tagged with %s"
-msgstr "Feed sdělení pro %s"
-
 #: ../actions/password.php:39
 msgid "Old password"
 msgstr "Staré heslo"
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314
+#: ../lib/util.php:288
 msgid "OpenID"
 msgstr "OpenID"
 
@@ -1338,105 +915,74 @@ msgstr "OpenID odstraněno"
 msgid "OpenID settings"
 msgstr "Nastavení OpenID"
 
-#: ../actions/invite.php:135
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
 #: ../actions/avatar.php:84
 msgid "Partial upload."
 msgstr "Částe�né náhrání."
 
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
-#: ../actions/register.php:153 ../lib/settingsaction.php:93
+#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
+#: ../actions/register.php:177
 msgid "Password"
 msgstr "Heslo"
 
-#: ../actions/recoverpassword.php:288
+#: ../actions/recoverpassword.php:249
 msgid "Password and confirmation do not match."
 msgstr "Heslo a potvrzení nesouhlasí"
 
-#: ../actions/recoverpassword.php:284
+#: ../actions/recoverpassword.php:245
 msgid "Password must be 6 chars or more."
 msgstr "Heslo musí být alespoň 6 znaků dlouhé"
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
 msgid "Password recovery requested"
 msgstr "Žádost o obnovu hesla"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: ../actions/password.php:89 ../actions/recoverpassword.php:274
 msgid "Password saved."
 msgstr "Heslo uloženo"
 
-#: ../actions/password.php:61 ../actions/register.php:88
+#: ../actions/password.php:61 ../actions/register.php:65
 msgid "Passwords don't match."
 msgstr "Hesla nesouhlasí"
 
-#: ../lib/searchaction.php:100
-#, fuzzy
-msgid "People"
-msgstr "Hledání lidí"
-
-#: ../actions/opensearch.php:33
-#, fuzzy
-msgid "People Search"
-msgstr "Hledání lidí"
-
 #: ../actions/peoplesearch.php:33
 msgid "People search"
 msgstr "Hledání lidí"
 
-#: ../lib/stream.php:50
+#: ../lib/stream.php:44
 msgid "Personal"
 msgstr "Osobní"
 
-#: ../actions/invite.php:133
-#, fuzzy
-msgid "Personal message"
-msgstr "Osobní"
-
-#: ../actions/smssettings.php:69
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "1-64 znaků nebo �ísel, bez te�ek, �árek a mezer"
-
-#: ../actions/userauthorization.php:78
+#: ../actions/userauthorization.php:77
 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 \"Cancel\"."
 msgstr ""
-"Prosím zkontrolujte tyto detailu, a ujistěte se že opravdu chcete odebírat "
-"sdělení tohoto uživatele. Pokud ne, ask to subscribe to somone's notices, "
-"klikněte na \"Zrušit\""
+"Prosím zkontrolujte tyto detailu, a ujistěte se že opravdu chcete "
+"odebírat sdělení tohoto uživatele. Pokud ne, ask to subscribe to "
+"somone's notices, klikněte na \"Zrušit\""
 
-#: ../actions/imsettings.php:73
+#: ../actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Poslat oznámení, když se změní můj Jabber/Gtalk status."
 
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94
+#: ../actions/imsettings.php:68
 msgid "Preferences"
 msgstr "Nastavení"
 
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163
+#: ../actions/imsettings.php:135
 msgid "Preferences saved."
 msgstr "Nastavení uloženo"
 
-#: ../actions/profilesettings.php:57
-#, fuzzy
-msgid "Preferred language"
-msgstr "Nastavení"
-
-#: ../lib/util.php:328
+#: ../lib/util.php:300
 msgid "Privacy"
 msgstr "Soukromí"
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106
+#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
 msgid "Problem saving notice."
 msgstr "Problém při ukládání sdělení"
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60
+#: ../lib/stream.php:54
 msgid "Profile"
 msgstr "Profil"
 
@@ -1448,38 +994,31 @@ msgstr "Adresa Profilu"
 msgid "Profile settings"
 msgstr "Nastavené Profilu"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
 msgid "Profile unknown"
 msgstr "Neznámý profil"
 
-#: ../actions/public.php:54
+#: ../lib/util.php:276
+msgid "Public"
+msgstr "Veřejné"
+
+#: ../actions/public.php:54 actions/public.php:54
 #, fuzzy
 msgid "Public Stream Feed"
-msgstr "Veřejný Stream Feed"
+msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Veřejný Stream Feed\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
 #: ../actions/public.php:33
 msgid "Public timeline"
 msgstr "Veřejné zprávy"
 
-#: ../actions/imsettings.php:79
-#, fuzzy
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Potvrzené Jabber/GTalk adresy"
-
-#: ../actions/emailsettings.php:94
-#, fuzzy
-msgid "Publish a MicroID for my email address."
-msgstr "Zadej přezdívku nebo emailovou adresu"
-
-#: ../actions/tag.php:75 ../actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
-
-#: ../actions/recoverpassword.php:166
+#: ../actions/recoverpassword.php:151
 msgid "Recover"
 msgstr "Obnovit"
 
-#: ../actions/recoverpassword.php:156
+#: ../actions/recoverpassword.php:141
 msgid "Recover password"
 msgstr "Obnovit"
 
@@ -1487,28 +1026,19 @@ msgstr "Obnovit"
 msgid "Recovery code for unknown user."
 msgstr "Obnovyt kód pro neznámého uživatele"
 
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: ../actions/register.php:171 ../actions/register.php:195 ../lib/util.php:287
 msgid "Register"
 msgstr "Registrovat"
 
-#: ../actions/register.php:28
-#, fuzzy
-msgid "Registration not allowed."
-msgstr "Přezdívka není povolena"
-
-#: ../actions/register.php:200
-msgid "Registration successful"
-msgstr ""
-
-#: ../actions/userauthorization.php:120
+#: ../actions/userauthorization.php:119
 msgid "Reject"
 msgstr "Odmítnout"
 
-#: ../actions/login.php:103 ../actions/register.php:176
+#: ../actions/login.php:99 ../actions/register.php:183
 msgid "Remember me"
 msgstr "Zapamatuj si mÄ›"
 
-#: ../actions/updateprofile.php:70
+#: ../actions/updateprofile.php:69
 msgid "Remote profile with no matching profile"
 msgstr "Vzdálený profil s nesouhlasícím profilem"
 
@@ -1516,9 +1046,7 @@ msgstr "Vzdálený profil s nesouhlasícím profilem"
 msgid "Remote subscribe"
 msgstr "Vzdálený odběr"
 
-#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
-#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
 msgid "Remove"
 msgstr "Odstranit"
 
@@ -1534,63 +1062,42 @@ msgstr ""
 "Odstranění jediného OpenID, bude mít za následek nemožnost dalšího "
 "přihlášení, nejprve přidejte jiné OpenID"
 
-#: ../lib/stream.php:55
+#: ../lib/stream.php:49
 msgid "Replies"
 msgstr "Odpovědi"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
 #, php-format
 msgid "Replies to %s"
 msgstr "Odpovědi na %s"
 
-#: ../actions/recoverpassword.php:183
+#: ../actions/recoverpassword.php:168
 msgid "Reset"
 msgstr "Reset"
 
-#: ../actions/recoverpassword.php:173
+#: ../actions/recoverpassword.php:158
 msgid "Reset password"
 msgstr "Resetovat heslo"
 
-#: ../lib/settingsaction.php:99
-msgid "SMS"
-msgstr ""
-
-#: ../actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
-
-#: ../actions/smssettings.php:33
-#, fuzzy
-msgid "SMS Settings"
-msgstr "IM nastavení"
-
-#: ../lib/mail.php:219
-#, fuzzy
-msgid "SMS confirmation"
-msgstr "Žádný potvrzující kód."
-
-#: ../actions/recoverpassword.php:182
+#: ../actions/recoverpassword.php:167 ../actions/register.php:180
 msgid "Same as password above"
 msgstr "Stejné jako heslo výše"
 
-#: ../actions/register.php:156
-#, fuzzy
-msgid "Same as password above. Required."
-msgstr "Stejné jako heslo výše"
-
-#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
-#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
+#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
 msgid "Save"
 msgstr "Uložit"
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300
+#: ../lib/searchaction.php:73 ../lib/util.php:277
 msgid "Search"
 msgstr "Hledat"
 
-#: ../actions/noticesearch.php:80
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
 #, fuzzy
 msgid "Search Stream Feed"
-msgstr "Hledat ve Stream Feed"
+msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Hledat ve Stream Feed\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
 #: ../actions/noticesearch.php:30
 #, php-format
@@ -1598,8 +1105,8 @@ msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
 "by spaces; they must be 3 characters or more."
 msgstr ""
-"Hledej sdělení na %%site.name%% podle obsahu. Minimální délka musí být "
-"alespoň 3 znaky"
+"Hledej sdělení na %%site.name%% podle obsahu. Minimální délka musí "
+"být alespoň 3 znaky"
 
 #: ../actions/peoplesearch.php:28
 #, php-format
@@ -1607,53 +1114,25 @@ 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 ""
-"Hledej uživatele na %%site.name%% podle jejich jména, místa, nebo zájmů. "
-"Minimální délka musí být alespoň 3 znaky"
-
-#: ../actions/smssettings.php:296
-msgid "Select a carrier"
-msgstr ""
+"Hledej uživatele na %%site.name%% podle jejich jména, místa, nebo "
+"zájmů. Minimální délka musí být alespoň 3 znaky"
 
-#: ../actions/invite.php:137 ../lib/util.php:1172
+#: ../lib/util.php:982
 msgid "Send"
 msgstr "Odeslat"
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
-msgstr ""
-
-#: ../actions/emailsettings.php:88
-#, fuzzy
-msgid "Send me notices of new subscriptions through email."
-msgstr "Zasílat oznámení pomocí Jabber/GTalk"
-
-#: ../actions/imsettings.php:70
+#: ../actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Zasílat oznámení pomocí Jabber/GTalk"
 
-#: ../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
-#, fuzzy
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr "Zasílat oznámení pomocí Jabber/GTalk"
-
-#: ../lib/util.php:304
+#: ../lib/util.php:282
 msgid "Settings"
 msgstr "Nastavení"
 
-#: ../actions/profilesettings.php:192
+#: ../actions/profilesettings.php:183
 msgid "Settings saved."
 msgstr "Nastavení uloženo"
 
-#: ../actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
 #: ../actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr "Někdo jiný již má toto OpenID"
@@ -1662,45 +1141,36 @@ msgstr "Někdo jiný již má toto OpenID"
 msgid "Something weird happened."
 msgstr "Něco zvláštního se stalo"
 
-#: ../scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54
-#, fuzzy
-msgid "Sorry, that is not your incoming email address."
-msgstr "Toto je špatná IM adresa"
-
-#: ../lib/util.php:330
+#: ../lib/util.php:302
 msgid "Source"
 msgstr "Zdroj"
 
-#: ../actions/showstream.php:296
+#: ../actions/showstream.php:277
 msgid "Statistics"
 msgstr "Statistiky"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
 msgid "Stored OpenID not found."
 msgstr "Uložené OpenID nebylo nalezeno."
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197
+#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
+#: ../actions/showstream.php:181
 msgid "Subscribe"
 msgstr "Odebírat"
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: ../actions/showstream.php:294 ../actions/subscribers.php:27
 msgid "Subscribers"
 msgstr "Odběratelé"
 
-#: ../actions/userauthorization.php:310
+#: ../actions/userauthorization.php:309
 msgid "Subscription authorized"
 msgstr "Odběr autorizován"
 
-#: ../actions/userauthorization.php:320
+#: ../actions/userauthorization.php:319
 msgid "Subscription rejected"
 msgstr "Odběr odmítnut"
 
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
+#: ../actions/showstream.php:212 ../actions/showstream.php:288
 #: ../actions/subscriptions.php:27
 msgid "Subscriptions"
 msgstr "Odběry"
@@ -1709,14 +1179,6 @@ msgstr "Odběry"
 msgid "System error uploading file."
 msgstr "Chyba systému při nahrávání souboru"
 
-#: ../actions/tag.php:41 ../lib/util.php:301
-msgid "Tags"
-msgstr ""
-
-#: ../lib/searchaction.php:104
-msgid "Text"
-msgstr ""
-
 #: ../actions/noticesearch.php:34
 msgid "Text search"
 msgstr "Vyhledávání textu"
@@ -1733,94 +1195,53 @@ msgstr "Adresa již byla potvrzena"
 msgid "That confirmation code is not for you!"
 msgstr "Tento potvrzující kód vám nepatří!"
 
-#: ../actions/emailsettings.php:191
-#, fuzzy
-msgid "That email address already belongs to another user."
-msgstr "Jabber ID již patří jinému uživateli"
-
 #: ../actions/avatar.php:80
 msgid "That file is too big."
 msgstr "Soubor je příliš velký"
 
-#: ../actions/imsettings.php:170
+#: ../actions/imsettings.php:161
 msgid "That is already your Jabber ID."
 msgstr "Toto je již vaše Jabber"
 
-#: ../actions/emailsettings.php:188
-#, fuzzy
-msgid "That is already your email address."
-msgstr "Toto je již vaše Jabber"
-
-#: ../actions/smssettings.php:188
-#, fuzzy
-msgid "That is already your phone number."
-msgstr "Toto je již vaše Jabber"
-
-#: ../actions/imsettings.php:233
+#: ../actions/imsettings.php:224
 msgid "That is not your Jabber ID."
 msgstr "Toto není váš Jabber"
 
-#: ../actions/emailsettings.php:249
-#, fuzzy
-msgid "That is not your email address."
-msgstr "Toto je špatná IM adresa"
-
-#: ../actions/smssettings.php:257
-#, fuzzy
-msgid "That is not your phone number."
-msgstr "Toto není váš Jabber"
-
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
+#: ../actions/imsettings.php:201
 msgid "That is the wrong IM address."
 msgstr "Toto je špatná IM adresa"
 
-#: ../actions/smssettings.php:233
-#, fuzzy
-msgid "That is the wrong confirmation number."
-msgstr "Toto je špatná IM adresa"
-
-#: ../actions/smssettings.php:191
-#, fuzzy
-msgid "That phone number already belongs to another user."
-msgstr "Jabber ID již patří jinému uživateli"
-
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: ../actions/newnotice.php:52
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků"
 
-#: ../actions/twitapiaccount.php:74
-#, fuzzy
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků"
-
-#: ../actions/confirmaddress.php:92
+#: ../actions/confirmaddress.php:86
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Adresa \"%s\" byla potvrzena pro váš ú�et"
 
-#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274
+#: ../actions/imsettings.php:241
 msgid "The address was removed."
 msgstr "Adresa byla odstraněna"
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:311
 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 ""
 "Odběr byl potvrzen, ale neprošla žádná callback adresa. Zkontrolujte v "
-"nápovědě jak správně postupovat při potvrzování odběru. Váš řetězec odběru "
-"je:"
+"nápovědě jak správně postupovat při potvrzování odběru. Váš "
+"řetězec odběru je:"
 
-#: ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:321
 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 ""
-"Odebírání bylo zamítnuto, ale neprošla žádná callback adresa. Zkontrolujte v "
-"nápovědě jak správně postupovat při zamítání odběru"
+"Odebírání bylo zamítnuto, ale neprošla žádná callback adresa. "
+"Zkontrolujte v nápovědě jak správně postupovat při zamítání odběru"
 
 #: ../actions/subscribers.php:35
 #, php-format
@@ -1840,12 +1261,7 @@ msgstr "Toto jsou lidé, jejiž sdělením %s naslouchá"
 msgid "These are the people whose notices you listen to."
 msgstr "Toto jsou lidé, jejiž sdělením nasloucháte"
 
-#: ../actions/invite.php:89
-msgid ""
-"These people are already users and you were automatically subscribed to them:"
-msgstr ""
-
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:87
 msgid "This confirmation code is too old. Please start again."
 msgstr "Tento potvrzující kód je příliš starý Prosím zkuste znovu"
 
@@ -1854,8 +1270,8 @@ msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr ""
-"Tento formulář by se měl odeslat sám, pokud ne tak klikněte na tlašítko pro "
-"přechod k vašemu OpenID poskytovately."
+"Tento formulář by se měl odeslat sám, pokud ne tak klikněte na "
+"tlašítko pro přechod k vašemu OpenID poskytovately."
 
 #: ../actions/finishopenidlogin.php:56
 #, php-format
@@ -1864,47 +1280,27 @@ msgid ""
 "to a local account. You can either create a new account, or connect with "
 "your existing account, if you have one."
 msgstr ""
-"Toto je poprvé co jste se přihlásil na %s proto musíme propojit vaše OpenID "
-"k našemu ú�tu. Můžete bu� vytvořit nový ú�et, nebo propojit OpenID k vašemu "
-"již existujícímu ú�tu, pokud již takový máte."
-
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-msgid "This method requires a POST or DELETE."
-msgstr ""
+"Toto je poprvé co jste se přihlásil na %s proto musíme propojit vaše "
+"OpenID k našemu ú�tu. Můžete bu� vytvořit nový ú�et, nebo propojit "
+"OpenID k vašemu již existujícímu ú�tu, pokud již takový máte."
 
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381
-msgid "This method requires a POST."
-msgstr ""
-
-#: ../lib/util.php:164
+#: ../lib/util.php:147
 msgid "This page is not available in a media type you accept"
 msgstr "Tato stránka není k dispozici v typu média která přijímáte."
 
-#: ../actions/profilesettings.php:63
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107
-msgid "Timezone not selected."
-msgstr ""
-
 #: ../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 ""
-"Pro odebírání, se musíte [přihlásit](%%action.login%%), nebo [registrovat](%%"
-"action.register%%) nový ú�et. Pokud již máte ú�et na [kompatibilních "
-"mikroblozích](%%doc.openmublog%%), vložte níže asdresu "
-
-#: ../actions/twitapifriendships.php:163
-msgid "Two user ids or screen_names must be supplied."
+"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 ""
+"Pro odebírání, se musíte [přihlásit](%%action.login%%), nebo "
+"[registrovat](%%action.register%%) nový ú�et. Pokud již máte ú�et na "
+"[kompatibilních mikroblozích](%%doc.openmublog%%), vložte níže asdresu "
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: ../actions/profilesettings.php:51
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách."
 
@@ -1912,41 +1308,36 @@ msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách."
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "Adresa profilu na jiných kompatibilních mikroblozích."
 
-#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
-#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
 msgid "Unexpected form submission."
 msgstr "Ne�ekaná forma submission."
 
-#: ../actions/recoverpassword.php:276
+#: ../actions/recoverpassword.php:237
 msgid "Unexpected password reset."
 msgstr "Ne�ekané resetování hesla."
 
-#: ../index.php:57
-msgid "Unknown action"
-msgstr ""
-
 #: ../actions/finishremotesubscribe.php:58
 msgid "Unknown version of OMB protocol."
 msgstr "Neznámá verze OMB protokolu."
 
-#: ../lib/util.php:269
+#: ../lib/util.php:245
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
 msgstr ""
-"Pokud není uvedeno jinak, obsah těchto stránek chráněn autorským právem, "
-"patří přispěvatelů a je k dipozici pod"
+"Pokud není uvedeno jinak, obsah těchto stránek chráněn autorským "
+"právem, patří přispěvatelů a je k dipozici pod"
 
 #: ../actions/confirmaddress.php:48
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "Neznámý typ adresy %s"
 
-#: ../actions/showstream.php:209
+#: ../actions/showstream.php:193
 msgid "Unsubscribe"
 msgstr "Odhlásit"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
 msgid "Unsupported OMB version"
 msgstr "Nepodporovaná verze OMB."
 
@@ -1954,24 +1345,6 @@ msgstr "Nepodporovaná verze OMB."
 msgid "Unsupported image file format."
 msgstr "Nepodporovaný formát obrázku."
 
-#: ../lib/settingsaction.php:100
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:241
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:341
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
 #: ../actions/avatar.php:68
 msgid "Upload"
 msgstr "Upload"
@@ -1983,20 +1356,10 @@ msgid ""
 "site license, also. Use a picture that belongs to you and that you want to "
 "share."
 msgstr ""
-"Zde nahrajte nový obrázek k vašemu profilu. Po tom co nahrajete obrázek ho "
-"již nemůžete editovat, proto se ujistěte že jde víceméně o �tverec."
-
-#: ../lib/settingsaction.php:91
-#, fuzzy
-msgid "Upload a new profile image"
-msgstr "Nelze uložit nové informace do profilu"
-
-#: ../actions/invite.php:114
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
-msgstr ""
+"Zde nahrajte nový obrázek k vašemu profilu. Po tom co nahrajete obrázek "
+"ho již nemůžete editovat, proto se ujistěte že jde víceméně o �tverec."
 
-#: ../actions/register.php:159 ../actions/register.php:162
+#: ../actions/profilesettings.php:48 ../actions/register.php:182
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Použije se pouze pro aktualizace, oznámení a obnovu hesla."
 
@@ -2005,10 +1368,8 @@ msgid "User being listened to doesn't exist."
 msgstr "Úživatel, kterému nasloucháte neexistuje."
 
 #: ../actions/all.php:41 ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:47 ../actions/replies.php:41
-#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
-#: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
-#: ../actions/twitapiusers.php:82
+#: ../actions/foaf.php:43 ../actions/replies.php:41
+#: ../actions/showstream.php:44
 msgid "User has no profile."
 msgstr "Uživatel nemá profil."
 
@@ -2016,137 +1377,79 @@ msgstr "Uživatel nemá profil."
 msgid "User nickname"
 msgstr "Přezdívka"
 
-#: ../actions/twitapiusers.php:75
-#, fuzzy
-msgid "User not found."
-msgstr "Uložené OpenID nebylo nalezeno."
-
-#: ../actions/profilesettings.php:63
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../lib/util.php:1159
+#: ../lib/util.php:969
 #, php-format
 msgid "What's up, %s?"
 msgstr "Co se děje %s?"
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: ../actions/profilesettings.php:57
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Místo. Město, stát."
 
-#: ../actions/updateprofile.php:128
+#: ../actions/updateprofile.php:127
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Neplatný typ obrázku pro '%s'"
 
-#: ../actions/updateprofile.php:123
+#: ../actions/updateprofile.php:122
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Neplatná velikost obrázku '%s'"
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-msgid "Yes"
-msgstr ""
-
 #: ../actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr "Již máte toto OpenID!"
 
-#: ../actions/deletenotice.php:37
-msgid ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
-msgstr ""
-
 #: ../actions/recoverpassword.php:31
 msgid "You are already logged in!"
 msgstr "Již jste přihlášen"
 
-#: ../actions/invite.php:81
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr ""
-
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
 msgstr "Zde můžeze změnit heslo."
 
-#: ../actions/register.php:135
+#: ../actions/register.php:164
 msgid "You can create a new account to start posting notices."
 msgstr "Můžete vytvožit nový ú�et a za�ít posílat oznámení."
 
-#: ../actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
-"Můžete odstranit OpenID z vašeho ú�tu, kliknutím na tla�ítko \"Odebrat\"."
+"Můžete odstranit OpenID z vašeho ú�tu, kliknutím na tla�ítko "
+"\"Odebrat\"."
 
 #: ../actions/imsettings.php:28
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
-"Můžete odesílat nebo přijámat sdělení pomocí Jabber/GTalk [zpráv](%%doc.im%"
-"%).Zadejte svou adresu níže."
+"Můžete odesílat nebo přijámat sdělení pomocí Jabber/GTalk "
+"[zpráv](%%doc.im%%).Zadejte svou adresu níže."
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about you."
+"You can update your personal profile info here so people know more about "
+"you."
 msgstr ""
-"Zde můžete aktualizovat informace o vašem profilu, aby se lidé o vás mohli "
-"více dozvědět."
+"Zde můžete aktualizovat informace o vašem profilu, aby se lidé o vás "
+"mohli více dozvědět."
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
 msgid "You can use the local subscription!"
 msgstr "Můžete použít místní odebírání."
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
 msgid "You can't register if you don't agree to the license."
 msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí."
 
-#: ../actions/updateprofile.php:63
+#: ../actions/updateprofile.php:62
 msgid "You did not send us that profile"
 msgstr "Neodeslal jste nám profil"
 
-#: ../lib/mail.php:147
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
-"Send email to %2$s to post new messages.\n"
-"\n"
-"More email instructions at %3$s.\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:612
-msgid "You may not delete another user's status."
-msgstr ""
-
-#: ../actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr ""
-
-#: ../actions/invite.php:103
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
-
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:134
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Byl jste identifikován. Zadejte nové heslo"
 
@@ -2154,7 +1457,7 @@ msgstr "Byl jste identifikován. Zadejte nové heslo"
 msgid "Your OpenID URL"
 msgstr "Vaše OpenID adresa"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:149
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Vaše přezdívka na tomto servu, nebo váš email zadaný při registraci"
 
@@ -2164,64 +1467,60 @@ 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%%) vám dovoluje použít stejný ú�et na více stránkách. "
-"Zde může spravovat vaše OpenID"
+"[OpenID](%%doc.openid%%) vám dovoluje použít stejný ú�et na více "
+"stránkách. Zde může spravovat vaše OpenID"
 
-#: ../lib/util.php:943
+#: ../lib/util.php:814
 msgid "a few seconds ago"
 msgstr "před pár sekundami"
 
-#: ../lib/util.php:955
+#: ../lib/util.php:826
 #, php-format
 msgid "about %d days ago"
 msgstr "před %d dny"
 
-#: ../lib/util.php:951
+#: ../lib/util.php:822
 #, php-format
 msgid "about %d hours ago"
 msgstr "asi před %d hodinami"
 
-#: ../lib/util.php:947
+#: ../lib/util.php:818
 #, php-format
 msgid "about %d minutes ago"
 msgstr "asi před %d minutami"
 
-#: ../lib/util.php:959
+#: ../lib/util.php:830
 #, php-format
 msgid "about %d months ago"
 msgstr "asi před %d mesíci"
 
-#: ../lib/util.php:953
+#: ../lib/util.php:824
 msgid "about a day ago"
 msgstr "asi přede dnem"
 
-#: ../lib/util.php:945
+#: ../lib/util.php:816
 msgid "about a minute ago"
 msgstr "asi před minutou"
 
-#: ../lib/util.php:957
+#: ../lib/util.php:828
 msgid "about a month ago"
 msgstr "asi před měsícem"
 
-#: ../lib/util.php:961
+#: ../lib/util.php:832
 msgid "about a year ago"
 msgstr "asi před rokem"
 
-#: ../lib/util.php:949
+#: ../lib/util.php:820
 msgid "about an hour ago"
 msgstr "asi před hodinou"
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-msgid "delete"
-msgstr ""
-
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117
+#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
+#: ../lib/stream.php:101
 msgid "in reply to..."
 msgstr "odpověd na ..."
 
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124
+#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
+#: ../lib/stream.php:108
 msgid "reply"
 msgstr "odpově�"
 
@@ -2229,23 +1528,1311 @@ msgstr "odpově�"
 msgid "same as password above"
 msgstr "stejné jako heslo výše"
 
-#: ../actions/twitapistatuses.php:755
-#, fuzzy
-msgid "unsupported file type"
-msgstr "Nepodporovaný formát obrázku."
-
-#: ../lib/util.php:1309
+#: ../lib/util.php:1127
 msgid "« After"
 msgstr "« Novější"
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "Nelze potvrdit email"
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+msgid " from "
+msgstr ""
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
+
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#, php-format
+msgid "%s public timeline"
+msgstr ""
+
+#: ../lib/mail.php:206 lib/mail.php:212
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/register.php:154 actions/register.php:168
+msgid "6 or more characters. Required."
+msgstr ""
 
-#~ msgid "Couldn't create subscription."
-#~ msgstr "Nelze vytvořit odebírat"
+#: ../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 ""
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Chyba při vkládání nového sdělení"
+#: ../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 ""
 
-#~ msgid "Public"
-#~ msgstr "Veřejné"
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55
+msgid "API method not found!"
+msgstr ""
+
+#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
+#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
+#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
+#: ../actions/twitapidirect_messages.php:49
+#: ../actions/twitapidirect_messages.php:56
+#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
+#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
+#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
+#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
+#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
+#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
+#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
+#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
+#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
+#: actions/twitapistatuses.php:690
+msgid "API method under construction."
+msgstr ""
+
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
+
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for "
+"non-humans)"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
+
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr ""
+
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+msgid "Change email handling"
+msgstr ""
+
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+msgid "Change your profile settings"
+msgstr ""
+
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+msgid "Could not follow user: User not found."
+msgstr ""
+
+#: ../lib/subs.php:54 lib/subs.php:61
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: ../lib/subs.php:46 lib/subs.php:46
+msgid "Could not subscribe."
+msgstr ""
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+msgid "Couldn't update user record."
+msgstr ""
+
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr ""
+
+#: ../classes/Notice.php:72 classes/Notice.php:86
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr ""
+
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr ""
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr ""
+
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: ../actions/tag.php:55 actions/tag.php:55
+#, php-format
+msgid "Feed for tag %s"
+msgstr ""
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr ""
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr ""
+
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+msgid "I want to post notices by email."
+msgstr ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+msgid "IM"
+msgstr ""
+
+#: ../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
+msgid "Incoming email"
+msgstr ""
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+msgid "Incoming email address removed."
+msgstr ""
+
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Language"
+msgstr ""
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+msgid "Language is too long (max 50 chars)."
+msgstr ""
+
+#: ../actions/register.php:166 actions/register.php:180
+msgid "Longer name, preferably your \"real\" name"
+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 ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr ""
+
+#: ../lib/mail.php:144 lib/mail.php:144
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+msgid "New incoming email address added."
+msgstr ""
+
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+msgid "No"
+msgstr ""
+
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr ""
+
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+msgid "No email address."
+msgstr ""
+
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+msgid "No incoming email address."
+msgstr ""
+
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+msgid "No status with that ID found."
+msgstr ""
+
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+msgid "Not a registered user."
+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
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+msgid "Not found"
+msgstr ""
+
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr ""
+
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
+
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr ""
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr ""
+
+#: ../actions/invite.php:133 actions/invite.php:141
+msgid "Personal message"
+msgstr ""
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Preferred language"
+msgstr ""
+
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/register.php:28 actions/register.php:28
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+msgid "Registration successful"
+msgstr ""
+
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/register.php:156 actions/register.php:170
+msgid "Same as password above. Required."
+msgstr ""
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr ""
+
+#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
+#: actions/emailsettings.php:74 actions/smssettings.php:82
+msgid "Send email to this address to post new notices."
+msgstr ""
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../actions/tag.php:60 actions/tag.php:60
+msgid "Showing most popular tags from the last week"
+msgstr ""
+
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317
+msgid "Tags"
+msgstr ""
+
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
+msgid "Text"
+msgstr ""
+
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+msgid "That is not your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+msgid "That is not your phone number."
+msgstr ""
+
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/invite.php:89 actions/invite.php:96
+msgid ""
+"These people are already users and you were automatically subscribed to "
+"them:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511
+msgid "This method requires a POST or 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
+msgid "This method requires a POST."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+msgid "Timezone not selected."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+msgid "Two user ids or screen_names must be supplied."
+msgstr ""
+
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this "
+"service."
+msgstr ""
+
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+msgid "Yes"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+msgid "You are not friends with the specified user."
+msgstr ""
+
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr ""
+
+#: ../actions/invite.php:103 actions/invite.php:110
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
+msgstr ""
+
+#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99
+msgid "delete"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+msgid "unsupported file type"
+msgstr ""
+
+#: actions/deletenotice.php:74 actions/disfavor.php:43
+#: actions/emailsettings.php:127 actions/favor.php:45
+#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
+#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
+#: actions/openidsettings.php:123 actions/profilesettings.php:47
+#: actions/recoverpassword.php:282 actions/register.php:42
+#: actions/remotesubscribe.php:40 actions/smssettings.php:124
+#: actions/subscribe.php:44 actions/twittersettings.php:97
+#: actions/unsubscribe.php:41 actions/userauthorization.php:35
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/disfavor.php:55
+msgid "This notice is not a favorite!"
+msgstr ""
+
+#: actions/disfavor.php:63
+msgid "Could not delete favorite."
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Favor"
+msgstr ""
+
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+
+#: actions/emailsettings.php:95
+msgid "Send me email when someone sends me a private message."
+msgstr ""
+
+#: actions/favor.php:53 actions/twitapifavorites.php:142
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132
+msgid "Could not create favorite."
+msgstr ""
+
+#: actions/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#, php-format
+msgid "%s favorite notices"
+msgstr ""
+
+#: actions/favoritesrss.php:64
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr ""
+
+#: actions/inbox.php:28
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+
+#: actions/invite.php:178
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+msgstr ""
+
+#: actions/login.php:104
+msgid "Automatically login in the future; "
+msgstr ""
+
+#: actions/login.php:122
+msgid "For security reasons, please re-enter your "
+msgstr ""
+
+#: actions/login.php:126
+msgid "Login with your username and password. "
+msgstr ""
+
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+msgid "That's too long. Max message size is 140 chars."
+msgstr ""
+
+#: actions/newmessage.php:65
+msgid "No recipient specified."
+msgstr ""
+
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206
+msgid "You can't send a message to this user."
+msgstr ""
+
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly "
+"instead."
+msgstr ""
+
+#: actions/newmessage.php:108
+msgid "No such user"
+msgstr ""
+
+#: actions/newmessage.php:117
+msgid "New message"
+msgstr ""
+
+#: actions/noticesearch.php:95
+msgid "Notice without matching profile"
+msgstr ""
+
+#: actions/openidsettings.php:28
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr ""
+
+#: actions/openidsettings.php:46
+msgid "If you want to add an OpenID to your account, "
+msgstr ""
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr ""
+
+#: actions/openidsettings.php:87
+msgid "You can remove an OpenID from your account "
+msgstr ""
+
+#: actions/outbox.php:28
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr ""
+
+#: actions/outbox.php:30
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#: actions/outbox.php:53
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+
+#: actions/peoplesearch.php:28
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+msgstr ""
+
+#: actions/profilesettings.php:27
+msgid "You can update your personal profile info here "
+msgstr ""
+
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+msgid "User without matching profile"
+msgstr ""
+
+#: actions/recoverpassword.php:91
+msgid "This confirmation code is too old. "
+msgstr ""
+
+#: actions/recoverpassword.php:141
+msgid "If you've forgotten or lost your"
+msgstr ""
+
+#: actions/recoverpassword.php:154
+msgid "You've been identified. Enter a "
+msgstr ""
+
+#: actions/recoverpassword.php:169
+msgid "Your nickname on this server, "
+msgstr ""
+
+#: actions/recoverpassword.php:271
+msgid "Instructions for recovering your password "
+msgstr ""
+
+#: actions/recoverpassword.php:327
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95
+msgid "Password must be 6 or more characters."
+msgstr ""
+
+#: actions/register.php:216
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
+msgstr ""
+
+#: actions/register.php:227
+msgid "(You should receive a message by email momentarily, with "
+msgstr ""
+
+#: actions/remotesubscribe.php:51
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
+msgstr ""
+
+#: actions/showfavorites.php:61
+#, php-format
+msgid "Feed for favorites of %s"
+msgstr ""
+
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+msgid "Could not retrieve favorite notices."
+msgstr ""
+
+#: actions/showmessage.php:33
+msgid "No such message."
+msgstr ""
+
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
+msgstr ""
+
+#: actions/showmessage.php:61
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr ""
+
+#: actions/showmessage.php:66
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr ""
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr ""
+
+#: actions/smssettings.php:312
+#, php-format
+msgid "Mobile carrier for your phone. "
+msgstr ""
+
+#: actions/twitapidirect_messages.php:76
+#, php-format
+msgid "Direct messages to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:77
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:81
+msgid "Direct Messages You've Sent"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:82
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:128
+msgid "No message text!"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:138
+msgid "Recipient user not found."
+msgstr ""
+
+#: actions/twitapidirect_messages.php:141
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
+#: actions/twitapifavorites.php:92
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr ""
+
+#: actions/twitapifavorites.php:95
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr ""
+
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#, php-format
+msgid "%s added your notice as a favorite"
+msgstr ""
+
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+msgstr ""
+
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+msgstr ""
+
+#: actions/twittersettings.php:41
+msgid "Twitter settings"
+msgstr ""
+
+#: actions/twittersettings.php:48
+msgid "Twitter Account"
+msgstr ""
+
+#: actions/twittersettings.php:56
+msgid "Current verified Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr ""
+
+#: actions/twittersettings.php:65
+msgid "No spaces, please."
+msgstr ""
+
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr ""
+
+#: actions/twittersettings.php:72
+msgid "Automatically send my notices to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:75
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:78
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+
+#: actions/twittersettings.php:128
+msgid "Could not verify your Twitter credentials!"
+msgstr ""
+
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+msgid "Unable to save your Twitter settings!"
+msgstr ""
+
+#: actions/twittersettings.php:174
+msgid "Twitter settings saved."
+msgstr ""
+
+#: actions/twittersettings.php:192
+msgid "That is not your Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+msgid "Couldn't remove Twitter user."
+msgstr ""
+
+#: actions/twittersettings.php:212
+msgid "Twitter account removed."
+msgstr ""
+
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+msgid "Couldn't save Twitter preferences."
+msgstr ""
+
+#: actions/twittersettings.php:245
+msgid "Twitter preferences saved."
+msgstr ""
+
+#: actions/userauthorization.php:84
+msgid "Please check these details to make sure "
+msgstr ""
+
+#: actions/userauthorization.php:324
+msgid "The subscription has been authorized, but no "
+msgstr ""
+
+#: actions/userauthorization.php:334
+msgid "The subscription has been rejected, but no "
+msgstr ""
+
+#: classes/Channel.php:113
+msgid "Command results"
+msgstr ""
+
+#: classes/Channel.php:148
+msgid "Command complete"
+msgstr ""
+
+#: classes/Channel.php:158
+msgid "Command failed"
+msgstr ""
+
+#: classes/Command.php:39
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: classes/Command.php:96
+#, php-format
+msgid "Subscriptions: %1$s\n"
+msgstr ""
+
+#: classes/Command.php:125 classes/Command.php:242
+msgid "User has no last notice"
+msgstr ""
+
+#: classes/Command.php:146
+msgid "Notice marked as fave."
+msgstr ""
+
+#: classes/Command.php:166
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr ""
+
+#: classes/Command.php:169
+#, php-format
+msgid "Fullname: %s"
+msgstr ""
+
+#: classes/Command.php:172
+#, php-format
+msgid "Location: %s"
+msgstr ""
+
+#: classes/Command.php:175
+#, php-format
+msgid "Homepage: %s"
+msgstr ""
+
+#: classes/Command.php:178
+#, php-format
+msgid "About: %s"
+msgstr ""
+
+#: classes/Command.php:200
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
+
+#: classes/Command.php:214
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
+
+#: classes/Command.php:216
+msgid "Error sending direct message."
+msgstr ""
+
+#: classes/Command.php:263
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: classes/Command.php:270
+#, php-format
+msgid "Subscribed to %s"
+msgstr ""
+
+#: classes/Command.php:288
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
+
+#: classes/Command.php:295
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr ""
+
+#: classes/Command.php:310 classes/Command.php:330
+msgid "Command not yet implemented."
+msgstr ""
+
+#: classes/Command.php:313
+msgid "Notification off."
+msgstr ""
+
+#: classes/Command.php:315
+msgid "Can't turn off notification."
+msgstr ""
+
+#: classes/Command.php:333
+msgid "Notification on."
+msgstr ""
+
+#: classes/Command.php:335
+msgid "Can't turn on notification."
+msgstr ""
+
+#: classes/Command.php:344
+msgid "Commands:\n"
+msgstr ""
+
+#: classes/Message.php:53
+msgid "Could not insert message."
+msgstr ""
+
+#: classes/Message.php:63
+msgid "Could not update message with new URI."
+msgstr ""
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr ""
+
+#: lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:249
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:253
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+msgstr ""
+
+#: lib/mailbox.php:43
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/openid.php:195
+msgid "This form should automatically submit itself. "
+msgstr ""
+
+#: lib/personal.php:65
+msgid "Favorites"
+msgstr ""
+
+#: lib/personal.php:66
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
+#: lib/personal.php:66
+msgid "User"
+msgstr ""
+
+#: lib/personal.php:75
+msgid "Inbox"
+msgstr ""
+
+#: lib/personal.php:76
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personal.php:80
+msgid "Outbox"
+msgstr ""
+
+#: lib/personal.php:81
+msgid "Your sent messages"
+msgstr ""
+
+#: lib/settingsaction.php:99
+msgid "Twitter"
+msgstr ""
+
+#: lib/settingsaction.php:100
+msgid "Twitter integration options"
+msgstr ""
+
+#: lib/util.php:1718
+msgid "To"
+msgstr ""
+
+#: scripts/maildaemon.php:45
+msgid "Could not parse message."
+msgstr ""
diff --git a/locale/da_DK/LC_MESSAGES/laconica.mo b/locale/da_DK/LC_MESSAGES/laconica.mo
deleted file mode 100644
index 320411277..000000000
--- a/locale/da_DK/LC_MESSAGES/laconica.mo
+++ /dev/null
diff --git a/locale/da_DK/LC_MESSAGES/laconica.po b/locale/da_DK/LC_MESSAGES/laconica.po
deleted file mode 100644
index 6fbff6f30..000000000
--- a/locale/da_DK/LC_MESSAGES/laconica.po
+++ /dev/null
@@ -1,2119 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-27 14:57-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../actions/noticesearchrss.php:64
-#, php-format
-msgid " Search Stream for \"%s\""
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
-msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr ""
-"forventer følgende personlige data: password, email adresse, im adresse, "
-"telefonnummer"
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-msgid " from "
-msgstr ""
-
-#: ../actions/twitapistatuses.php:478
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/invite.php:168
-#, fuzzy, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s følger nu dine meddelelser på %2$s."
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-
-#: ../lib/mail.php:124
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s følger nu dine meddelelser på %2$s."
-
-#: ../lib/mail.php:126
-#, php-format
-msgid ""
-"%1$s is now listening to your notices on %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s.\n"
-msgstr ""
-"%1$s følger nu dine meddelelser på %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Venlig hilsen,\n"
-"%4$s.\n"
-
-#: ../actions/twitapistatuses.php:482
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-
-#: ../actions/shownotice.php:45
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr "%1$s's status på %2$s"
-
-#: ../actions/invite.php:84 ../actions/invite.php:92
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/publicrss.php:62
-#, php-format
-msgid "%s Public Stream"
-msgstr ""
-
-#: ../actions/all.php:47 ../actions/allrss.php:60
-#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51
-#, php-format
-msgid "%s and friends"
-msgstr "og venner"
-
-#: ../actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
-msgstr ""
-
-#: ../lib/mail.php:206
-#, fuzzy, php-format
-msgid "%s status"
-msgstr "%1$s's status på %2$s"
-
-#: ../actions/twitapistatuses.php:338
-#, php-format
-msgid "%s timeline"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:213
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr ""
-
-#: ../lib/util.php:257
-#, php-format
-msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
-msgstr ""
-
-#: ../lib/util.php:259
-#, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr ""
-
-#: ../lib/util.php:274
-msgid ". Contributors should be attributed by full name or nickname."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-
-#: ../actions/register.php:152
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-
-#: ../actions/password.php:42
-msgid "6 or more characters"
-msgstr ""
-
-#: ../actions/recoverpassword.php:180
-msgid "6 or more characters, and don't forget it!"
-msgstr ""
-
-#: ../actions/register.php:154
-msgid "6 or more characters. Required."
-msgstr ""
-
-#: ../actions/imsettings.php:197
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
-msgstr ""
-
-#: ../actions/emailsettings.php:213
-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 ""
-
-#: ../actions/smssettings.php:216
-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 ""
-
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122
-msgid "API method not found!"
-msgstr ""
-
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-msgid "API method under construction."
-msgstr ""
-
-#: ../lib/util.php:324
-msgid "About"
-msgstr ""
-
-#: ../actions/userauthorization.php:119
-msgid "Accept"
-msgstr ""
-
-#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
-#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
-msgid "Add"
-msgstr "Tilføj"
-
-#: ../actions/openidsettings.php:43
-msgid "Add OpenID"
-msgstr "Tilføj OpenID"
-
-#: ../lib/settingsaction.php:97
-#, fuzzy
-msgid "Add or remove OpenIDs"
-msgstr "Tilføj OpenID"
-
-#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39
-msgid "Address"
-msgstr "Addresse"
-
-#: ../actions/invite.php:131
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../actions/showstream.php:273
-msgid "All subscriptions"
-msgstr ""
-
-#: ../actions/publicrss.php:64
-#, php-format
-msgid "All updates for %s"
-msgstr ""
-
-#: ../actions/noticesearchrss.php:66
-#, php-format
-msgid "All updates matching search term \"%s\""
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
-#: ../actions/openidlogin.php:29 ../actions/register.php:30
-msgid "Already logged in."
-msgstr ""
-
-#: ../lib/subs.php:42
-msgid "Already subscribed!."
-msgstr ""
-
-#: ../actions/deletenotice.php:54
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/userauthorization.php:77
-msgid "Authorize subscription"
-msgstr ""
-
-#: ../actions/login.php:104 ../actions/register.php:178
-msgid "Automatically login in the future; not for shared computers!"
-msgstr ""
-
-#: ../actions/profilesettings.php:65
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr ""
-
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-msgid "Avatar"
-msgstr ""
-
-#: ../actions/avatar.php:113
-msgid "Avatar updated."
-msgstr ""
-
-#: ../actions/imsettings.php:55
-#, 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 ""
-
-#: ../actions/emailsettings.php:54
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-msgstr ""
-
-#: ../actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
-
-#: ../lib/util.php:1318
-msgid "Before »"
-msgstr "Før »"
-
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
-msgid "Bio"
-msgstr ""
-
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103
-msgid "Bio is too long (max 140 chars)."
-msgstr ""
-
-#: ../lib/deleteaction.php:41
-msgid "Can't delete this notice."
-msgstr ""
-
-#: ../actions/updateprofile.php:119
-#, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr ""
-
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
-msgid "Can't save new password."
-msgstr ""
-
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62
-msgid "Cancel"
-msgstr ""
-
-#: ../lib/openid.php:121
-msgid "Cannot instantiate OpenID consumer object."
-msgstr ""
-
-#: ../actions/imsettings.php:163
-msgid "Cannot normalize that Jabber ID"
-msgstr ""
-
-#: ../actions/emailsettings.php:181
-msgid "Cannot normalize that email address"
-msgstr ""
-
-#: ../actions/password.php:45
-msgid "Change"
-msgstr ""
-
-#: ../lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
-#: ../actions/password.php:32
-msgid "Change password"
-msgstr ""
-
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
-msgstr ""
-
-#: ../lib/settingsaction.php:85
-msgid "Change your profile settings"
-msgstr ""
-
-#: ../actions/password.php:43 ../actions/recoverpassword.php:181
-#: ../actions/register.php:155 ../actions/smssettings.php:65
-msgid "Confirm"
-msgstr ""
-
-#: ../actions/confirmaddress.php:90
-msgid "Confirm Address"
-msgstr ""
-
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245
-msgid "Confirmation cancelled."
-msgstr ""
-
-#: ../actions/smssettings.php:63
-msgid "Confirmation code"
-msgstr ""
-
-#: ../actions/confirmaddress.php:38
-msgid "Confirmation code not found."
-msgstr ""
-
-#: ../actions/register.php:202
-#, php-format
-msgid ""
-"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."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:91
-msgid "Connect"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:86
-msgid "Connect existing account"
-msgstr ""
-
-#: ../lib/util.php:332
-msgid "Contact"
-msgstr ""
-
-#: ../lib/openid.php:178
-#, php-format
-msgid "Could not create OpenID form: %s"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr ""
-
-#: ../lib/openid.php:160
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr ""
-
-#: ../actions/updateprofile.php:162
-msgid "Could not save avatar info"
-msgstr ""
-
-#: ../actions/updateprofile.php:155
-msgid "Could not save new profile info"
-msgstr ""
-
-#: ../lib/subs.php:54
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../lib/subs.php:46
-msgid "Could not subscribe."
-msgstr ""
-
-#: ../actions/recoverpassword.php:102
-msgid "Could not update user with confirmed email address."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:99
-msgid "Couldn't convert request tokens to access tokens."
-msgstr ""
-
-#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
-#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
-msgid "Couldn't delete email confirmation."
-msgstr ""
-
-#: ../lib/subs.php:103
-msgid "Couldn't delete subscription."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:93
-msgid "Couldn't find any statuses."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:127
-msgid "Couldn't get a request token."
-msgstr ""
-
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206
-msgid "Couldn't insert confirmation code."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:180
-msgid "Couldn't insert new subscription."
-msgstr ""
-
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-msgid "Couldn't save profile."
-msgstr ""
-
-#: ../actions/profilesettings.php:161
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-msgid "Couldn't update user record."
-msgstr ""
-
-#: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
-#: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
-#: ../actions/imsettings.php:243 ../actions/profilesettings.php:141
-#: ../actions/smssettings.php:157 ../actions/smssettings.php:269
-msgid "Couldn't update user."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:84
-msgid "Create"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:70
-msgid "Create a new user with this nickname."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:68
-msgid "Create new account"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:191
-msgid "Creating new account for OpenID that already has a user."
-msgstr ""
-
-#: ../actions/imsettings.php:45
-msgid "Current confirmed Jabber/GTalk address."
-msgstr ""
-
-#: ../actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:44
-msgid "Current confirmed email address."
-msgstr ""
-
-#: ../actions/showstream.php:356
-msgid "Currently"
-msgstr ""
-
-#: ../classes/Notice.php:72
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr ""
-
-#: ../lib/util.php:1061
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr ""
-
-#: ../actions/deletenotice.php:41
-msgid "Delete notice"
-msgstr ""
-
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-msgid "Describe yourself and your interests in 140 chars"
-msgstr ""
-
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87
-msgid "Email"
-msgstr ""
-
-#: ../actions/emailsettings.php:59
-#, fuzzy
-msgid "Email Address"
-msgstr "Addresse"
-
-#: ../actions/emailsettings.php:32
-msgid "Email Settings"
-msgstr ""
-
-#: ../actions/register.php:73
-msgid "Email address already exists."
-msgstr ""
-
-#: ../lib/mail.php:90
-msgid "Email address confirmation"
-msgstr ""
-
-#: ../actions/emailsettings.php:61
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/invite.php:129
-msgid "Email addresses"
-msgstr ""
-
-#: ../actions/recoverpassword.php:191
-msgid "Enter a nickname or email address."
-msgstr ""
-
-#: ../actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/userauthorization.php:137
-msgid "Error authorizing token"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:253
-msgid "Error connecting user to OpenID."
-msgstr ""
-
-#: ../actions/finishaddopenid.php:78
-msgid "Error connecting user."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:151
-msgid "Error inserting avatar"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:143
-msgid "Error inserting new profile"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:167
-msgid "Error inserting remote profile"
-msgstr ""
-
-#: ../actions/recoverpassword.php:240
-msgid "Error saving address confirmation."
-msgstr ""
-
-#: ../actions/userauthorization.php:140
-msgid "Error saving remote profile"
-msgstr ""
-
-#: ../lib/openid.php:226
-msgid "Error saving the profile."
-msgstr ""
-
-#: ../lib/openid.php:237
-msgid "Error saving the user."
-msgstr ""
-
-#: ../actions/password.php:80
-msgid "Error saving user; invalid."
-msgstr ""
-
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
-msgid "Error setting user."
-msgstr ""
-
-#: ../actions/finishaddopenid.php:83
-msgid "Error updating profile"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:161
-msgid "Error updating remote profile"
-msgstr ""
-
-#: ../actions/recoverpassword.php:80
-msgid "Error with confirmation code."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:89
-msgid "Existing nickname"
-msgstr ""
-
-#: ../lib/util.php:326
-msgid "FAQ"
-msgstr ""
-
-#: ../actions/avatar.php:115
-msgid "Failed updating avatar."
-msgstr ""
-
-#: ../actions/all.php:61 ../actions/allrss.php:64
-#, php-format
-msgid "Feed for friends of %s"
-msgstr ""
-
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#, php-format
-msgid "Feed for replies to %s"
-msgstr ""
-
-#: ../actions/tag.php:55
-#, php-format
-msgid "Feed for tag %s"
-msgstr ""
-
-#: ../lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/login.php:122
-msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
-msgstr ""
-
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
-msgid "Full name"
-msgstr ""
-
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93
-msgid "Full name is too long (max 255 chars)."
-msgstr ""
-
-#: ../lib/util.php:322
-msgid "Help"
-msgstr ""
-
-#: ../lib/util.php:298
-msgid "Home"
-msgstr ""
-
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-msgid "Homepage"
-msgstr ""
-
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-msgid "Homepage is not a valid URL."
-msgstr ""
-
-#: ../actions/emailsettings.php:91
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102
-msgid "IM"
-msgstr ""
-
-#: ../actions/imsettings.php:60
-msgid "IM Address"
-msgstr ""
-
-#: ../actions/imsettings.php:33
-msgid "IM Settings"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:88
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
-msgstr ""
-
-#: ../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 ""
-
-#: ../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
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283
-msgid "Incoming email address removed."
-msgstr ""
-
-#: ../actions/password.php:69
-msgid "Incorrect old password"
-msgstr ""
-
-#: ../actions/login.php:67
-msgid "Incorrect username or password."
-msgstr ""
-
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
-msgstr ""
-
-#: ../actions/updateprofile.php:114
-#, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr ""
-
-#: ../actions/invite.php:55
-#, php-format
-msgid "Invalid email address: %s"
-msgstr ""
-
-#: ../actions/updateprofile.php:98
-#, php-format
-msgid "Invalid homepage '%s'"
-msgstr ""
-
-#: ../actions/updateprofile.php:82
-#, php-format
-msgid "Invalid license URL '%s'"
-msgstr ""
-
-#: ../actions/postnotice.php:61
-msgid "Invalid notice content"
-msgstr ""
-
-#: ../actions/postnotice.php:67
-msgid "Invalid notice uri"
-msgstr ""
-
-#: ../actions/postnotice.php:72
-msgid "Invalid notice url"
-msgstr ""
-
-#: ../actions/updateprofile.php:87
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:96
-msgid "Invalid profile URL (bad format)"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:77
-msgid "Invalid profile URL returned by server."
-msgstr ""
-
-#: ../actions/avatarbynickname.php:37
-msgid "Invalid size."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111
-msgid "Invalid username or password."
-msgstr ""
-
-#: ../actions/invite.php:79
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123
-msgid "Invite new users"
-msgstr ""
-
-#: ../lib/util.php:261
-#, 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 ""
-
-#: ../actions/imsettings.php:173
-msgid "Jabber ID already belongs to another user."
-msgstr ""
-
-#: ../actions/imsettings.php:62
-#, 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 ""
-
-#: ../actions/profilesettings.php:57
-msgid "Language"
-msgstr ""
-
-#: ../actions/profilesettings.php:113
-msgid "Language is too long (max 50 chars)."
-msgstr ""
-
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-msgid "Location"
-msgstr ""
-
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108
-msgid "Location is too long (max 255 chars)."
-msgstr ""
-
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310
-msgid "Login"
-msgstr ""
-
-#: ../actions/openidlogin.php:44
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr ""
-
-#: ../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 ""
-
-#: ../lib/util.php:308
-msgid "Logout"
-msgstr ""
-
-#: ../actions/register.php:166
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
-
-#: ../actions/login.php:110
-msgid "Lost or forgotten password?"
-msgstr ""
-
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr ""
-
-#: ../actions/showstream.php:300
-msgid "Member since"
-msgstr ""
-
-#: ../actions/userrss.php:70
-#, php-format
-msgid "Microblog by %s"
-msgstr ""
-
-#: ../actions/smssettings.php:304
-#, php-format
-msgid ""
-"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
-"email but isn't listed here, send email to let us know at %s."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-msgid "My text and files are available under "
-msgstr ""
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-msgid "New"
-msgstr ""
-
-#: ../lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
-msgstr ""
-
-#: ../actions/emailsettings.php:297
-msgid "New incoming email address added."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:71
-msgid "New nickname"
-msgstr ""
-
-#: ../actions/newnotice.php:87
-msgid "New notice"
-msgstr ""
-
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-msgid "New password"
-msgstr ""
-
-#: ../actions/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
-msgstr ""
-
-#: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151
-msgid "Nickname"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69
-msgid "Nickname already in use. Try another one."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:67 ../actions/updateprofile.php:77
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:170
-msgid "Nickname not allowed."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:72
-msgid "Nickname of the user you want to follow"
-msgstr ""
-
-#: ../actions/recoverpassword.php:162
-msgid "Nickname or email"
-msgstr ""
-
-#: ../actions/deletenotice.php:59
-msgid "No"
-msgstr ""
-
-#: ../actions/imsettings.php:156
-msgid "No Jabber ID."
-msgstr ""
-
-#: ../actions/userauthorization.php:129
-msgid "No authorization request!"
-msgstr ""
-
-#: ../actions/smssettings.php:181
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316
-msgid "No code entered"
-msgstr ""
-
-#: ../actions/confirmaddress.php:33
-msgid "No confirmation code."
-msgstr ""
-
-#: ../actions/newnotice.php:44
-msgid "No content!"
-msgstr ""
-
-#: ../actions/emailsettings.php:174
-msgid "No email address."
-msgstr ""
-
-#: ../actions/userbyid.php:32
-msgid "No id."
-msgstr ""
-
-#: ../actions/emailsettings.php:271
-msgid "No incoming email address."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:65
-msgid "No nickname provided by remote server."
-msgstr ""
-
-#: ../actions/avatarbynickname.php:27
-msgid "No nickname."
-msgstr ""
-
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229
-msgid "No pending confirmation to cancel."
-msgstr ""
-
-#: ../actions/smssettings.php:176
-msgid "No phone number."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:72
-msgid "No profile URL returned by server."
-msgstr ""
-
-#: ../actions/recoverpassword.php:226
-msgid "No registered email address for that user."
-msgstr ""
-
-#: ../actions/userauthorization.php:49
-msgid "No request found!"
-msgstr ""
-
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-msgid "No results"
-msgstr ""
-
-#: ../actions/avatarbynickname.php:32
-msgid "No size."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:595
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555
-msgid "No status with that ID found."
-msgstr ""
-
-#: ../actions/openidsettings.php:135
-msgid "No such OpenID."
-msgstr ""
-
-#: ../actions/doc.php:29
-msgid "No such document."
-msgstr ""
-
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30
-msgid "No such notice."
-msgstr ""
-
-#: ../actions/recoverpassword.php:56
-msgid "No such recovery code."
-msgstr ""
-
-#: ../actions/postnotice.php:56
-msgid "No such subscription"
-msgstr ""
-
-#: ../actions/all.php:34 ../actions/allrss.php:35
-#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
-#: ../actions/remotesubscribe.php:84 ../actions/remotesubscribe.php:91
-#: ../actions/replies.php:57 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:110 ../actions/userbyid.php:36
-#: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
-#: ../lib/subs.php:33 ../lib/subs.php:82
-msgid "No such user."
-msgstr ""
-
-#: ../actions/recoverpassword.php:211
-msgid "No user with that email address or username."
-msgstr ""
-
-#: ../lib/gallery.php:80
-msgid "Nobody to show!"
-msgstr ""
-
-#: ../actions/recoverpassword.php:60
-msgid "Not a recovery code."
-msgstr ""
-
-#: ../scripts/maildaemon.php:50
-msgid "Not a registered user."
-msgstr ""
-
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332
-msgid "Not a supported data format."
-msgstr ""
-
-#: ../actions/imsettings.php:167
-msgid "Not a valid Jabber ID"
-msgstr ""
-
-#: ../lib/openid.php:131
-msgid "Not a valid OpenID."
-msgstr ""
-
-#: ../actions/emailsettings.php:185
-msgid "Not a valid email address"
-msgstr ""
-
-#: ../actions/register.php:63
-msgid "Not a valid email address."
-msgstr ""
-
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-msgid "Not a valid nickname."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:120
-msgid "Not a valid profile URL (incorrect services)."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:113
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:104
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr ""
-
-#: ../actions/avatar.php:95
-msgid "Not an image or corrupt file."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:51
-msgid "Not authorized."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:38
-msgid "Not expecting this response!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:422
-msgid "Not found"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:28
-#: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
-#: ../lib/settingsaction.php:27
-msgid "Not logged in."
-msgstr ""
-
-#: ../lib/subs.php:91
-msgid "Not subscribed!."
-msgstr ""
-
-#: ../actions/opensearch.php:35
-msgid "Notice Search"
-msgstr ""
-
-#: ../actions/showstream.php:82
-#, php-format
-msgid "Notice feed for %s"
-msgstr ""
-
-#: ../actions/shownotice.php:39
-msgid "Notice has no profile"
-msgstr ""
-
-#: ../actions/showstream.php:316
-msgid "Notices"
-msgstr ""
-
-#: ../actions/tag.php:35 ../actions/tag.php:81
-#, php-format
-msgid "Notices tagged with %s"
-msgstr ""
-
-#: ../actions/password.php:39
-msgid "Old password"
-msgstr ""
-
-#: ../lib/settingsaction.php:96 ../lib/util.php:314
-msgid "OpenID"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:61
-msgid "OpenID Account Setup"
-msgstr ""
-
-#: ../lib/openid.php:180
-msgid "OpenID Auto-Submit"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60
-msgid "OpenID Login"
-msgstr ""
-
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-msgid "OpenID URL"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-msgid "OpenID authentication cancelled."
-msgstr ""
-
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr ""
-
-#: ../lib/openid.php:133
-#, php-format
-msgid "OpenID failure: %s"
-msgstr ""
-
-#: ../actions/openidsettings.php:144
-msgid "OpenID removed."
-msgstr ""
-
-#: ../actions/openidsettings.php:37
-msgid "OpenID settings"
-msgstr ""
-
-#: ../actions/invite.php:135
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
-#: ../actions/avatar.php:84
-msgid "Partial upload."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
-#: ../actions/register.php:153 ../lib/settingsaction.php:93
-msgid "Password"
-msgstr ""
-
-#: ../actions/recoverpassword.php:288
-msgid "Password and confirmation do not match."
-msgstr ""
-
-#: ../actions/recoverpassword.php:284
-msgid "Password must be 6 chars or more."
-msgstr ""
-
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-msgid "Password recovery requested"
-msgstr ""
-
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-msgid "Password saved."
-msgstr ""
-
-#: ../actions/password.php:61 ../actions/register.php:88
-msgid "Passwords don't match."
-msgstr ""
-
-#: ../lib/searchaction.php:100
-msgid "People"
-msgstr ""
-
-#: ../actions/opensearch.php:33
-msgid "People Search"
-msgstr ""
-
-#: ../actions/peoplesearch.php:33
-msgid "People search"
-msgstr ""
-
-#: ../lib/stream.php:50
-msgid "Personal"
-msgstr ""
-
-#: ../actions/invite.php:133
-msgid "Personal message"
-msgstr ""
-
-#: ../actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-
-#: ../actions/userauthorization.php:78
-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 \"Cancel\"."
-msgstr ""
-
-#: ../actions/imsettings.php:73
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr ""
-
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94
-msgid "Preferences"
-msgstr ""
-
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163
-msgid "Preferences saved."
-msgstr ""
-
-#: ../actions/profilesettings.php:57
-msgid "Preferred language"
-msgstr ""
-
-#: ../lib/util.php:328
-msgid "Privacy"
-msgstr ""
-
-#: ../classes/Notice.php:95 ../classes/Notice.php:106
-msgid "Problem saving notice."
-msgstr ""
-
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60
-msgid "Profile"
-msgstr ""
-
-#: ../actions/remotesubscribe.php:73
-msgid "Profile URL"
-msgstr ""
-
-#: ../actions/profilesettings.php:34
-msgid "Profile settings"
-msgstr ""
-
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-msgid "Profile unknown"
-msgstr ""
-
-#: ../actions/public.php:54
-msgid "Public Stream Feed"
-msgstr ""
-
-#: ../actions/public.php:33
-msgid "Public timeline"
-msgstr ""
-
-#: ../actions/imsettings.php:79
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
-
-#: ../actions/emailsettings.php:94
-msgid "Publish a MicroID for my email address."
-msgstr ""
-
-#: ../actions/tag.php:75 ../actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
-
-#: ../actions/recoverpassword.php:166
-msgid "Recover"
-msgstr ""
-
-#: ../actions/recoverpassword.php:156
-msgid "Recover password"
-msgstr ""
-
-#: ../actions/recoverpassword.php:67
-msgid "Recovery code for unknown user."
-msgstr ""
-
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
-msgid "Register"
-msgstr ""
-
-#: ../actions/register.php:28
-msgid "Registration not allowed."
-msgstr ""
-
-#: ../actions/register.php:200
-msgid "Registration successful"
-msgstr ""
-
-#: ../actions/userauthorization.php:120
-msgid "Reject"
-msgstr ""
-
-#: ../actions/login.php:103 ../actions/register.php:176
-msgid "Remember me"
-msgstr ""
-
-#: ../actions/updateprofile.php:70
-msgid "Remote profile with no matching profile"
-msgstr ""
-
-#: ../actions/remotesubscribe.php:65
-msgid "Remote subscribe"
-msgstr ""
-
-#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
-#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
-#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
-msgid "Remove"
-msgstr ""
-
-#: ../actions/openidsettings.php:68
-msgid "Remove OpenID"
-msgstr ""
-
-#: ../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 ""
-
-#: ../lib/stream.php:55
-msgid "Replies"
-msgstr ""
-
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
-#, php-format
-msgid "Replies to %s"
-msgstr ""
-
-#: ../actions/recoverpassword.php:183
-msgid "Reset"
-msgstr ""
-
-#: ../actions/recoverpassword.php:173
-msgid "Reset password"
-msgstr ""
-
-#: ../lib/settingsaction.php:99
-msgid "SMS"
-msgstr ""
-
-#: ../actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
-
-#: ../actions/smssettings.php:33
-msgid "SMS Settings"
-msgstr ""
-
-#: ../lib/mail.php:219
-msgid "SMS confirmation"
-msgstr ""
-
-#: ../actions/recoverpassword.php:182
-msgid "Same as password above"
-msgstr ""
-
-#: ../actions/register.php:156
-msgid "Same as password above. Required."
-msgstr ""
-
-#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
-#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
-msgid "Save"
-msgstr ""
-
-#: ../lib/searchaction.php:84 ../lib/util.php:300
-msgid "Search"
-msgstr ""
-
-#: ../actions/noticesearch.php:80
-msgid "Search Stream Feed"
-msgstr ""
-
-#: ../actions/noticesearch.php:30
-#, php-format
-msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
-msgstr ""
-
-#: ../actions/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 ""
-
-#: ../actions/smssettings.php:296
-msgid "Select a carrier"
-msgstr ""
-
-#: ../actions/invite.php:137 ../lib/util.php:1172
-msgid "Send"
-msgstr ""
-
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
-msgstr ""
-
-#: ../actions/emailsettings.php:88
-msgid "Send me notices of new subscriptions through email."
-msgstr ""
-
-#: ../actions/imsettings.php:70
-msgid "Send me notices through Jabber/GTalk."
-msgstr ""
-
-#: ../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
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr ""
-
-#: ../lib/util.php:304
-msgid "Settings"
-msgstr ""
-
-#: ../actions/profilesettings.php:192
-msgid "Settings saved."
-msgstr ""
-
-#: ../actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:66
-msgid "Someone else already has this OpenID."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-msgid "Something weird happened."
-msgstr ""
-
-#: ../scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-
-#: ../lib/util.php:330
-msgid "Source"
-msgstr ""
-
-#: ../actions/showstream.php:296
-msgid "Statistics"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-msgid "Stored OpenID not found."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197
-msgid "Subscribe"
-msgstr ""
-
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-msgid "Subscribers"
-msgstr ""
-
-#: ../actions/userauthorization.php:310
-msgid "Subscription authorized"
-msgstr ""
-
-#: ../actions/userauthorization.php:320
-msgid "Subscription rejected"
-msgstr ""
-
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27
-msgid "Subscriptions"
-msgstr ""
-
-#: ../actions/avatar.php:87
-msgid "System error uploading file."
-msgstr ""
-
-#: ../actions/tag.php:41 ../lib/util.php:301
-msgid "Tags"
-msgstr ""
-
-#: ../lib/searchaction.php:104
-msgid "Text"
-msgstr ""
-
-#: ../actions/noticesearch.php:34
-msgid "Text search"
-msgstr ""
-
-#: ../actions/openidsettings.php:140
-msgid "That OpenID does not belong to you."
-msgstr ""
-
-#: ../actions/confirmaddress.php:52
-msgid "That address has already been confirmed."
-msgstr ""
-
-#: ../actions/confirmaddress.php:43
-msgid "That confirmation code is not for you!"
-msgstr ""
-
-#: ../actions/emailsettings.php:191
-msgid "That email address already belongs to another user."
-msgstr ""
-
-#: ../actions/avatar.php:80
-msgid "That file is too big."
-msgstr ""
-
-#: ../actions/imsettings.php:170
-msgid "That is already your Jabber ID."
-msgstr ""
-
-#: ../actions/emailsettings.php:188
-msgid "That is already your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:188
-msgid "That is already your phone number."
-msgstr ""
-
-#: ../actions/imsettings.php:233
-msgid "That is not your Jabber ID."
-msgstr ""
-
-#: ../actions/emailsettings.php:249
-msgid "That is not your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:257
-msgid "That is not your phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-msgid "That is the wrong IM address."
-msgstr ""
-
-#: ../actions/smssettings.php:233
-msgid "That is the wrong confirmation number."
-msgstr ""
-
-#: ../actions/smssettings.php:191
-msgid "That phone number already belongs to another user."
-msgstr ""
-
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
-msgid "That's too long. Max notice size is 140 chars."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:74
-msgid "That's too long. Max notice size is 255 chars."
-msgstr ""
-
-#: ../actions/confirmaddress.php:92
-#, php-format
-msgid "The address \"%s\" has been confirmed for your account."
-msgstr ""
-
-#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274
-msgid "The address was removed."
-msgstr ""
-
-#: ../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 ""
-
-#: ../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 ""
-
-#: ../actions/subscribers.php:35
-#, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr ""
-
-#: ../actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
-msgstr ""
-
-#: ../actions/subscriptions.php:35
-#, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr ""
-
-#: ../actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr ""
-
-#: ../actions/invite.php:89
-msgid ""
-"These people are already users and you were automatically subscribed to them:"
-msgstr ""
-
-#: ../actions/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
-msgstr ""
-
-#: ../lib/openid.php:195
-msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:56
-#, php-format
-msgid ""
-"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."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-msgid "This method requires a POST or DELETE."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381
-msgid "This method requires a POST."
-msgstr ""
-
-#: ../lib/util.php:164
-msgid "This page is not available in a media type you accept"
-msgstr ""
-
-#: ../actions/profilesettings.php:63
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107
-msgid "Timezone not selected."
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/twitapifriendships.php:163
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
-
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr ""
-
-#: ../actions/remotesubscribe.php:74
-msgid "URL of your profile on another compatible microblogging service"
-msgstr ""
-
-#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
-#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
-msgid "Unexpected form submission."
-msgstr ""
-
-#: ../actions/recoverpassword.php:276
-msgid "Unexpected password reset."
-msgstr ""
-
-#: ../index.php:57
-msgid "Unknown action"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:58
-msgid "Unknown version of OMB protocol."
-msgstr ""
-
-#: ../lib/util.php:269
-msgid ""
-"Unless otherwise specified, contents of this site are copyright by the "
-"contributors and available under the "
-msgstr ""
-
-#: ../actions/confirmaddress.php:48
-#, php-format
-msgid "Unrecognized address type %s"
-msgstr ""
-
-#: ../actions/showstream.php:209
-msgid "Unsubscribe"
-msgstr ""
-
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-msgid "Unsupported OMB version"
-msgstr ""
-
-#: ../actions/avatar.php:105
-msgid "Unsupported image file format."
-msgstr ""
-
-#: ../lib/settingsaction.php:100
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:241
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:341
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
-#: ../actions/avatar.php:68
-msgid "Upload"
-msgstr ""
-
-#: ../actions/avatar.php:27
-msgid ""
-"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 license, also. Use a picture that belongs to you and that you want to "
-"share."
-msgstr ""
-
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr ""
-
-#: ../actions/invite.php:114
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
-msgstr ""
-
-#: ../actions/register.php:159 ../actions/register.php:162
-msgid "Used only for updates, announcements, and password recovery"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:86
-msgid "User being listened to doesn't exist."
-msgstr ""
-
-#: ../actions/all.php:41 ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:47 ../actions/replies.php:41
-#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
-#: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
-#: ../actions/twitapiusers.php:82
-msgid "User has no profile."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:71
-msgid "User nickname"
-msgstr ""
-
-#: ../actions/twitapiusers.php:75
-msgid "User not found."
-msgstr ""
-
-#: ../actions/profilesettings.php:63
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../lib/util.php:1159
-#, php-format
-msgid "What's up, %s?"
-msgstr ""
-
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr ""
-
-#: ../actions/updateprofile.php:128
-#, php-format
-msgid "Wrong image type for '%s'"
-msgstr ""
-
-#: ../actions/updateprofile.php:123
-#, php-format
-msgid "Wrong size image at '%s'"
-msgstr ""
-
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-msgid "Yes"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:64
-msgid "You already have this OpenID!"
-msgstr ""
-
-#: ../actions/deletenotice.php:37
-msgid ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
-msgstr ""
-
-#: ../actions/recoverpassword.php:31
-msgid "You are already logged in!"
-msgstr ""
-
-#: ../actions/invite.php:81
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr ""
-
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
-msgstr ""
-
-#: ../actions/register.php:135
-msgid "You can create a new account to start posting notices."
-msgstr ""
-
-#: ../actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
-#: ../actions/openidsettings.php:86
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr ""
-
-#: ../actions/imsettings.php:28
-#, php-format
-msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
-msgstr ""
-
-#: ../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
-msgid "You can use the local subscription!"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-msgid "You can't register if you don't agree to the license."
-msgstr ""
-
-#: ../actions/updateprofile.php:63
-msgid "You did not send us that profile"
-msgstr ""
-
-#: ../lib/mail.php:147
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
-"Send email to %2$s to post new messages.\n"
-"\n"
-"More email instructions at %3$s.\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:612
-msgid "You may not delete another user's status."
-msgstr ""
-
-#: ../actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr ""
-
-#: ../actions/invite.php:103
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
-
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
-msgstr ""
-
-#: ../actions/openidlogin.php:67
-msgid "Your OpenID URL"
-msgstr ""
-
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
-msgstr ""
-
-#: ../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 ""
-
-#: ../lib/util.php:943
-msgid "a few seconds ago"
-msgstr ""
-
-#: ../lib/util.php:955
-#, php-format
-msgid "about %d days ago"
-msgstr ""
-
-#: ../lib/util.php:951
-#, php-format
-msgid "about %d hours ago"
-msgstr ""
-
-#: ../lib/util.php:947
-#, php-format
-msgid "about %d minutes ago"
-msgstr ""
-
-#: ../lib/util.php:959
-#, php-format
-msgid "about %d months ago"
-msgstr ""
-
-#: ../lib/util.php:953
-msgid "about a day ago"
-msgstr ""
-
-#: ../lib/util.php:945
-msgid "about a minute ago"
-msgstr ""
-
-#: ../lib/util.php:957
-msgid "about a month ago"
-msgstr ""
-
-#: ../lib/util.php:961
-msgid "about a year ago"
-msgstr ""
-
-#: ../lib/util.php:949
-msgid "about an hour ago"
-msgstr ""
-
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-msgid "delete"
-msgstr ""
-
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117
-msgid "in reply to..."
-msgstr ""
-
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124
-msgid "reply"
-msgstr ""
-
-#: ../actions/password.php:44
-msgid "same as password above"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:755
-msgid "unsupported file type"
-msgstr ""
-
-#: ../lib/util.php:1309
-msgid "« After"
-msgstr ""
diff --git a/locale/de_DE/LC_MESSAGES/laconica.mo b/locale/de_DE/LC_MESSAGES/laconica.mo
index 7f533c912..ce6144851 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 a339e0719..8ed32027b 100644
--- a/locale/de_DE/LC_MESSAGES/laconica.po
+++ b/locale/de_DE/LC_MESSAGES/laconica.po
@@ -3,81 +3,49 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-27 14:57-0400\n"
+"POT-Creation-Date: 2008-07-14 21:07+1200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Markus Heurung <muhh@byzero.de>\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.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: ../actions/noticesearchrss.php:64
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "Suche im Stream nach \"%s\""
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
 msgid ""
-" except this private data: password, email address, IM address, phone number."
+" except this private data: password, email address, IM address, phone "
+"number."
 msgstr ""
 "außer folgenden privaten Daten: Passwort, E-Mail, Adresse, IM Adresse, "
 "Telefonnummer."
 
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-msgid " from "
-msgstr ""
-
-#: ../actions/twitapistatuses.php:478
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/invite.php:168
-#, fuzzy, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s hat deine Nachrichten auf %2$s abonniert."
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-
-#: ../lib/mail.php:124
+#: ../actions/subscribe.php:84
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s hat deine Nachrichten auf %2$s abonniert."
 
-#: ../lib/mail.php:126
+#: ../actions/subscribe.php:86
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -94,156 +62,72 @@ msgstr ""
 "Gruß,\n"
 "%4$s.\n"
 
-#: ../actions/twitapistatuses.php:482
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-
 #: ../actions/shownotice.php:45
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s Status auf %2$s"
 
-#: ../actions/invite.php:84 ../actions/invite.php:92
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:60
 #, php-format
 msgid "%s Public Stream"
 msgstr "%s öffentlicher Stream"
 
-#: ../actions/all.php:47 ../actions/allrss.php:60
-#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51
+#: ../actions/all.php:47 ../actions/allrss.php:70 ../lib/stream.php:45
 #, php-format
 msgid "%s and friends"
 msgstr "%s und Freunde"
 
-#: ../actions/twitapistatuses.php:49
-#, fuzzy, php-format
-msgid "%s public timeline"
-msgstr "Öffentliche Zeitleiste"
-
-#: ../lib/mail.php:206
-#, fuzzy, php-format
-msgid "%s status"
-msgstr "%1$s Status auf %2$s"
-
-#: ../actions/twitapistatuses.php:338
-#, fuzzy, php-format
-msgid "%s timeline"
-msgstr "Öffentliche Zeitleiste"
-
-#: ../actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:213
-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:233
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** is a microblogging service brought to you by "
+"[%%site.broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
-"**%%site.name%%** ist ein Microbloggingdienst von [%%site.broughtby%%](%%"
-"site.broughtbyurl%%)."
+"**%%site.name%%** ist ein Microbloggingdienst von "
+"[%%site.broughtby%%](%%site.broughtbyurl%%)."
 
-#: ../lib/util.php:259
+#: ../lib/util.php:235
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** ist ein Microbloggingdienst."
 
-#: ../lib/util.php:274
+#: ../lib/util.php:250
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ""
 "Lizenz. Die ursprünglichen Autoren sollten mit ihrem vollen Namen oder "
 "Nutzernamen genannt werden."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
+#: ../actions/register.php:176
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 Kleinbuchstaben oder Ziffern, keine Sonder- oder Leerzeichen"
 
-#: ../actions/register.php:152
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64 Kleinbuchstaben oder Ziffern, keine Sonder- oder Leerzeichen"
-
-#: ../actions/password.php:42
+#: ../actions/password.php:42 ../actions/register.php:178
 msgid "6 or more characters"
 msgstr "6 oder mehr Zeichen"
 
-#: ../actions/recoverpassword.php:180
+#: ../actions/recoverpassword.php:165
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 oder mehr Zeichen, und nicht vergessen!"
 
-#: ../actions/register.php:154
-#, fuzzy
-msgid "6 or more characters. Required."
-msgstr "6 oder mehr Zeichen"
-
-#: ../actions/imsettings.php:197
+#: ../actions/imsettings.php:188
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
-msgstr ""
-"Ein Bestätigungscode wurde an die IM Adresse geschickt, die du hinzugefügt "
-"hast. Du musst zulassen, dass %s dir Nachrichten schicken darf."
-
-#: ../actions/emailsettings.php:213
-#, fuzzy
-msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
-msgstr ""
-"Ein Bestätigungscode wurde an die IM Adresse geschickt, die du hinzugefügt "
-"hast. Du musst zulassen, dass %s dir Nachrichten schicken darf."
-
-#: ../actions/smssettings.php:216
-#, fuzzy
-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."
+"A confirmation code was sent to the IM address you added. You must approve "
+"%s for sending messages to you."
 msgstr ""
 "Ein Bestätigungscode wurde an die IM Adresse geschickt, die du hinzugefügt "
 "hast. Du musst zulassen, dass %s dir Nachrichten schicken darf."
 
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122
-msgid "API method not found!"
-msgstr ""
-
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-msgid "API method under construction."
-msgstr ""
-
-#: ../lib/util.php:324
+#: ../lib/util.php:296
 msgid "About"
 msgstr "Ãœber"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/userauthorization.php:118
 msgid "Accept"
 msgstr "Akzeptieren"
 
-#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
-#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
 msgid "Add"
 msgstr "Hinzufügen"
 
@@ -251,25 +135,15 @@ msgstr "Hinzufügen"
 msgid "Add OpenID"
 msgstr "OpenID hinzufügen"
 
-#: ../lib/settingsaction.php:97
-#, fuzzy
-msgid "Add or remove OpenIDs"
-msgstr "Entferne OpenID"
-
-#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39
+#: ../actions/imsettings.php:39
 msgid "Address"
 msgstr "Adresse"
 
-#: ../actions/invite.php:131
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../actions/showstream.php:273
+#: ../actions/showstream.php:254
 msgid "All subscriptions"
 msgstr "Alle Abonnements"
 
-#: ../actions/publicrss.php:64
+#: ../actions/publicrss.php:62
 #, php-format
 msgid "All updates for %s"
 msgstr "Alle Aktualisierungen für %s"
@@ -279,33 +153,24 @@ msgstr "Alle Aktualisierungen für %s"
 msgid "All updates matching search term \"%s\""
 msgstr "Alle Aktualisierungen, die den Suchbegriff \"%s\" enthalten"
 
-#: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
-#: ../actions/openidlogin.php:29 ../actions/register.php:30
+#: ../actions/finishopenidlogin.php:29 ../actions/login.php:27
+#: ../actions/openidlogin.php:29 ../actions/register.php:28
 msgid "Already logged in."
 msgstr "Bereits eingeloggt."
 
-#: ../lib/subs.php:42
+#: ../actions/subscribe.php:48
 msgid "Already subscribed!."
 msgstr "Bereits abonniert!"
 
-#: ../actions/deletenotice.php:54
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/userauthorization.php:77
+#: ../actions/userauthorization.php:76
 msgid "Authorize subscription"
 msgstr "Abonnement bestätigen"
 
-#: ../actions/login.php:104 ../actions/register.php:178
+#: ../actions/login.php:100 ../actions/register.php:184
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Automatisch einloggen; Nicht bei gemeinsam genutzten PCs!"
 
-#: ../actions/profilesettings.php:65
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr ""
-
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: ../actions/avatar.php:32
 msgid "Avatar"
 msgstr "Avatar"
 
@@ -323,49 +188,28 @@ msgstr ""
 "sollte in deinem Jabber/GTalk Konto eingehen. (Hast du %s zu deiner "
 "Freundeliste hinzugefügt?)"
 
-#: ../actions/emailsettings.php:54
-#, fuzzy
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-msgstr ""
-"Warte auf Bestätigung dieser Adresse. Eine Nachricht mit weiteren Anweisung "
-"sollte in deinem Jabber/GTalk Konto eingehen. (Hast du %s zu deiner "
-"Freundeliste hinzugefügt?)"
-
-#: ../actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
-
-#: ../lib/util.php:1318
+#: ../lib/util.php:1136
 msgid "Before »"
 msgstr "Früher »"
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: ../actions/profilesettings.php:52
 msgid "Bio"
 msgstr "Biografie"
 
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103
+#: ../actions/profilesettings.php:93 ../actions/updateprofile.php:102
 msgid "Bio is too long (max 140 chars)."
 msgstr "Die Biografie ist zu lang (max. 140 Zeichen)"
 
-#: ../lib/deleteaction.php:41
-#, fuzzy
-msgid "Can't delete this notice."
-msgstr "Konnte E-Mailbestätigung nicht löschen."
-
-#: ../actions/updateprofile.php:119
+#: ../actions/updateprofile.php:118
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Konnte Avatar-URL nicht öffnen '%s'"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
+#: ../actions/password.php:85 ../actions/recoverpassword.php:261
 msgid "Can't save new password."
 msgstr "Konnte neues Passwort nicht speichern"
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62
+#: ../actions/imsettings.php:59
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -373,79 +217,35 @@ msgstr "Abbrechen"
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Konnte kein OpenID consumer Objekt erzeugen."
 
-#: ../actions/imsettings.php:163
+#: ../actions/imsettings.php:154
 msgid "Cannot normalize that Jabber ID"
 msgstr "Konnte diese Jabber ID nicht normalisieren"
 
-#: ../actions/emailsettings.php:181
-#, fuzzy
-msgid "Cannot normalize that email address"
-msgstr "Konnte diese Jabber ID nicht normalisieren"
-
 #: ../actions/password.php:45
 msgid "Change"
 msgstr "Ändern"
 
-#: ../lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
 #: ../actions/password.php:32
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: ../lib/settingsaction.php:94
-#, fuzzy
-msgid "Change your password"
-msgstr "Passwort ändern"
-
-#: ../lib/settingsaction.php:85
-#, fuzzy
-msgid "Change your profile settings"
-msgstr "Profil Einstellungen"
-
-#: ../actions/password.php:43 ../actions/recoverpassword.php:181
-#: ../actions/register.php:155 ../actions/smssettings.php:65
+#: ../actions/password.php:43 ../actions/recoverpassword.php:166
+#: ../actions/register.php:179
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#: ../actions/confirmaddress.php:90
+#: ../actions/confirmaddress.php:84
 msgid "Confirm Address"
 msgstr "Adresse bestätigen"
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245
+#: ../actions/imsettings.php:213
 msgid "Confirmation cancelled."
 msgstr "Bestätigung abgebrochen."
 
-#: ../actions/smssettings.php:63
-#, fuzzy
-msgid "Confirmation code"
-msgstr "Kein Bestätigungs-Code."
-
 #: ../actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr "Bestätigungscode nicht gefunden."
 
-#: ../actions/register.php:202
-#, php-format
-msgid ""
-"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."
-msgstr ""
-
 #: ../actions/finishopenidlogin.php:91
 msgid "Connect"
 msgstr "Verbinden"
@@ -454,7 +254,7 @@ msgstr "Verbinden"
 msgid "Connect existing account"
 msgstr "Verbinde bestehendes Konto"
 
-#: ../lib/util.php:332
+#: ../lib/util.php:304
 msgid "Contact"
 msgstr "Kontakt"
 
@@ -463,66 +263,44 @@ msgstr "Kontakt"
 msgid "Could not create OpenID form: %s"
 msgstr "Konnte OpenID-Formular nicht erstellen: %s"
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr ""
-
 #: ../lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Konnte nicht zum Server umleiten: %s"
 
-#: ../actions/updateprofile.php:162
+#: ../actions/updateprofile.php:161
 msgid "Could not save avatar info"
 msgstr "Konnte Avatarinfo nicht speichern"
 
-#: ../actions/updateprofile.php:155
+#: ../actions/updateprofile.php:154
 msgid "Could not save new profile info"
 msgstr "Neue Profildaten konnten nicht gespeichert werden."
 
-#: ../lib/subs.php:54
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../lib/subs.php:46
-#, fuzzy
-msgid "Could not subscribe."
-msgstr "Nicht abonniert!"
-
-#: ../actions/recoverpassword.php:102
-#, fuzzy
-msgid "Could not update user with confirmed email address."
-msgstr "Konnte keinen Bestätigungscode einfügen."
+#: ../actions/profilesettings.php:146
+msgid "Couldn't confirm email."
+msgstr "E-Mail konnte nicht bestätigt werden."
 
 #: ../actions/finishremotesubscribe.php:99
 msgid "Couldn't convert request tokens to access tokens."
 msgstr "Konnte Anfrage-Token nicht in Zugriffs-Token umwandeln."
 
-#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
-#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#: ../actions/subscribe.php:59
+msgid "Couldn't create subscription."
+msgstr "Konnte Abonnement nicht erstellen."
+
+#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
 msgid "Couldn't delete email confirmation."
 msgstr "Konnte E-Mailbestätigung nicht löschen."
 
-#: ../lib/subs.php:103
+#: ../actions/unsubscribe.php:56
 msgid "Couldn't delete subscription."
 msgstr "Konnte Abonnement nicht löschen."
 
-#: ../actions/twitapistatuses.php:93
-#, fuzzy
-msgid "Couldn't find any statuses."
-msgstr "Konnte Benutzerdaten nicht aktualisieren."
-
-#: ../actions/remotesubscribe.php:127
+#: ../actions/remotesubscribe.php:125
 msgid "Couldn't get a request token."
 msgstr "Konnte keinen Anfrage-Token bekommen."
 
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206
+#: ../actions/imsettings.php:178
 msgid "Couldn't insert confirmation code."
 msgstr "Konnte keinen Bestätigungscode einfügen."
 
@@ -530,24 +308,12 @@ msgstr "Konnte keinen Bestätigungscode einfügen."
 msgid "Couldn't insert new subscription."
 msgstr "Konnte neues Abonnement nicht eintragen."
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: ../actions/profilesettings.php:175
 msgid "Couldn't save profile."
 msgstr "Konnte Profil nicht speichern."
 
-#: ../actions/profilesettings.php:161
-#, fuzzy
-msgid "Couldn't update user for autosubscribe."
-msgstr "Konnte Benutzerdaten nicht aktualisieren."
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#, fuzzy
-msgid "Couldn't update user record."
-msgstr "Konnte Benutzerdaten nicht aktualisieren."
-
-#: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
-#: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
-#: ../actions/imsettings.php:243 ../actions/profilesettings.php:141
-#: ../actions/smssettings.php:157 ../actions/smssettings.php:269
+#: ../actions/confirmaddress.php:70 ../actions/imsettings.php:129
+#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
 msgid "Couldn't update user."
 msgstr "Konnte Benutzerdaten nicht aktualisieren."
 
@@ -571,83 +337,44 @@ msgstr "Erzeugen eines Kontos zu einer OpenID, die schon einem Nutzer gehört."
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Aktuelle bestätigte Jabber/GTalk-Adresse"
 
-#: ../actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:44
-#, fuzzy
-msgid "Current confirmed email address."
-msgstr "Aktuelle bestätigte Jabber/GTalk-Adresse"
-
-#: ../actions/showstream.php:356
+#: ../actions/showstream.php:337
 msgid "Currently"
 msgstr "Momentan"
 
-#: ../classes/Notice.php:72
-#, fuzzy, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "Datenbankfehler beim Einfügen der Antwort: %s"
-
-#: ../lib/util.php:1061
+#: ../lib/util.php:893
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Datenbankfehler beim Einfügen der Antwort: %s"
 
-#: ../actions/deletenotice.php:41
-#, fuzzy
-msgid "Delete notice"
-msgstr "Neue Nachricht"
-
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: ../actions/profilesettings.php:54
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Beschreibe dich selbst in 140 Zeichen"
 
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87
+#: ../actions/register.php:181
 msgid "Email"
 msgstr "E-Mail"
 
-#: ../actions/emailsettings.php:59
-#, fuzzy
-msgid "Email Address"
+#: ../actions/profilesettings.php:46
+msgid "Email address"
 msgstr "E-Mail Adresse "
 
-#: ../actions/emailsettings.php:32
-#, fuzzy
-msgid "Email Settings"
-msgstr "Einstellungen"
-
-#: ../actions/register.php:73
+#: ../actions/profilesettings.php:102 ../actions/register.php:63
 msgid "Email address already exists."
 msgstr "Diese E-Mail Adresse existiert bereits."
 
-#: ../lib/mail.php:90
+#: ../lib/mail.php:82
 msgid "Email address confirmation"
 msgstr "Bestätigung der E-Mail Adresse"
 
-#: ../actions/emailsettings.php:61
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/invite.php:129
-#, fuzzy
-msgid "Email addresses"
-msgstr "E-Mail Adresse "
-
-#: ../actions/recoverpassword.php:191
+#: ../actions/recoverpassword.php:176
 msgid "Enter a nickname or email address."
 msgstr "Gib einen Spitznamen oder eine E-Mail Adresse ein."
 
-#: ../actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/userauthorization.php:137
+#: ../actions/userauthorization.php:136
 msgid "Error authorizing token"
 msgstr "Fehler beim Autorisieren des Tokens"
 
-#: ../actions/finishopenidlogin.php:253
+#: ../actions/finishopenidlogin.php:282
 msgid "Error connecting user to OpenID."
 msgstr "Fehler beim Verbinden des Nutzers mit der OpenID."
 
@@ -663,19 +390,23 @@ msgstr "Fehler beim Einfügen des Avatars"
 msgid "Error inserting new profile"
 msgstr "Neues Profil konnte nicht angelegt werden"
 
+#: ../actions/postnotice.php:88
+msgid "Error inserting notice"
+msgstr "Fehler beim Einfügen der Nachricht"
+
 #: ../actions/finishremotesubscribe.php:167
 msgid "Error inserting remote profile"
 msgstr "Fehler beim Einfügen des entfernten Profils"
 
-#: ../actions/recoverpassword.php:240
+#: ../actions/recoverpassword.php:201
 msgid "Error saving address confirmation."
 msgstr "Fehler beim Speichern der Adressbestätigung."
 
-#: ../actions/userauthorization.php:140
+#: ../actions/userauthorization.php:139
 msgid "Error saving remote profile"
 msgstr "Fehler beim Speichern des entfernten Profils"
 
-#: ../lib/openid.php:226
+#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
 msgid "Error saving the profile."
 msgstr "Fehler bei Speichern des Profils."
 
@@ -687,8 +418,8 @@ msgstr "Fehler beim Speichern des Nutzers."
 msgid "Error saving user; invalid."
 msgstr "Fehler beim Speichern des Nutzers, ungültig."
 
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
+#: ../actions/login.php:43 ../actions/login.php:69
+#: ../actions/recoverpassword.php:268 ../actions/register.php:73
 msgid "Error setting user."
 msgstr "Fehler bei den Nutzereinstellungen."
 
@@ -700,7 +431,7 @@ msgstr "Fehler beim Update des Profils"
 msgid "Error updating remote profile"
 msgstr "Fehler beim Update des entfernten Profils"
 
-#: ../actions/recoverpassword.php:80
+#: ../actions/recoverpassword.php:79
 msgid "Error with confirmation code."
 msgstr "Fehler beim Bestätigungscode."
 
@@ -708,7 +439,7 @@ msgstr "Fehler beim Bestätigungscode."
 msgid "Existing nickname"
 msgstr "Nick wird bereits verwendet"
 
-#: ../lib/util.php:326
+#: ../lib/util.php:298
 msgid "FAQ"
 msgstr "FAQ"
 
@@ -716,30 +447,17 @@ msgstr "FAQ"
 msgid "Failed updating avatar."
 msgstr "Aktualisierung des Avatars fehlgeschlagen"
 
-#: ../actions/all.php:61 ../actions/allrss.php:64
+#: ../actions/all.php:61 ../actions/allrss.php:74
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Feed der Freunde von %s"
 
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: ../actions/replies.php:61 ../actions/repliesrss.php:80
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Feed der Antworten an %s"
 
-#: ../actions/tag.php:55
-#, fuzzy, php-format
-msgid "Feed for tag %s"
-msgstr "Feed der Antworten an %s"
-
-#: ../lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/login.php:122
+#: ../actions/login.php:118
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -747,40 +465,31 @@ msgstr ""
 "Bitte geben Sie aus Sicherheitsgründen ihren Benutzernamen und ihr Passwort "
 "ein, bevor die Änderungen an ihren Einstellungen vorgenommen werden."
 
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: ../actions/profilesettings.php:44
 msgid "Full name"
 msgstr "Vollständiger Name"
 
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93
+#: ../actions/profilesettings.php:90 ../actions/updateprofile.php:92
 msgid "Full name is too long (max 255 chars)."
 msgstr "Ihr vollständiger Name ist zu lang (maximal 255 Zeichen)"
 
-#: ../lib/util.php:322
+#: ../lib/util.php:279
 msgid "Help"
 msgstr "Hilfe"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:274
 msgid "Home"
 msgstr "Startseite"
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: ../actions/profilesettings.php:49
 msgid "Homepage"
 msgstr "Homepage"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: ../actions/profilesettings.php:87
 msgid "Homepage is not a valid URL."
 msgstr "Homepage ist kein gültiger URL."
 
-#: ../actions/emailsettings.php:91
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102
-msgid "IM"
-msgstr ""
-
-#: ../actions/imsettings.php:60
+#: ../actions/imsettings.php:61
 msgid "IM Address"
 msgstr "IM Adresse"
 
@@ -804,33 +513,23 @@ msgstr ""
 "Wenn du deinem Konto eine OpenID hinzufügen möchtest, dann trage sie hier "
 "ein und klicke auf \"Hinzufügen\"."
 
-#: ../actions/recoverpassword.php:137
-#, fuzzy
+#: ../actions/recoverpassword.php:122
 msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
+"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 ""
-"Wenn du deine Passwort verlegt hast, kannst du dir ein Neues an die E-"
-"Mailadresse schicken lasssen, die für dein Konto eingetragen ist."
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283
-#, fuzzy
-msgid "Incoming email address removed."
-msgstr "Die Adresse wurde entfernt."
+"Wenn du deine Passwort verlegt hast, kannst du dir ein Neues an die "
+"E-Mailadresse schicken lasssen, die für dein Konto eingetragen ist."
 
 #: ../actions/password.php:69
 msgid "Incorrect old password"
 msgstr "Altes Passwort falsch"
 
-#: ../actions/login.php:67
+#: ../actions/login.php:63
 msgid "Incorrect username or password."
 msgstr "Falscher Benutzername oder Passwort."
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:226
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -838,22 +537,17 @@ msgstr ""
 "Anweisungen für die Wiederherstellung deines Passworts wurden an deine "
 "hinterlegte E-Mailadresse geschickt."
 
-#: ../actions/updateprofile.php:114
+#: ../actions/updateprofile.php:113
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "Ungültiger Avatar-URL '%s'"
 
-#: ../actions/invite.php:55
-#, fuzzy, php-format
-msgid "Invalid email address: %s"
-msgstr "Ungültige E-Mail-Adresse."
-
-#: ../actions/updateprofile.php:98
+#: ../actions/updateprofile.php:97
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Ungültige Homepage '%s'"
 
-#: ../actions/updateprofile.php:82
+#: ../actions/updateprofile.php:81
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "Ungültige Lizenz-URL '%s'"
@@ -870,7 +564,7 @@ msgstr "Ungülte Nachrichten-URI"
 msgid "Invalid notice url"
 msgstr "Ungültige Nachrichten-URL"
 
-#: ../actions/updateprofile.php:87
+#: ../actions/updateprofile.php:86
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "Ungültige Profil-URL '%s'."
@@ -887,43 +581,28 @@ msgstr "Server antwortete mit ungültiger Profil-URL."
 msgid "Invalid size."
 msgstr "Ungültige Größe."
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111
+#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
+#: ../actions/register.php:84
 msgid "Invalid username or password."
 msgstr "Benutzername oder Passwort falsch."
 
-#: ../actions/invite.php:79
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123
-msgid "Invite new users"
-msgstr ""
-
-#: ../lib/util.php:261
+#: ../lib/util.php:237
 #, 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)."
+"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 ""
 " Es wird mit der Microbloggingsoftware [Laconica](http://laconi.ca/) "
-"(Version %s) betrieben, die unter der [GNU Affero General Public License]"
-"(http://www.fsf.org/licensing/licenses/agpl-3.0.html) erhältlich ist."
+"(Version %s) betrieben, die unter der [GNU Affero General Public "
+"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html) erhältlich "
+"ist."
 
-#: ../actions/imsettings.php:173
+#: ../actions/imsettings.php:164
 msgid "Jabber ID already belongs to another user."
 msgstr "Diese Jabber ID wird bereits von einem anderen Benutzer verwendet."
 
-#: ../actions/imsettings.php:62
+#: ../actions/imsettings.php:63
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -933,26 +612,16 @@ msgstr ""
 "versichere dich zuerst, dass du %s in deine Kontaktliste in deinem IM "
 "Programm oder GTalk aufgenommen hast."
 
-#: ../actions/profilesettings.php:57
-msgid "Language"
-msgstr ""
-
-#: ../actions/profilesettings.php:113
-#, fuzzy
-msgid "Language is too long (max 50 chars)."
-msgstr "Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
-
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: ../actions/profilesettings.php:55
 msgid "Location"
 msgstr "Aufenthaltsort"
 
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108
+#: ../actions/profilesettings.php:96 ../actions/updateprofile.php:107
 msgid "Location is too long (max 255 chars)."
 msgstr "Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310
+#: ../actions/login.php:93 ../actions/login.php:102
+#: ../actions/openidlogin.php:68 ../lib/util.php:286
 msgid "Login"
 msgstr "Einloggen"
 
@@ -961,39 +630,26 @@ msgstr "Einloggen"
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Mit [OpenID](%%doc.openid%%) Konto einloggen"
 
-#: ../actions/login.php:126
+#: ../actions/login.php:122
 #, 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%"
-"%). "
+"Login with your username and password. Don't have a username yet? "
+"[Register](%%action.register%%) a new account, or try "
+"[OpenID](%%action.openidlogin%%). "
 msgstr ""
 "Melde dich mit Nutzernamen und Passwort an. Du hast noch keinen Nutzernamen? "
 "[Registriere](%%action.register%%) ein neues Konto oder versuche es mit "
 "[OpenID](%%action.openidlogin%%)."
 
-#: ../lib/util.php:308
+#: ../lib/util.php:284
 msgid "Logout"
 msgstr "Abmelden"
 
-#: ../actions/register.php:166
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
-
-#: ../actions/login.php:110
+#: ../actions/login.php:106
 msgid "Lost or forgotten password?"
 msgstr "Passwort vergessen?"
 
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr ""
-
-#: ../actions/showstream.php:300
+#: ../actions/showstream.php:281
 msgid "Member since"
 msgstr "Mitglied seit"
 
@@ -1002,59 +658,38 @@ msgstr "Mitglied seit"
 msgid "Microblog by %s"
 msgstr "Microblog von %s"
 
-#: ../actions/smssettings.php:304
-#, php-format
-msgid ""
-"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
-"email but isn't listed here, send email to let us know at %s."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
 msgid "My text and files are available under "
 msgstr "Meine Texte und Daten sind verfügbar unter"
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-msgid "New"
-msgstr ""
-
-#: ../lib/mail.php:144
-#, fuzzy, php-format
-msgid "New email address for posting to %s"
-msgstr "Der Nutzer hat keine registrierte E-Mailadresse."
-
-#: ../actions/emailsettings.php:297
-#, fuzzy
-msgid "New incoming email address added."
-msgstr "Ungültige E-Mail-Adresse."
-
 #: ../actions/finishopenidlogin.php:71
 msgid "New nickname"
 msgstr "Neuer Nutzername"
 
-#: ../actions/newnotice.php:87
+#: ../actions/newnotice.php:100
 msgid "New notice"
 msgstr "Neue Nachricht"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
+#: ../actions/password.php:41 ../actions/recoverpassword.php:164
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:275
 msgid "New password successfully saved. You are now logged in."
 msgstr "Neues Passwort erfolgreich gespeichert. Du bist jetzt eingeloggt."
 
-#: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151
+#: ../actions/login.php:97 ../actions/profilesettings.php:41
+#: ../actions/register.php:175
 msgid "Nickname"
 msgstr "Nutzername"
 
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69
+#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:99
+#: ../actions/register.php:59
 msgid "Nickname already in use. Try another one."
 msgstr "Nutzername wird bereits verwendet. Suche dir einen anderen aus."
 
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:67 ../actions/updateprofile.php:77
+#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:80
+#: ../actions/register.php:57 ../actions/updateprofile.php:76
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "Der Nutzername darf nur aus Kleinbuchstaben und Ziffern bestehen. "
@@ -1068,53 +703,30 @@ msgstr "Nutzername nicht erlaubt."
 msgid "Nickname of the user you want to follow"
 msgstr "Nutzername des Nutzers, dem du folgen möchtest"
 
-#: ../actions/recoverpassword.php:162
+#: ../actions/recoverpassword.php:147
 msgid "Nickname or email"
 msgstr "Nutzername oder E-Mail"
 
-#: ../actions/deletenotice.php:59
-msgid "No"
-msgstr ""
-
-#: ../actions/imsettings.php:156
+#: ../actions/imsettings.php:147
 msgid "No Jabber ID."
 msgstr "Keine Jabber-ID"
 
-#: ../actions/userauthorization.php:129
+#: ../actions/userauthorization.php:128
 msgid "No authorization request!"
 msgstr "Keine Bestätigungsanfrage!"
 
-#: ../actions/smssettings.php:181
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316
-#, fuzzy
-msgid "No code entered"
-msgstr "Kein Inhalt!"
-
 #: ../actions/confirmaddress.php:33
 msgid "No confirmation code."
 msgstr "Kein Bestätigungs-Code."
 
-#: ../actions/newnotice.php:44
+#: ../actions/newnotice.php:49
 msgid "No content!"
 msgstr "Kein Inhalt!"
 
-#: ../actions/emailsettings.php:174
-#, fuzzy
-msgid "No email address."
-msgstr "E-Mail Adresse "
-
-#: ../actions/userbyid.php:32
+#: ../actions/userbyid.php:27
 msgid "No id."
 msgstr "Keine ID."
 
-#: ../actions/emailsettings.php:271
-#, fuzzy
-msgid "No incoming email address."
-msgstr "Ungültige E-Mail-Adresse."
-
 #: ../actions/finishremotesubscribe.php:65
 msgid "No nickname provided by remote server."
 msgstr "Der entferne Server hat keinen Nutzernamen geliefert."
@@ -1123,25 +735,19 @@ msgstr "Der entferne Server hat keinen Nutzernamen geliefert."
 msgid "No nickname."
 msgstr "Kein Nutzername."
 
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229
+#: ../actions/imsettings.php:197
 msgid "No pending confirmation to cancel."
 msgstr "Keine ausstehende Bestätigung, die abgebrochen werden kann."
 
-#: ../actions/smssettings.php:176
-#, fuzzy
-msgid "No phone number."
-msgstr "Unbekannter Benutzer."
-
 #: ../actions/finishremotesubscribe.php:72
 msgid "No profile URL returned by server."
 msgstr "Der entfernte Server hat keine Profil-URL geliefert."
 
-#: ../actions/recoverpassword.php:226
+#: ../actions/recoverpassword.php:189
 msgid "No registered email address for that user."
 msgstr "Der Nutzer hat keine registrierte E-Mailadresse."
 
-#: ../actions/userauthorization.php:49
+#: ../actions/userauthorization.php:48
 msgid "No request found!"
 msgstr "Keine Anfrage gefunden!"
 
@@ -1153,14 +759,6 @@ msgstr "Keine Ergebnisse"
 msgid "No size."
 msgstr "Keine Größe."
 
-#: ../actions/twitapistatuses.php:595
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555
-msgid "No status with that ID found."
-msgstr ""
-
 #: ../actions/openidsettings.php:135
 msgid "No such OpenID."
 msgstr "Diese OpenID ist nicht bekannt."
@@ -1169,8 +767,7 @@ msgstr "Diese OpenID ist nicht bekannt."
 msgid "No such document."
 msgstr "Unbekanntes Dokument."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30
+#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
 msgid "No such notice."
 msgstr "Unbekannte Nachricht."
 
@@ -1183,21 +780,16 @@ msgid "No such subscription"
 msgstr "Unbekanntes Abonnement"
 
 #: ../actions/all.php:34 ../actions/allrss.php:35
-#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
-#: ../actions/remotesubscribe.php:84 ../actions/remotesubscribe.php:91
-#: ../actions/replies.php:57 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:110 ../actions/userbyid.php:36
-#: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
-#: ../lib/subs.php:33 ../lib/subs.php:82
+#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:36
+#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
+#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
+#: ../actions/showstream.php:95 ../actions/subscribe.php:43
+#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
+#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
 msgid "No such user."
 msgstr "Unbekannter Benutzer."
 
-#: ../actions/recoverpassword.php:211
-#, fuzzy
-msgid "No user with that email address or username."
-msgstr "Der Nutzer hat keine registrierte E-Mailadresse."
-
-#: ../lib/gallery.php:80
+#: ../lib/gallery.php:76
 msgid "Nobody to show!"
 msgstr "Niemand anzuzeigen!"
 
@@ -1205,18 +797,7 @@ msgstr "Niemand anzuzeigen!"
 msgid "Not a recovery code."
 msgstr "Kein Wiederherstellungscode."
 
-#: ../scripts/maildaemon.php:50
-#, fuzzy
-msgid "Not a registered user."
-msgstr "Kein Wiederherstellungscode."
-
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332
-#, fuzzy
-msgid "Not a supported data format."
-msgstr "Bildformat wird nicht unterstützt."
-
-#: ../actions/imsettings.php:167
+#: ../actions/imsettings.php:158
 msgid "Not a valid Jabber ID"
 msgstr "Ungültige Jabber-ID"
 
@@ -1224,24 +805,19 @@ msgstr "Ungültige Jabber-ID"
 msgid "Not a valid OpenID."
 msgstr "Ungültige OpenID."
 
-#: ../actions/emailsettings.php:185
-#, fuzzy
-msgid "Not a valid email address"
-msgstr "Ungültige E-Mail-Adresse."
-
-#: ../actions/register.php:63
+#: ../actions/profilesettings.php:75 ../actions/register.php:53
 msgid "Not a valid email address."
 msgstr "Ungültige E-Mail-Adresse."
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
+#: ../actions/profilesettings.php:83 ../actions/register.php:61
 msgid "Not a valid nickname."
 msgstr "Ungültiger Nutzername."
 
-#: ../actions/remotesubscribe.php:120
+#: ../actions/remotesubscribe.php:118
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "Ungültige Profil-URL (falsche Dienste)."
 
-#: ../actions/remotesubscribe.php:113
+#: ../actions/remotesubscribe.php:111
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "Ungültige Profil-URL (XRDS nicht definiert)."
 
@@ -1261,27 +837,16 @@ msgstr "Nicht autorisiert."
 msgid "Not expecting this response!"
 msgstr "Unerwartete Antwort!"
 
-#: ../actions/twitapistatuses.php:422
-#, fuzzy
-msgid "Not found"
-msgstr "Keine Anfrage gefunden!"
-
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:28
-#: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
-#: ../lib/settingsaction.php:27
+#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
+#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
+#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
 msgid "Not logged in."
 msgstr "Nicht eingeloggt."
 
-#: ../lib/subs.php:91
+#: ../actions/unsubscribe.php:43
 msgid "Not subscribed!."
 msgstr "Nicht abonniert!"
 
-#: ../actions/opensearch.php:35
-#, fuzzy
-msgid "Notice Search"
-msgstr "Suchen"
-
 #: ../actions/showstream.php:82
 #, php-format
 msgid "Notice feed for %s"
@@ -1291,20 +856,15 @@ msgstr "Feed der Nachrichten von %s"
 msgid "Notice has no profile"
 msgstr "Nachricht hat kein Profil"
 
-#: ../actions/showstream.php:316
+#: ../actions/showstream.php:297
 msgid "Notices"
 msgstr "Nachrichten"
 
-#: ../actions/tag.php:35 ../actions/tag.php:81
-#, fuzzy, php-format
-msgid "Notices tagged with %s"
-msgstr "Feed der Nachrichten von %s"
-
 #: ../actions/password.php:39
 msgid "Old password"
 msgstr "Altes Passwort"
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314
+#: ../lib/util.php:288
 msgid "OpenID"
 msgstr "OpenID"
 
@@ -1347,68 +907,44 @@ msgstr "OpenID entfernt."
 msgid "OpenID settings"
 msgstr "OpenID-Einstellungen"
 
-#: ../actions/invite.php:135
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
 #: ../actions/avatar.php:84
 msgid "Partial upload."
 msgstr "Unvollständiger Upload"
 
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
-#: ../actions/register.php:153 ../lib/settingsaction.php:93
+#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
+#: ../actions/register.php:177
 msgid "Password"
 msgstr "Passwort"
 
-#: ../actions/recoverpassword.php:288
+#: ../actions/recoverpassword.php:249
 msgid "Password and confirmation do not match."
 msgstr "Passwort und seine Bestätigung stimmen nicht überein."
 
-#: ../actions/recoverpassword.php:284
+#: ../actions/recoverpassword.php:245
 msgid "Password must be 6 chars or more."
 msgstr "Passwort muss mehr als 6 Zeichen enthalten"
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
 msgid "Password recovery requested"
 msgstr "Wiederherstellung des Passworts angefordert"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: ../actions/password.php:89 ../actions/recoverpassword.php:274
 msgid "Password saved."
 msgstr "Passwort gespeichert."
 
-#: ../actions/password.php:61 ../actions/register.php:88
+#: ../actions/password.php:61 ../actions/register.php:65
 msgid "Passwords don't match."
 msgstr "Passwörter stimmen nicht überein."
 
-#: ../lib/searchaction.php:100
-#, fuzzy
-msgid "People"
-msgstr "Suche nach anderen Nutzern"
-
-#: ../actions/opensearch.php:33
-#, fuzzy
-msgid "People Search"
-msgstr "Suche nach anderen Nutzern"
-
 #: ../actions/peoplesearch.php:33
 msgid "People search"
 msgstr "Suche nach anderen Nutzern"
 
-#: ../lib/stream.php:50
+#: ../lib/stream.php:44
 msgid "Personal"
 msgstr "Eigene"
 
-#: ../actions/invite.php:133
-#, fuzzy
-msgid "Personal message"
-msgstr "Eigene"
-
-#: ../actions/smssettings.php:69
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "1-64 Kleinbuchstaben oder Ziffern, keine Sonder- oder Leerzeichen"
-
-#: ../actions/userauthorization.php:78
+#: ../actions/userauthorization.php:77
 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, "
@@ -1418,34 +954,27 @@ msgstr ""
 "dieses Nutzers abonnieren möchtest. Wenn du das nicht wolltest, klicke auf "
 "\"Abbrechen\"."
 
-#: ../actions/imsettings.php:73
+#: ../actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Schicke eine Nachricht, wenn sich mein Jabber/GTalk Status verändert."
 
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94
+#: ../actions/imsettings.php:68
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163
+#: ../actions/imsettings.php:135
 msgid "Preferences saved."
 msgstr "Einstellungen gesichert."
 
-#: ../actions/profilesettings.php:57
-#, fuzzy
-msgid "Preferred language"
-msgstr "Einstellungen"
-
-#: ../lib/util.php:328
+#: ../lib/util.php:300
 msgid "Privacy"
 msgstr "Privatsphäre"
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106
+#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
 msgid "Problem saving notice."
 msgstr "Problem bei Speichern der Nachricht."
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60
+#: ../lib/stream.php:54
 msgid "Profile"
 msgstr "Profil"
 
@@ -1457,10 +986,14 @@ msgstr "Profil-URL"
 msgid "Profile settings"
 msgstr "Profil Einstellungen"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
 msgid "Profile unknown"
 msgstr "Profil unbekannt"
 
+#: ../lib/util.php:276
+msgid "Public"
+msgstr "Öffentlich"
+
 #: ../actions/public.php:54
 msgid "Public Stream Feed"
 msgstr "Feed des öffentlichen Streams"
@@ -1469,25 +1002,11 @@ msgstr "Feed des öffentlichen Streams"
 msgid "Public timeline"
 msgstr "Öffentliche Zeitleiste"
 
-#: ../actions/imsettings.php:79
-#, fuzzy
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Aktuelle bestätigte Jabber/GTalk-Adresse"
-
-#: ../actions/emailsettings.php:94
-#, fuzzy
-msgid "Publish a MicroID for my email address."
-msgstr "Gib einen Spitznamen oder eine E-Mail Adresse ein."
-
-#: ../actions/tag.php:75 ../actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
-
-#: ../actions/recoverpassword.php:166
+#: ../actions/recoverpassword.php:151
 msgid "Recover"
 msgstr "Wiederherstellung"
 
-#: ../actions/recoverpassword.php:156
+#: ../actions/recoverpassword.php:141
 msgid "Recover password"
 msgstr "Stelle Passwort wieder her"
 
@@ -1495,28 +1014,19 @@ msgstr "Stelle Passwort wieder her"
 msgid "Recovery code for unknown user."
 msgstr "Wiederherstellungscode für unbekannten Nutzer."
 
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: ../actions/register.php:171 ../actions/register.php:195 ../lib/util.php:287
 msgid "Register"
 msgstr "Registrieren"
 
-#: ../actions/register.php:28
-#, fuzzy
-msgid "Registration not allowed."
-msgstr "Nutzername nicht erlaubt."
-
-#: ../actions/register.php:200
-msgid "Registration successful"
-msgstr ""
-
-#: ../actions/userauthorization.php:120
+#: ../actions/userauthorization.php:119
 msgid "Reject"
 msgstr "Ablehnen"
 
-#: ../actions/login.php:103 ../actions/register.php:176
+#: ../actions/login.php:99 ../actions/register.php:183
 msgid "Remember me"
 msgstr "Anmeldedaten merken"
 
-#: ../actions/updateprofile.php:70
+#: ../actions/updateprofile.php:69
 msgid "Remote profile with no matching profile"
 msgstr "Entferntes Profil ohne ein passendes Profil"
 
@@ -1524,9 +1034,7 @@ msgstr "Entferntes Profil ohne ein passendes Profil"
 msgid "Remote subscribe"
 msgstr "Entferntes Abonnement"
 
-#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
-#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -1542,56 +1050,32 @@ msgstr ""
 "Wenn du deine einzige OpenID entfernst, kannst du dich nicht mehr einloggen! "
 "Falls du sie also entfernen musst, füge zuerst eine neue OpenID hinzu."
 
-#: ../lib/stream.php:55
+#: ../lib/stream.php:49
 msgid "Replies"
 msgstr "Antworten"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
 #, php-format
 msgid "Replies to %s"
 msgstr "Antworten an %s"
 
-#: ../actions/recoverpassword.php:183
+#: ../actions/recoverpassword.php:168
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: ../actions/recoverpassword.php:173
+#: ../actions/recoverpassword.php:158
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
-#: ../lib/settingsaction.php:99
-msgid "SMS"
-msgstr ""
-
-#: ../actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
-
-#: ../actions/smssettings.php:33
-#, fuzzy
-msgid "SMS Settings"
-msgstr "IM Einstellungen"
-
-#: ../lib/mail.php:219
-#, fuzzy
-msgid "SMS confirmation"
-msgstr "Kein Bestätigungs-Code."
-
-#: ../actions/recoverpassword.php:182
+#: ../actions/recoverpassword.php:167 ../actions/register.php:180
 msgid "Same as password above"
 msgstr "Gleiches Passwort wie zuvor"
 
-#: ../actions/register.php:156
-#, fuzzy
-msgid "Same as password above. Required."
-msgstr "Gleiches Passwort wie zuvor"
-
-#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
-#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
+#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
 msgid "Save"
 msgstr "Speichern"
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300
+#: ../lib/searchaction.php:73 ../lib/util.php:277
 msgid "Search"
 msgstr "Suchen"
 
@@ -1619,50 +1103,22 @@ msgstr ""
 "Trenne mehrere Suchbegriffe durch Leerzeichen. Ein Suchbegriff muss aus "
 "mindestens 3 Zeichen bestehen."
 
-#: ../actions/smssettings.php:296
-msgid "Select a carrier"
-msgstr ""
-
-#: ../actions/invite.php:137 ../lib/util.php:1172
+#: ../lib/util.php:982
 msgid "Send"
 msgstr "Senden"
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
-msgstr ""
-
-#: ../actions/emailsettings.php:88
-#, fuzzy
-msgid "Send me notices of new subscriptions through email."
-msgstr "Schicke mir Nachrichten mittels Jabber/GTalk."
-
-#: ../actions/imsettings.php:70
+#: ../actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Schicke mir Nachrichten mittels Jabber/GTalk."
 
-#: ../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
-#, fuzzy
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr "Schicke mir Nachrichten mittels Jabber/GTalk."
-
-#: ../lib/util.php:304
+#: ../lib/util.php:282
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: ../actions/profilesettings.php:192
+#: ../actions/profilesettings.php:183
 msgid "Settings saved."
 msgstr "Einstellungen gespeichert."
 
-#: ../actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
 #: ../actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr "Jemand anderes hat schon diese OpenID."
@@ -1671,45 +1127,36 @@ msgstr "Jemand anderes hat schon diese OpenID."
 msgid "Something weird happened."
 msgstr "Etwas eigenartiges ist passiert."
 
-#: ../scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54
-#, fuzzy
-msgid "Sorry, that is not your incoming email address."
-msgstr "Das ist die falsche IM Adresse."
-
-#: ../lib/util.php:330
+#: ../lib/util.php:302
 msgid "Source"
 msgstr "Quellcode"
 
-#: ../actions/showstream.php:296
+#: ../actions/showstream.php:277
 msgid "Statistics"
 msgstr "Statistiken"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
 msgid "Stored OpenID not found."
 msgstr "Gespeicherte OpenID nicht gefunden."
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197
+#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
+#: ../actions/showstream.php:181
 msgid "Subscribe"
 msgstr "Abonnieren"
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: ../actions/showstream.php:294 ../actions/subscribers.php:27
 msgid "Subscribers"
 msgstr "Abonnenten"
 
-#: ../actions/userauthorization.php:310
+#: ../actions/userauthorization.php:309
 msgid "Subscription authorized"
 msgstr "Abonnement autorisiert"
 
-#: ../actions/userauthorization.php:320
+#: ../actions/userauthorization.php:319
 msgid "Subscription rejected"
 msgstr "Abonnement abgelehnt"
 
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
+#: ../actions/showstream.php:212 ../actions/showstream.php:288
 #: ../actions/subscriptions.php:27
 msgid "Subscriptions"
 msgstr "Abonnements"
@@ -1718,14 +1165,6 @@ msgstr "Abonnements"
 msgid "System error uploading file."
 msgstr "Systemfehler beim hochladen der Datei."
 
-#: ../actions/tag.php:41 ../lib/util.php:301
-msgid "Tags"
-msgstr ""
-
-#: ../lib/searchaction.php:104
-msgid "Text"
-msgstr ""
-
 #: ../actions/noticesearch.php:34
 msgid "Text search"
 msgstr "Volltextsuche"
@@ -1742,79 +1181,38 @@ msgstr "Diese Adresse wurde bereits bestätigt."
 msgid "That confirmation code is not for you!"
 msgstr "Dieser Bestätigungscode ist nicht für dich!"
 
-#: ../actions/emailsettings.php:191
-#, fuzzy
-msgid "That email address already belongs to another user."
-msgstr "Diese Jabber ID wird bereits von einem anderen Benutzer verwendet."
-
 #: ../actions/avatar.php:80
 msgid "That file is too big."
 msgstr "Diese Datei ist zu groß."
 
-#: ../actions/imsettings.php:170
+#: ../actions/imsettings.php:161
 msgid "That is already your Jabber ID."
 msgstr "Diese JabberID hast du schon angegeben."
 
-#: ../actions/emailsettings.php:188
-#, fuzzy
-msgid "That is already your email address."
-msgstr "Diese JabberID hast du schon angegeben."
-
-#: ../actions/smssettings.php:188
-#, fuzzy
-msgid "That is already your phone number."
-msgstr "Diese JabberID hast du schon angegeben."
-
-#: ../actions/imsettings.php:233
+#: ../actions/imsettings.php:224
 msgid "That is not your Jabber ID."
 msgstr "Dies ist nicht deine JabberID."
 
-#: ../actions/emailsettings.php:249
-#, fuzzy
-msgid "That is not your email address."
-msgstr "Das ist die falsche IM Adresse."
-
-#: ../actions/smssettings.php:257
-#, fuzzy
-msgid "That is not your phone number."
-msgstr "Dies ist nicht deine JabberID."
-
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
+#: ../actions/imsettings.php:201
 msgid "That is the wrong IM address."
 msgstr "Das ist die falsche IM Adresse."
 
-#: ../actions/smssettings.php:233
-#, fuzzy
-msgid "That is the wrong confirmation number."
-msgstr "Das ist die falsche IM Adresse."
-
-#: ../actions/smssettings.php:191
-#, fuzzy
-msgid "That phone number already belongs to another user."
-msgstr "Diese Jabber ID wird bereits von einem anderen Benutzer verwendet."
-
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: ../actions/newnotice.php:52
 msgid "That's too long. Max notice size is 140 chars."
 msgstr ""
-"Das war zu lang. Die Länge einer Nachricht ist auf 140 Zeichen beschränkt."
+"Das war zu lang. Die Länge einer Nachricht ist auf 140 Zeichen "
+"beschränkt."
 
-#: ../actions/twitapiaccount.php:74
-#, fuzzy
-msgid "That's too long. Max notice size is 255 chars."
-msgstr ""
-"Das war zu lang. Die Länge einer Nachricht ist auf 140 Zeichen beschränkt."
-
-#: ../actions/confirmaddress.php:92
+#: ../actions/confirmaddress.php:86
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Die Adresse \"%s\" wurde für dein Konto bestätigt."
 
-#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274
+#: ../actions/imsettings.php:241
 msgid "The address was removed."
 msgstr "Die Adresse wurde entfernt."
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:311
 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 "
@@ -1824,7 +1222,7 @@ msgstr ""
 "zurückgegeben. Lies nochmal die Anweisungen der Site, wie Abonnements "
 "bestätigt werden. Dein Abonnement-Token ist:"
 
-#: ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:321
 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 "
@@ -1852,12 +1250,7 @@ msgstr "Dies sind die Leute, deren Nachrichten %s liest."
 msgid "These are the people whose notices you listen to."
 msgstr "Dies sind die Leute, deren Nachrichten du liest."
 
-#: ../actions/invite.php:89
-msgid ""
-"These people are already users and you were automatically subscribed to them:"
-msgstr ""
-
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:87
 msgid "This confirmation code is too old. Please start again."
 msgstr "Der Bestätigungscode ist zu alt. Bitte fange nochmal von vorne an."
 
@@ -1880,70 +1273,46 @@ msgstr ""
 "deine OpenID mit einem lokalen Konto verbinden. Du kannst entweder ein neues "
 "Konto erstellen oder mit einem vorhandenen Konto anmelden."
 
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-msgid "This method requires a POST or DELETE."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381
-msgid "This method requires a POST."
-msgstr ""
-
-#: ../lib/util.php:164
+#: ../lib/util.php:147
 msgid "This page is not available in a media type you accept"
 msgstr "Dies Seite liegt in keinem von dir akzeptierten Mediatype vor."
 
-#: ../actions/profilesettings.php:63
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107
-msgid "Timezone not selected."
-msgstr ""
-
 #: ../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."
+"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 ""
 "Für ein Abonnement kannst du dich entweder [einloggen](%%action.login%%) "
 "oder ein neues Konto [registrieren](%%action.register%%). Wenn du schon ein "
 "Konto auf einer [kompatiblen Microbloggingsite](%%doc.openmublog%%) hast, "
 "dann gib deine Profil-URL unten an."
 
-#: ../actions/twitapifriendships.php:163
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
-
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: ../actions/profilesettings.php:51
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
-"URL deiner Homepage, deines Blogs, oder deines Profils auf einer anderen Site"
+"URL deiner Homepage, deines Blogs, oder deines Profils auf einer anderen "
+"Site"
 
 #: ../actions/remotesubscribe.php:74
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "Profil-URL bei einem anderen kompatiblen Microbloggingdienst"
 
-#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
-#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
 msgid "Unexpected form submission."
 msgstr "Unerwartete Formulareingabe."
 
-#: ../actions/recoverpassword.php:276
+#: ../actions/recoverpassword.php:237
 msgid "Unexpected password reset."
 msgstr "Unerwarteter Passwortreset."
 
-#: ../index.php:57
-msgid "Unknown action"
-msgstr ""
-
 #: ../actions/finishremotesubscribe.php:58
 msgid "Unknown version of OMB protocol."
 msgstr "Unbekannte OMB-Protokollversion."
 
-#: ../lib/util.php:269
+#: ../lib/util.php:245
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
@@ -1956,11 +1325,11 @@ msgstr ""
 msgid "Unrecognized address type %s"
 msgstr "Nicht erkannter Adresstyp %s"
 
-#: ../actions/showstream.php:209
+#: ../actions/showstream.php:193
 msgid "Unsubscribe"
 msgstr "Abbestellen"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
 msgid "Unsupported OMB version"
 msgstr "Nicht unterstützte OMB-Version"
 
@@ -1968,24 +1337,6 @@ msgstr "Nicht unterstützte OMB-Version"
 msgid "Unsupported image file format."
 msgstr "Bildformat wird nicht unterstützt."
 
-#: ../lib/settingsaction.php:100
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:241
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:341
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
 #: ../actions/avatar.php:68
 msgid "Upload"
 msgstr "Hochladen"
@@ -2003,17 +1354,7 @@ msgstr ""
 "Verfügung gestellt werden. Nutze also ein Bild, das dir gehört und das du "
 "auch weitergeben möchtest."
 
-#: ../lib/settingsaction.php:91
-#, fuzzy
-msgid "Upload a new profile image"
-msgstr "Neue Profildaten konnten nicht gespeichert werden."
-
-#: ../actions/invite.php:114
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
-msgstr ""
-
-#: ../actions/register.php:159 ../actions/register.php:162
+#: ../actions/profilesettings.php:48 ../actions/register.php:182
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Wird nur für Updates, wichtige Mitteilungen und zur "
@@ -2024,10 +1365,8 @@ msgid "User being listened to doesn't exist."
 msgstr "Aufgeführte Nutzer existiert nicht."
 
 #: ../actions/all.php:41 ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:47 ../actions/replies.php:41
-#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
-#: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
-#: ../actions/twitapiusers.php:82
+#: ../actions/foaf.php:43 ../actions/replies.php:41
+#: ../actions/showstream.php:44
 msgid "User has no profile."
 msgstr "Benutzer hat kein Profil."
 
@@ -2035,73 +1374,45 @@ msgstr "Benutzer hat kein Profil."
 msgid "User nickname"
 msgstr "Benutzername"
 
-#: ../actions/twitapiusers.php:75
+#: ../lib/util.php:969 ../lib/util.php:1159 lib/util.php:1293
+#, php-format
 #, fuzzy
-msgid "User not found."
-msgstr "Gespeicherte OpenID nicht gefunden."
-
-#: ../actions/profilesettings.php:63
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../lib/util.php:1159
-#, fuzzy, php-format
 msgid "What's up, %s?"
-msgstr "Was ist los, %s?"
+msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Was ist los, %s?\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: ../actions/profilesettings.php:57
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Wo du bist, z.B. \"Stadt, Gebiet, Land\""
 
-#: ../actions/updateprofile.php:128
+#: ../actions/updateprofile.php:127
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Falscher Bildtyp für '%s'"
 
-#: ../actions/updateprofile.php:123
+#: ../actions/updateprofile.php:122
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Falsche Bildgröße bei '%s'"
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-msgid "Yes"
-msgstr ""
-
 #: ../actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr "Diese OpenID hast du schon angegeben!"
 
-#: ../actions/deletenotice.php:37
-msgid ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
-msgstr ""
-
 #: ../actions/recoverpassword.php:31
 msgid "You are already logged in!"
 msgstr "Du bist bereits angemeldet!"
 
-#: ../actions/invite.php:81
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr ""
-
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
 msgstr "Hier kannst du dein Passwort ändern. Wähle ein Gutes!"
 
-#: ../actions/register.php:135
+#: ../actions/register.php:164
 msgid "You can create a new account to start posting notices."
 msgstr "Du kannst ein neues Konto erstellen, um Nachrichten zu verschicken."
 
-#: ../actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
@@ -2113,15 +1424,16 @@ msgstr ""
 #: ../actions/imsettings.php:28
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
 "Du kannst Nachrichten mittels [Jabber/GTalk IM](%%doc.im%%) empfangen und "
 "senden. Stelle deine Adresse und Einstellungen unten ein."
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about you."
+"You can update your personal profile info here so people know more about "
+"you."
 msgstr ""
 "Du kannst dein Profil auf den neusten Stand bringen, damit andere Leute mehr "
 "über dich erfahren können."
@@ -2130,44 +1442,17 @@ msgstr ""
 msgid "You can use the local subscription!"
 msgstr "Du kannst ein lokales Abonnement erstellen!"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
 msgid "You can't register if you don't agree to the license."
 msgstr ""
-"Du kannst dich nicht registrieren, wenn du die Lizenz nicht akzeptierst."
+"Du kannst dich nicht registrieren, wenn du die Lizenz nicht "
+"akzeptierst."
 
-#: ../actions/updateprofile.php:63
+#: ../actions/updateprofile.php:62
 msgid "You did not send us that profile"
 msgstr "Dieses Profil hast du uns nicht geschickt"
 
-#: ../lib/mail.php:147
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
-"Send email to %2$s to post new messages.\n"
-"\n"
-"More email instructions at %3$s.\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:612
-msgid "You may not delete another user's status."
-msgstr ""
-
-#: ../actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr ""
-
-#: ../actions/invite.php:103
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
-
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:134
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Du wurdest indentifiziert. Bitte trage unten ein neues Passwort ein."
 
@@ -2175,7 +1460,7 @@ msgstr "Du wurdest indentifiziert. Bitte trage unten ein neues Passwort ein."
 msgid "Your OpenID URL"
 msgstr "Deine OpenID URL"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:149
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Dein Benutzername oder E-Mail Adresse auf diesem Server."
 
@@ -2186,63 +1471,60 @@ msgid ""
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
 "Mit [OpenID](%%doc.openid%%) kannst du dich bei mehreren Sites mit demselben "
-"Nutzerkonto anmelden. Hier kannst du deine verknüpften OpenIDs verwalten."
+"Nutzerkonto anmelden. Hier kannst du deine verknüpften OpenIDs "
+"verwalten."
 
-#: ../lib/util.php:943
+#: ../lib/util.php:814
 msgid "a few seconds ago"
 msgstr "vor wenigen Sekunden"
 
-#: ../lib/util.php:955
+#: ../lib/util.php:826
 #, php-format
 msgid "about %d days ago"
 msgstr "vor %d Tagen"
 
-#: ../lib/util.php:951
+#: ../lib/util.php:822
 #, php-format
 msgid "about %d hours ago"
 msgstr "vor %d Stunden"
 
-#: ../lib/util.php:947
+#: ../lib/util.php:818
 #, php-format
 msgid "about %d minutes ago"
 msgstr "vor %d Minuten"
 
-#: ../lib/util.php:959
+#: ../lib/util.php:830
 #, php-format
 msgid "about %d months ago"
 msgstr "vor %d Monaten"
 
-#: ../lib/util.php:953
+#: ../lib/util.php:824
 msgid "about a day ago"
 msgstr "vor einem Tag"
 
-#: ../lib/util.php:945
+#: ../lib/util.php:816
 msgid "about a minute ago"
 msgstr "vor einer Minute"
 
-#: ../lib/util.php:957
+#: ../lib/util.php:828
 msgid "about a month ago"
 msgstr "vor einem Monat"
 
-#: ../lib/util.php:961
+#: ../lib/util.php:832
 msgid "about a year ago"
 msgstr "vor einem Jahr"
 
-#: ../lib/util.php:949
+#: ../lib/util.php:820
 msgid "about an hour ago"
 msgstr "vor einer Stunde"
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-msgid "delete"
-msgstr ""
-
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117
+#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
+#: ../lib/stream.php:101
 msgid "in reply to..."
 msgstr "als Antwort auf... "
 
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124
+#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
+#: ../lib/stream.php:108
 msgid "reply"
 msgstr "antworten"
 
@@ -2250,23 +1532,1323 @@ msgstr "antworten"
 msgid "same as password above"
 msgstr "Gleiches Passwort wie zuvor"
 
-#: ../actions/twitapistatuses.php:755
-#, fuzzy
-msgid "unsupported file type"
-msgstr "Bildformat wird nicht unterstützt."
-
-#: ../lib/util.php:1309
+#: ../lib/util.php:1127
 msgid "« After"
 msgstr "« Später"
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "E-Mail konnte nicht bestätigt werden."
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+msgid " from "
+msgstr "von"
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
+
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#, php-format
+msgid "%s public timeline"
+msgstr "%s öffentliche Zeitleiste"
+
+#: ../lib/mail.php:206 lib/mail.php:212
+#, php-format
+msgid "%s status"
+msgstr "%s Status"
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#, php-format
+msgid "%s timeline"
+msgstr "%s Zeitleiste"
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+"(Sie sollten in Kürze eine E-Mail mit der Anleitung zur Überprüfung Ihrer "
+"Mailadresse erhalten.)"
+
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+"1-64 kleingeschriebene Buchstaben oder Zahlen, keine Satz- oder Leerzeichen. "
+"Pflicht."
+
+#: ../actions/register.php:154 actions/register.php:168
+msgid "6 or more characters. Required."
+msgstr "6 oder mehr Buchstaben. Pflicht."
+
+#: ../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 ""
+"Ein Bestätigungscode wurde an die angegebene E-Mail Adresse geschickt. "
+"Überprüfen Sie Ihren Posteingang (auch den Spamordner!) für den Code und "
+"Anweisungen, wie dieser benutzt wird."
+
+#: ../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 ""
+"Ein Bestätigungscode wurde an die von Ihnen angegebene Telefonnummer "
+"gesandt. Überprüfen Sie bitte Ihren Posteingang (auch den Spamordner!) auf "
+"den Code und die Anweisungen, um ihn zu benutzen."
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55
+msgid "API method not found!"
+msgstr "API-Methode nicht gefunden!"
+
+#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
+#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
+#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
+#: ../actions/twitapidirect_messages.php:49
+#: ../actions/twitapidirect_messages.php:56
+#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
+#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
+#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
+#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
+#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
+#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
+#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
+#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
+#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
+#: actions/twitapistatuses.php:690
+msgid "API method under construction."
+msgstr "API-Methode im Aufbau."
+
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr "Sind sie sicher, dass sie diese Nachricht löschen wollen?"
+
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for "
+"non-humans)"
+msgstr ""
+"Abonniere automatisch alle Kontakte, die mich abonnieren (sinnvoll für "
+"Nicht-Menschen)"
+
+#: ../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 ""
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr "Warte auf die Bestätigung dieser Telefonnummer."
+
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr "Die Nachricht konnte nicht gelöscht werden."
+
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+msgid "Change email handling"
+msgstr ""
+
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+msgid "Change your profile settings"
+msgstr "Ändern der Profileinstellungen"
+
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr "Bestätigungscode"
+
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+msgid "Could not follow user: User not found."
+msgstr ""
+
+#: ../lib/subs.php:54 lib/subs.php:61
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: ../lib/subs.php:46 lib/subs.php:46
+msgid "Could not subscribe."
+msgstr ""
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+msgid "Couldn't find any statuses."
+msgstr "Konnte keine Statusmeldungen finden."
+
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+msgid "Couldn't update user record."
+msgstr ""
+
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr ""
+
+#: ../classes/Notice.php:72 classes/Notice.php:86
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr ""
+
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr ""
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr ""
+
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: ../actions/tag.php:55 actions/tag.php:55
+#, php-format
+msgid "Feed for tag %s"
+msgstr ""
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr ""
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr ""
+
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+msgid "I want to post notices by email."
+msgstr ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+msgid "IM"
+msgstr ""
+
+#: ../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
+msgid "Incoming email"
+msgstr ""
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+msgid "Incoming email address removed."
+msgstr ""
+
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Language"
+msgstr "Sprache"
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+msgid "Language is too long (max 50 chars)."
+msgstr ""
+
+#: ../actions/register.php:166 actions/register.php:180
+msgid "Longer name, preferably your \"real\" name"
+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 ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr ""
+
+#: ../lib/mail.php:144 lib/mail.php:144
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+msgid "New incoming email address added."
+msgstr ""
+
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+msgid "No"
+msgstr ""
+
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr "Kein Code eingegeben"
+
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+msgid "No email address."
+msgstr ""
+
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+msgid "No incoming email address."
+msgstr ""
+
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+msgid "No status with that ID found."
+msgstr ""
+
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+msgid "Not a registered user."
+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
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+msgid "Not found"
+msgstr ""
+
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr ""
+
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
+
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr ""
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr ""
+
+#: ../actions/invite.php:133 actions/invite.php:141
+msgid "Personal message"
+msgstr ""
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Preferred language"
+msgstr ""
+
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/register.php:28 actions/register.php:28
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+msgid "Registration successful"
+msgstr ""
+
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/register.php:156 actions/register.php:170
+msgid "Same as password above. Required."
+msgstr ""
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr ""
+
+#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
+#: actions/emailsettings.php:74 actions/smssettings.php:82
+msgid "Send email to this address to post new notices."
+msgstr ""
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../actions/tag.php:60 actions/tag.php:60
+msgid "Showing most popular tags from the last week"
+msgstr ""
+
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
 
-#~ msgid "Couldn't create subscription."
-#~ msgstr "Konnte Abonnement nicht erstellen."
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317
+msgid "Tags"
+msgstr ""
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Fehler beim Einfügen der Nachricht"
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
+msgid "Text"
+msgstr ""
+
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+msgid "That is not your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+msgid "That is not your phone number."
+msgstr ""
+
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/invite.php:89 actions/invite.php:96
+msgid ""
+"These people are already users and you were automatically subscribed to "
+"them:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511
+msgid "This method requires a POST or 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
+msgid "This method requires a POST."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+msgid "Timezone not selected."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+msgid "Two user ids or screen_names must be supplied."
+msgstr ""
+
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr "Unbekannter Befehl"
+
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this "
+"service."
+msgstr ""
 
-#~ msgid "Public"
-#~ msgstr "Öffentlich"
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "What timezone are you normally in?"
+msgstr "In welcher Zeitzone befinden Sie sich üblicherweise?"
+
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+msgid "Yes"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+msgid "You are not friends with the specified user."
+msgstr ""
+
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr ""
+
+#: ../actions/invite.php:103 actions/invite.php:110
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
+msgstr ""
+
+#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99
+msgid "delete"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+msgid "unsupported file type"
+msgstr ""
+
+#: actions/deletenotice.php:74 actions/disfavor.php:43
+#: actions/emailsettings.php:127 actions/favor.php:45
+#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
+#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
+#: actions/openidsettings.php:123 actions/profilesettings.php:47
+#: actions/recoverpassword.php:282 actions/register.php:42
+#: actions/remotesubscribe.php:40 actions/smssettings.php:124
+#: actions/subscribe.php:44 actions/twittersettings.php:97
+#: actions/unsubscribe.php:41 actions/userauthorization.php:35
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/disfavor.php:55
+msgid "This notice is not a favorite!"
+msgstr ""
+
+#: actions/disfavor.php:63
+msgid "Could not delete favorite."
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Favor"
+msgstr ""
+
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+
+#: actions/emailsettings.php:95
+msgid "Send me email when someone sends me a private message."
+msgstr ""
+
+#: actions/favor.php:53 actions/twitapifavorites.php:142
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132
+msgid "Could not create favorite."
+msgstr ""
+
+#: actions/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#, php-format
+msgid "%s favorite notices"
+msgstr ""
+
+#: actions/favoritesrss.php:64
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr ""
+
+#: actions/inbox.php:28
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+
+#: actions/invite.php:178
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+msgstr ""
+
+#: actions/login.php:104
+msgid "Automatically login in the future; "
+msgstr ""
+
+#: actions/login.php:122
+msgid "For security reasons, please re-enter your "
+msgstr ""
+
+#: actions/login.php:126
+msgid "Login with your username and password. "
+msgstr ""
+
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+msgid "That's too long. Max message size is 140 chars."
+msgstr ""
+
+#: actions/newmessage.php:65
+msgid "No recipient specified."
+msgstr ""
+
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206
+msgid "You can't send a message to this user."
+msgstr ""
+
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly "
+"instead."
+msgstr ""
+
+#: actions/newmessage.php:108
+msgid "No such user"
+msgstr ""
+
+#: actions/newmessage.php:117
+msgid "New message"
+msgstr ""
+
+#: actions/noticesearch.php:95
+msgid "Notice without matching profile"
+msgstr ""
+
+#: actions/openidsettings.php:28
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr ""
+
+#: actions/openidsettings.php:46
+msgid "If you want to add an OpenID to your account, "
+msgstr ""
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr ""
+
+#: actions/openidsettings.php:87
+msgid "You can remove an OpenID from your account "
+msgstr ""
+
+#: actions/outbox.php:28
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr ""
+
+#: actions/outbox.php:30
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#: actions/outbox.php:53
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+
+#: actions/peoplesearch.php:28
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+msgstr ""
+
+#: actions/profilesettings.php:27
+msgid "You can update your personal profile info here "
+msgstr ""
+
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+msgid "User without matching profile"
+msgstr ""
+
+#: actions/recoverpassword.php:91
+msgid "This confirmation code is too old. "
+msgstr ""
+
+#: actions/recoverpassword.php:141
+msgid "If you've forgotten or lost your"
+msgstr ""
+
+#: actions/recoverpassword.php:154
+msgid "You've been identified. Enter a "
+msgstr ""
+
+#: actions/recoverpassword.php:169
+msgid "Your nickname on this server, "
+msgstr ""
+
+#: actions/recoverpassword.php:271
+msgid "Instructions for recovering your password "
+msgstr ""
+
+#: actions/recoverpassword.php:327
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95
+msgid "Password must be 6 or more characters."
+msgstr ""
+
+#: actions/register.php:216
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
+msgstr ""
+
+#: actions/register.php:227
+msgid "(You should receive a message by email momentarily, with "
+msgstr ""
+
+#: actions/remotesubscribe.php:51
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
+msgstr ""
+
+#: actions/showfavorites.php:61
+#, php-format
+msgid "Feed for favorites of %s"
+msgstr ""
+
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+msgid "Could not retrieve favorite notices."
+msgstr ""
+
+#: actions/showmessage.php:33
+msgid "No such message."
+msgstr ""
+
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
+msgstr ""
+
+#: actions/showmessage.php:61
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr ""
+
+#: actions/showmessage.php:66
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr ""
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr ""
+
+#: actions/smssettings.php:312
+#, php-format
+msgid "Mobile carrier for your phone. "
+msgstr ""
+
+#: actions/twitapidirect_messages.php:76
+#, php-format
+msgid "Direct messages to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:77
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:81
+msgid "Direct Messages You've Sent"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:82
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:128
+msgid "No message text!"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:138
+msgid "Recipient user not found."
+msgstr ""
+
+#: actions/twitapidirect_messages.php:141
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
+#: actions/twitapifavorites.php:92
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr ""
+
+#: actions/twitapifavorites.php:95
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr ""
+
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#, php-format
+msgid "%s added your notice as a favorite"
+msgstr ""
+
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+msgstr ""
+
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+msgstr ""
+
+#: actions/twittersettings.php:41
+msgid "Twitter settings"
+msgstr ""
+
+#: actions/twittersettings.php:48
+msgid "Twitter Account"
+msgstr ""
+
+#: actions/twittersettings.php:56
+msgid "Current verified Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr ""
+
+#: actions/twittersettings.php:65
+msgid "No spaces, please."
+msgstr ""
+
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr ""
+
+#: actions/twittersettings.php:72
+msgid "Automatically send my notices to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:75
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:78
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+
+#: actions/twittersettings.php:128
+msgid "Could not verify your Twitter credentials!"
+msgstr ""
+
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+msgid "Unable to save your Twitter settings!"
+msgstr ""
+
+#: actions/twittersettings.php:174
+msgid "Twitter settings saved."
+msgstr ""
+
+#: actions/twittersettings.php:192
+msgid "That is not your Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+msgid "Couldn't remove Twitter user."
+msgstr ""
+
+#: actions/twittersettings.php:212
+msgid "Twitter account removed."
+msgstr ""
+
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+msgid "Couldn't save Twitter preferences."
+msgstr ""
+
+#: actions/twittersettings.php:245
+msgid "Twitter preferences saved."
+msgstr ""
+
+#: actions/userauthorization.php:84
+msgid "Please check these details to make sure "
+msgstr ""
+
+#: actions/userauthorization.php:324
+msgid "The subscription has been authorized, but no "
+msgstr ""
+
+#: actions/userauthorization.php:334
+msgid "The subscription has been rejected, but no "
+msgstr ""
+
+#: classes/Channel.php:113
+msgid "Command results"
+msgstr ""
+
+#: classes/Channel.php:148
+msgid "Command complete"
+msgstr ""
+
+#: classes/Channel.php:158
+msgid "Command failed"
+msgstr ""
+
+#: classes/Command.php:39
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: classes/Command.php:96
+#, php-format
+msgid "Subscriptions: %1$s\n"
+msgstr ""
+
+#: classes/Command.php:125 classes/Command.php:242
+msgid "User has no last notice"
+msgstr ""
+
+#: classes/Command.php:146
+msgid "Notice marked as fave."
+msgstr ""
+
+#: classes/Command.php:166
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr ""
+
+#: classes/Command.php:169
+#, php-format
+msgid "Fullname: %s"
+msgstr ""
+
+#: classes/Command.php:172
+#, php-format
+msgid "Location: %s"
+msgstr ""
+
+#: classes/Command.php:175
+#, php-format
+msgid "Homepage: %s"
+msgstr ""
+
+#: classes/Command.php:178
+#, php-format
+msgid "About: %s"
+msgstr ""
+
+#: classes/Command.php:200
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
+
+#: classes/Command.php:214
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
+
+#: classes/Command.php:216
+msgid "Error sending direct message."
+msgstr ""
+
+#: classes/Command.php:263
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: classes/Command.php:270
+#, php-format
+msgid "Subscribed to %s"
+msgstr ""
+
+#: classes/Command.php:288
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
+
+#: classes/Command.php:295
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr ""
+
+#: classes/Command.php:310 classes/Command.php:330
+msgid "Command not yet implemented."
+msgstr ""
+
+#: classes/Command.php:313
+msgid "Notification off."
+msgstr ""
+
+#: classes/Command.php:315
+msgid "Can't turn off notification."
+msgstr ""
+
+#: classes/Command.php:333
+msgid "Notification on."
+msgstr ""
+
+#: classes/Command.php:335
+msgid "Can't turn on notification."
+msgstr ""
+
+#: classes/Command.php:344
+msgid "Commands:\n"
+msgstr ""
+
+#: classes/Message.php:53
+msgid "Could not insert message."
+msgstr ""
+
+#: classes/Message.php:63
+msgid "Could not update message with new URI."
+msgstr ""
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr ""
+
+#: lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:249
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:253
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+msgstr ""
+
+#: lib/mailbox.php:43
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/openid.php:195
+msgid "This form should automatically submit itself. "
+msgstr ""
+
+#: lib/personal.php:65
+msgid "Favorites"
+msgstr ""
+
+#: lib/personal.php:66
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
+#: lib/personal.php:66
+msgid "User"
+msgstr ""
+
+#: lib/personal.php:75
+msgid "Inbox"
+msgstr ""
+
+#: lib/personal.php:76
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personal.php:80
+msgid "Outbox"
+msgstr ""
+
+#: lib/personal.php:81
+msgid "Your sent messages"
+msgstr ""
+
+#: lib/settingsaction.php:99
+msgid "Twitter"
+msgstr ""
+
+#: lib/settingsaction.php:100
+msgid "Twitter integration options"
+msgstr ""
+
+#: lib/util.php:1718
+msgid "To"
+msgstr ""
+
+#: scripts/maildaemon.php:45
+msgid "Could not parse message."
+msgstr ""
diff --git a/locale/el/LC_MESSAGES/laconica.mo b/locale/el/LC_MESSAGES/laconica.mo
new file mode 100644
index 000000000..b40616592
--- /dev/null
+++ b/locale/el/LC_MESSAGES/laconica.mo
diff --git a/locale/el/LC_MESSAGES/laconica.po b/locale/el/LC_MESSAGES/laconica.po
new file mode 100644
index 000000000..0171b419c
--- /dev/null
+++ b/locale/el/LC_MESSAGES/laconica.po
@@ -0,0 +1,2872 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#, php-format
+msgid " Search Stream for \"%s\""
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: actions/finishopenidlogin.php:88 actions/register.php:205
+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 ""
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126
+#, php-format
+msgid "%1$s is now listening to your notices on %2$s."
+msgstr ""
+
+#: ../lib/mail.php:126
+#, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s.\n"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
+
+#: ../actions/shownotice.php:45 actions/shownotice.php:45
+#, 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
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
+#, php-format
+msgid "%s Public Stream"
+msgstr "Δημόσια �οή %s"
+
+#: ../actions/all.php:47 ../actions/allrss.php:60
+#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51 actions/all.php:47
+#: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
+#, php-format
+msgid "%s and friends"
+msgstr "%s και οι φίλοι του/της"
+
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#, php-format
+msgid "%s public timeline"
+msgstr ""
+
+#: ../lib/mail.php:206 lib/mail.php:212
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+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
+#, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by "
+"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+msgstr ""
+
+#: ../lib/util.php:259 lib/util.php:275
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr ""
+
+#: ../lib/util.php:274 lib/util.php:290
+msgid ". Contributors should be attributed by full name or nickname."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/password.php:42 actions/profilesettings.php:181
+msgid "6 or more characters"
+msgstr "6 ή πε�ισσότε�οι χα�ακτή�ες"
+
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
+msgid "6 or more characters, and don't forget it!"
+msgstr "6 ή πε�ισσότε�οι χα�ακτή�ες και μην το ξεχάσετε!"
+
+#: ../actions/register.php:154 actions/register.php:168
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
+#, php-format
+msgid ""
+"A confirmation code was sent to the IM address you added. You must approve "
+"%s for sending messages to you."
+msgstr ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55
+msgid "API method not found!"
+msgstr ""
+
+#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
+#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
+#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
+#: ../actions/twitapidirect_messages.php:49
+#: ../actions/twitapidirect_messages.php:56
+#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
+#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
+#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
+#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
+#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
+#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
+#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
+#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
+#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
+#: actions/twitapistatuses.php:690
+msgid "API method under construction."
+msgstr ""
+
+#: ../lib/util.php:324 lib/util.php:340
+msgid "About"
+msgstr "Πε�ί"
+
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
+msgid "Accept"
+msgstr "Αποδοχή"
+
+#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
+#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: actions/emailsettings.php:63 actions/imsettings.php:64
+#: actions/openidsettings.php:58 actions/smssettings.php:71
+#: actions/twittersettings.php:85
+msgid "Add"
+msgstr "Π�οσθήκη"
+
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
+msgid "Add OpenID"
+msgstr "Π�οσθήκη OpenID"
+
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
+msgid "Address"
+msgstr "Διε�θυνση"
+
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../actions/showstream.php:273 actions/showstream.php:288
+msgid "All subscriptions"
+msgstr ""
+
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
+#, php-format
+msgid "All updates for %s"
+msgstr ""
+
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#, php-format
+msgid "All updates matching search term \"%s\""
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
+#: ../actions/openidlogin.php:29 ../actions/register.php:30
+#: actions/finishopenidlogin.php:29 actions/login.php:31
+#: actions/openidlogin.php:29 actions/register.php:30
+msgid "Already logged in."
+msgstr ""
+
+#: ../lib/subs.php:42 lib/subs.php:42
+msgid "Already subscribed!."
+msgstr ""
+
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
+
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
+msgid "Authorize subscription"
+msgstr ""
+
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192
+msgid "Automatically login in the future; not for shared computers!"
+msgstr ""
+
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for "
+"non-humans)"
+msgstr ""
+
+#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: actions/profilesettings.php:34
+msgid "Avatar"
+msgstr ""
+
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+msgid "Avatar updated."
+msgstr ""
+
+#: ../actions/imsettings.php:55 actions/imsettings.php:56
+#, 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 ""
+
+#: ../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 ""
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
+
+#: ../lib/util.php:1318 lib/util.php:1452
+msgid "Before »"
+msgstr ""
+
+#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: actions/profilesettings.php:82 actions/register.php:184
+msgid "Bio"
+msgstr "Βιογ�αφικό"
+
+#: ../actions/profilesettings.php:101 ../actions/register.php:82
+#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
+#: actions/register.php:89 actions/updateprofile.php:104
+msgid "Bio is too long (max 140 chars)."
+msgstr "Το βιογ�αφικό είναι πολ� μεγάλο (μέγιστο 140 χα�ακτ.)."
+
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr ""
+
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
+#, php-format
+msgid "Can't read avatar URL '%s'"
+msgstr ""
+
+#: ../actions/password.php:85 ../actions/recoverpassword.php:300
+#: actions/profilesettings.php:404 actions/recoverpassword.php:313
+msgid "Can't save new password."
+msgstr "Αδ�νατη η αποθήκευση του νέου κωδικο�"
+
+#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
+#: ../actions/smssettings.php:62 actions/emailsettings.php:58
+#: actions/imsettings.php:59 actions/smssettings.php:62
+msgid "Cancel"
+msgstr "Ακ��ωση"
+
+#: ../lib/openid.php:121 lib/openid.php:121
+msgid "Cannot instantiate OpenID consumer object."
+msgstr ""
+
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
+msgid "Cannot normalize that Jabber ID"
+msgstr ""
+
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+msgid "Change"
+msgstr "Αλλαγή"
+
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+msgid "Change email handling"
+msgstr ""
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
+msgid "Change password"
+msgstr "Αλλαγή κωδικο�"
+
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+msgid "Change your profile settings"
+msgstr ""
+
+#: ../actions/password.php:43 ../actions/recoverpassword.php:181
+#: ../actions/register.php:155 ../actions/smssettings.php:65
+#: actions/profilesettings.php:182 actions/recoverpassword.php:187
+#: actions/register.php:169 actions/smssettings.php:65
+msgid "Confirm"
+msgstr "Επιβεβαίωση"
+
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
+msgid "Confirm Address"
+msgstr "Επιβεβαίωση διε�θυνσης"
+
+#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
+#: ../actions/smssettings.php:245 actions/emailsettings.php:256
+#: actions/imsettings.php:230 actions/smssettings.php:253
+msgid "Confirmation cancelled."
+msgstr "Η επιβεβαίωση ακυ�ώθηκε."
+
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
+msgid "Confirmation code not found."
+msgstr "Ο κωδικός επιβεβαίωσης δεν β�έθηκε."
+
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
+msgid "Connect"
+msgstr "Σ�νδεση"
+
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
+msgid "Connect existing account"
+msgstr "Σ�νδεση με υπά�χων λογα�ιασμό"
+
+#: ../lib/util.php:332 lib/util.php:348
+msgid "Contact"
+msgstr "Επικοινωνία"
+
+#: ../lib/openid.php:178 lib/openid.php:178
+#, php-format
+msgid "Could not create OpenID form: %s"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+msgid "Could not follow user: User not found."
+msgstr ""
+
+#: ../lib/openid.php:160 lib/openid.php:160
+#, php-format
+msgid "Could not redirect to server: %s"
+msgstr ""
+
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
+msgid "Could not save avatar info"
+msgstr ""
+
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
+msgid "Could not save new profile info"
+msgstr "Αδ�νατη η αποθήκευση των νέων πλη�οφο�ιών του π�οφίλ"
+
+#: ../lib/subs.php:54 lib/subs.php:61
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: ../lib/subs.php:46 lib/subs.php:46
+msgid "Could not subscribe."
+msgstr ""
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
+
+#: ../actions/finishremotesubscribe.php:99
+#: actions/finishremotesubscribe.php:101
+msgid "Couldn't convert request tokens to access tokens."
+msgstr ""
+
+#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
+#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#: actions/confirmaddress.php:84 actions/emailsettings.php:252
+#: actions/imsettings.php:226 actions/smssettings.php:249
+msgid "Couldn't delete email confirmation."
+msgstr ""
+
+#: ../lib/subs.php:103 lib/subs.php:116
+msgid "Couldn't delete subscription."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
+msgid "Couldn't get a request token."
+msgstr ""
+
+#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
+#: ../actions/smssettings.php:206 actions/emailsettings.php:223
+#: actions/imsettings.php:195 actions/smssettings.php:214
+msgid "Couldn't insert confirmation code."
+msgstr ""
+
+#: ../actions/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182
+msgid "Couldn't insert new subscription."
+msgstr ""
+
+#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
+msgid "Couldn't save profile."
+msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+msgid "Couldn't update user record."
+msgstr ""
+
+#: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
+#: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
+#: ../actions/imsettings.php:243 ../actions/profilesettings.php:141
+#: ../actions/smssettings.php:157 ../actions/smssettings.php:269
+#: actions/confirmaddress.php:72 actions/emailsettings.php:174
+#: actions/emailsettings.php:277 actions/imsettings.php:146
+#: actions/imsettings.php:251 actions/profilesettings.php:256
+#: actions/smssettings.php:165 actions/smssettings.php:277
+msgid "Couldn't update user."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
+msgid "Create"
+msgstr "Δημιου�γία"
+
+#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
+msgid "Create a new user with this nickname."
+msgstr "Δημιου�γία νέου χ�ήστη με αυτό το ψευδώνυμο."
+
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
+msgid "Create new account"
+msgstr "Δημιου�γία νέου λογα�ιασμο�"
+
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+msgid "Creating new account for OpenID that already has a user."
+msgstr ""
+
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
+msgid "Current confirmed Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr ""
+
+#: ../actions/showstream.php:356 actions/showstream.php:367
+msgid "Currently"
+msgstr ""
+
+#: ../classes/Notice.php:72 classes/Notice.php:86
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../lib/util.php:1061 lib/util.php:1110
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr ""
+
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr ""
+
+#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: actions/profilesettings.php:84 actions/register.php:186
+msgid "Describe yourself and your interests in 140 chars"
+msgstr ""
+
+#: ../actions/register.php:158 ../actions/register.php:161
+#: ../lib/settingsaction.php:87 actions/register.php:172
+#: actions/register.php:175 lib/settingsaction.php:87
+msgid "Email"
+msgstr ""
+
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr ""
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr ""
+
+#: ../actions/register.php:73 actions/register.php:80
+msgid "Email address already exists."
+msgstr "Η διε�θυνση email υπά�χει ήδη."
+
+#: ../lib/mail.php:90 lib/mail.php:90
+msgid "Email address confirmation"
+msgstr "Επιβεβαίωση διε�θυνσης email"
+
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
+msgid "Enter a nickname or email address."
+msgstr "Εισάγετε ψευδώνυμο ή διε�θυνση email."
+
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
+msgid "Error authorizing token"
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+msgid "Error connecting user to OpenID."
+msgstr ""
+
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
+msgid "Error connecting user."
+msgstr ""
+
+#: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153
+msgid "Error inserting avatar"
+msgstr ""
+
+#: ../actions/finishremotesubscribe.php:143
+#: actions/finishremotesubscribe.php:145
+msgid "Error inserting new profile"
+msgstr ""
+
+#: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169
+msgid "Error inserting remote profile"
+msgstr ""
+
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
+msgid "Error saving address confirmation."
+msgstr ""
+
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
+msgid "Error saving remote profile"
+msgstr ""
+
+#: ../lib/openid.php:226 lib/openid.php:226
+msgid "Error saving the profile."
+msgstr ""
+
+#: ../lib/openid.php:237 lib/openid.php:237
+msgid "Error saving the user."
+msgstr ""
+
+#: ../actions/password.php:80 actions/profilesettings.php:399
+msgid "Error saving user; invalid."
+msgstr ""
+
+#: ../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
+msgid "Error setting user."
+msgstr ""
+
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
+msgid "Error updating profile"
+msgstr ""
+
+#: ../actions/finishremotesubscribe.php:161
+#: actions/finishremotesubscribe.php:163
+msgid "Error updating remote profile"
+msgstr ""
+
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
+msgid "Error with confirmation code."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
+msgid "Existing nickname"
+msgstr ""
+
+#: ../lib/util.php:326 lib/util.php:342
+msgid "FAQ"
+msgstr "Συχνές ε�ωτήσεις"
+
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+msgid "Failed updating avatar."
+msgstr ""
+
+#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
+#: actions/allrss.php:64
+#, php-format
+msgid "Feed for friends of %s"
+msgstr "Ροή φίλων του/της %s"
+
+#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: actions/replies.php:65 actions/repliesrss.php:66
+#, php-format
+msgid "Feed for replies to %s"
+msgstr "Ροή απαντήσεων π�ος τον/την %s"
+
+#: ../actions/tag.php:55 actions/tag.php:55
+#, php-format
+msgid "Feed for tag %s"
+msgstr ""
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr ""
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr ""
+
+#: ../actions/login.php:122
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr ""
+"Για λόγους ασφαλείας, πα�ακαλώ εισάγετε "
+"ξανά το όνομα χ�ήστη και τον κωδικό σας, π�ιν αλλάξετε τις �υθμίσεις σας."
+
+#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: actions/profilesettings.php:77 actions/register.php:178
+msgid "Full name"
+msgstr "Ονοματεπώνυμο"
+
+#: ../actions/profilesettings.php:98 ../actions/register.php:79
+#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
+#: actions/register.php:86 actions/updateprofile.php:94
+msgid "Full name is too long (max 255 chars)."
+msgstr "Το ονοματεπώνυμο είναι πολ� μεγάλο (μέγιστο 255 χα�ακτ.)."
+
+#: ../lib/util.php:322 lib/util.php:338
+msgid "Help"
+msgstr "Βοήθεια"
+
+#: ../lib/util.php:298 lib/util.php:314
+msgid "Home"
+msgstr "Α�χή"
+
+#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: actions/profilesettings.php:79 actions/register.php:181
+msgid "Homepage"
+msgstr "Α�χική σελίδα"
+
+#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: actions/profilesettings.php:210 actions/register.php:83
+msgid "Homepage is not a valid URL."
+msgstr "Η α�χική σελίδα δεν είναι έγκυ�ο URL."
+
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+msgid "I want to post notices by email."
+msgstr ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+msgid "IM"
+msgstr ""
+
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
+msgid "IM Address"
+msgstr ""
+
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
+msgid "IM Settings"
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your OpenID."
+msgstr ""
+
+#: ../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 ""
+
+#: ../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
+msgid "Incoming email"
+msgstr ""
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+msgid "Incoming email address removed."
+msgstr ""
+
+#: ../actions/password.php:69 actions/profilesettings.php:388
+msgid "Incorrect old password"
+msgstr "Λάθος παλιός κωδικός"
+
+#: ../actions/login.php:67 actions/login.php:67
+msgid "Incorrect username or password."
+msgstr "Λάθος όνομα χ�ήστη ή κωδικός"
+
+#: ../actions/recoverpassword.php:265
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr ""
+"Οδηγίες για την ανάκτηση του κωδικο� σας "
+"έχουν σταλεί στην διε�θυνση email που έχετε καταχω�ίσει στον λογα�ιασμό σας."
+
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
+#, php-format
+msgid "Invalid avatar URL '%s'"
+msgstr ""
+
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
+#, php-format
+msgid "Invalid homepage '%s'"
+msgstr ""
+
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
+#, php-format
+msgid "Invalid license URL '%s'"
+msgstr ""
+
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+msgid "Invalid notice content"
+msgstr ""
+
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+msgid "Invalid notice uri"
+msgstr ""
+
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+msgid "Invalid notice url"
+msgstr ""
+
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
+#, php-format
+msgid "Invalid profile URL '%s'."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
+msgid "Invalid profile URL (bad format)"
+msgstr ""
+
+#: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79
+msgid "Invalid profile URL returned by server."
+msgstr ""
+
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
+msgid "Invalid size."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
+#: ../actions/register.php:111 actions/finishopenidlogin.php:241
+#: actions/register.php:103 actions/register.php:121
+msgid "Invalid username or password."
+msgstr ""
+
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../lib/util.php:261 lib/util.php:277
+#, 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 ""
+
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
+msgid "Jabber ID already belongs to another user."
+msgstr ""
+
+#: ../actions/imsettings.php:62 actions/imsettings.php:63
+#, 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 ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Language"
+msgstr ""
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+msgid "Language is too long (max 50 chars)."
+msgstr ""
+
+#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: actions/profilesettings.php:85 actions/register.php:187
+msgid "Location"
+msgstr "Τοποθεσία"
+
+#: ../actions/profilesettings.php:104 ../actions/register.php:85
+#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
+#: actions/register.php:92 actions/updateprofile.php:109
+msgid "Location is too long (max 255 chars)."
+msgstr "Η τοποθεσία είναι πολ� μεγάλη (μέγιστο 255 χα�ακτ.)."
+
+#: ../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
+msgid "Login"
+msgstr "Σ�νδεση"
+
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#, php-format
+msgid "Login with an [OpenID](%%doc.openid%%) account."
+msgstr "Συνδεθείτε με έναν λογα�ιασμό [OpenID](%%doc.openid%%)."
+
+#: ../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 ""
+"Συνδεθείτε με το όνομα χ�ήστη και τον "
+"κωδικό σας. Δεν έχετε όνομα χ�ήστη ακόμα; "
+"Κάντε [εγγ�αφή](%%action.register%%) για ένα νέο λογα�ιασμό ή δοκιμάστε το [OpenID](%%action.openidlogin%%). "
+
+#: ../lib/util.php:308 lib/util.php:324
+msgid "Logout"
+msgstr "Αποσ�νδεση"
+
+#: ../actions/register.php:166 actions/register.php:180
+msgid "Longer name, preferably your \"real\" name"
+msgstr ""
+
+#: ../actions/login.php:110 actions/login.php:110
+msgid "Lost or forgotten password?"
+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 ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
+#: ../actions/showstream.php:300 actions/showstream.php:315
+msgid "Member since"
+msgstr "Μέλος από"
+
+#: ../actions/userrss.php:70 actions/userrss.php:67
+#, php-format
+msgid "Microblog by %s"
+msgstr ""
+
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+msgid "My text and files are available under "
+msgstr ""
+
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr ""
+
+#: ../lib/mail.php:144 lib/mail.php:144
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+msgid "New incoming email address added."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
+msgid "New nickname"
+msgstr "�έο ψευδώνυμο"
+
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+msgid "New notice"
+msgstr ""
+
+#: ../actions/password.php:41 ../actions/recoverpassword.php:179
+#: actions/profilesettings.php:180 actions/recoverpassword.php:185
+msgid "New password"
+msgstr "�έος κωδικός"
+
+#: ../actions/recoverpassword.php:314
+msgid "New password successfully saved. You are now logged in."
+msgstr ""
+
+#: ../actions/login.php:101 ../actions/profilesettings.php:41
+#: ../actions/register.php:151 actions/login.php:101
+#: actions/profilesettings.php:74 actions/register.php:165
+msgid "Nickname"
+msgstr "Ψευδώνυμο"
+
+#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
+#: ../actions/register.php:69 actions/finishopenidlogin.php:181
+#: actions/profilesettings.php:225 actions/register.php:76
+msgid "Nickname already in use. Try another one."
+msgstr "Το ψευδώνυμο είναι ήδη σε χ�ήση. Δοκιμάστε κάποιο άλλο."
+
+#: ../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
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "Το ψευδώνυμο π�έπει να έχει μόνο πεζο�ς χα�ακτή�ες και χω�ίς κενά."
+
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+msgid "Nickname not allowed."
+msgstr "Το ψευδώνυμο αυτό δεν επιτ�έπεται."
+
+#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
+msgid "Nickname of the user you want to follow"
+msgstr "Το ψευδώνυμο του χ�ήστη που θέλετε να πα�ακολουθήσετε"
+
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
+msgid "Nickname or email"
+msgstr "Ψευδώνυμο ή email"
+
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+msgid "No"
+msgstr ""
+
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
+msgid "No Jabber ID."
+msgstr ""
+
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
+msgid "No authorization request!"
+msgstr ""
+
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr ""
+
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
+msgid "No confirmation code."
+msgstr ""
+
+#: ../actions/newnotice.php:44 actions/newmessage.php:53
+#: actions/newnotice.php:44 classes/Command.php:197
+msgid "No content!"
+msgstr ""
+
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+msgid "No email address."
+msgstr ""
+
+#: ../actions/userbyid.php:32 actions/userbyid.php:32
+msgid "No id."
+msgstr ""
+
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+msgid "No incoming email address."
+msgstr ""
+
+#: ../actions/finishremotesubscribe.php:65
+#: actions/finishremotesubscribe.php:67
+msgid "No nickname provided by remote server."
+msgstr ""
+
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
+msgid "No nickname."
+msgstr ""
+
+#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
+#: ../actions/smssettings.php:229 actions/emailsettings.php:240
+#: actions/imsettings.php:214 actions/smssettings.php:237
+msgid "No pending confirmation to cancel."
+msgstr ""
+
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr ""
+
+#: ../actions/finishremotesubscribe.php:72
+#: actions/finishremotesubscribe.php:74
+msgid "No profile URL returned by server."
+msgstr ""
+
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
+msgid "No registered email address for that user."
+msgstr ""
+
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
+msgid "No request found!"
+msgstr ""
+
+#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
+#: actions/noticesearch.php:69 actions/peoplesearch.php:69
+msgid "No results"
+msgstr ""
+
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
+msgid "No size."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+msgid "No status with that ID found."
+msgstr ""
+
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
+msgid "No such OpenID."
+msgstr ""
+
+#: ../actions/doc.php:29 actions/doc.php:29
+msgid "No such document."
+msgstr ""
+
+#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
+#: ../lib/deleteaction.php:30 actions/shownotice.php:32
+#: actions/shownotice.php:83 lib/deleteaction.php:30
+msgid "No such notice."
+msgstr ""
+
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
+msgid "No such recovery code."
+msgstr ""
+
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
+msgid "No such subscription"
+msgstr ""
+
+#: ../actions/all.php:34 ../actions/allrss.php:35
+#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
+#: ../actions/remotesubscribe.php:84 ../actions/remotesubscribe.php:91
+#: ../actions/replies.php:57 ../actions/repliesrss.php:35
+#: ../actions/showstream.php:110 ../actions/userbyid.php:36
+#: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
+#: ../lib/subs.php:33 ../lib/subs.php:82 actions/all.php:34
+#: actions/allrss.php:35 actions/avatarbynickname.php:43
+#: actions/favoritesrss.php:35 actions/foaf.php:40 actions/ical.php:31
+#: actions/remotesubscribe.php:93 actions/remotesubscribe.php:100
+#: actions/replies.php:57 actions/repliesrss.php:35
+#: actions/showfavorites.php:34 actions/showstream.php:110
+#: actions/userbyid.php:36 actions/userrss.php:35 actions/xrds.php:35
+#: classes/Command.php:120 classes/Command.php:162 classes/Command.php:203
+#: classes/Command.php:237 lib/gallery.php:62 lib/mailbox.php:36
+#: lib/subs.php:33 lib/subs.php:95
+msgid "No such user."
+msgstr ""
+
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../lib/gallery.php:80 lib/gallery.php:85
+msgid "Nobody to show!"
+msgstr ""
+
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
+msgid "Not a recovery code."
+msgstr ""
+
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+msgid "Not a registered user."
+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
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/imsettings.php:167 actions/imsettings.php:175
+msgid "Not a valid Jabber ID"
+msgstr ""
+
+#: ../lib/openid.php:131 lib/openid.php:131
+msgid "Not a valid OpenID."
+msgstr ""
+
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../actions/register.php:63 actions/register.php:70
+msgid "Not a valid email address."
+msgstr ""
+
+#: ../actions/profilesettings.php:91 ../actions/register.php:71
+#: actions/profilesettings.php:206 actions/register.php:78
+msgid "Not a valid nickname."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
+msgid "Not a valid profile URL (incorrect services)."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
+msgid "Not a valid profile URL (no XRDS defined)."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
+msgid "Not a valid profile URL (no YADIS document)."
+msgstr ""
+
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+msgid "Not an image or corrupt file."
+msgstr ""
+
+#: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53
+msgid "Not authorized."
+msgstr ""
+
+#: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38
+msgid "Not expecting this response!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+msgid "Not found"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
+#: ../actions/newnotice.php:29 ../actions/subscribe.php:28
+#: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
+#: ../lib/settingsaction.php:27 actions/disfavor.php:29 actions/favor.php:30
+#: actions/finishaddopenid.php:29 actions/logout.php:33
+#: actions/newmessage.php:28 actions/newnotice.php:29 actions/subscribe.php:28
+#: actions/unsubscribe.php:25 lib/deleteaction.php:38
+#: lib/settingsaction.php:27
+msgid "Not logged in."
+msgstr ""
+
+#: ../lib/subs.php:91 lib/subs.php:104
+msgid "Not subscribed!."
+msgstr ""
+
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr ""
+
+#: ../actions/showstream.php:82 actions/showstream.php:82
+#, php-format
+msgid "Notice feed for %s"
+msgstr ""
+
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+msgid "Notice has no profile"
+msgstr ""
+
+#: ../actions/showstream.php:316 actions/showstream.php:331
+msgid "Notices"
+msgstr ""
+
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
+
+#: ../actions/password.php:39 actions/profilesettings.php:178
+msgid "Old password"
+msgstr ""
+
+#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
+#: lib/util.php:330
+msgid "OpenID"
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
+msgid "OpenID Account Setup"
+msgstr ""
+
+#: ../lib/openid.php:180 lib/openid.php:180
+msgid "OpenID Auto-Submit"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
+#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
+#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
+msgid "OpenID Login"
+msgstr ""
+
+#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
+#: actions/openidlogin.php:74 actions/openidsettings.php:50
+msgid "OpenID URL"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
+#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
+msgid "OpenID authentication cancelled."
+msgstr ""
+
+#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
+#, php-format
+msgid "OpenID authentication failed: %s"
+msgstr ""
+
+#: ../lib/openid.php:133 lib/openid.php:133
+#, php-format
+msgid "OpenID failure: %s"
+msgstr ""
+
+#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
+msgid "OpenID removed."
+msgstr "Το OpenID αφαι�έθηκε."
+
+#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
+msgid "OpenID settings"
+msgstr "Ρυθμίσεις OpenID"
+
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+msgid "Partial upload."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
+#: ../actions/register.php:153 ../lib/settingsaction.php:93
+#: actions/finishopenidlogin.php:96 actions/login.php:102
+#: actions/register.php:167
+msgid "Password"
+msgstr "Κωδικός"
+
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
+msgid "Password and confirmation do not match."
+msgstr "Ο κωδικός και η επιβεβαίωση του δεν ταυτίζονται."
+
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
+msgid "Password must be 6 chars or more."
+msgstr "Ο κωδικός π�έπει να είναι 6 χα�ακτή�ες ή πε�ισσότε�οι."
+
+#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
+msgid "Password recovery requested"
+msgstr ""
+
+#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: actions/profilesettings.php:408 actions/recoverpassword.php:326
+msgid "Password saved."
+msgstr "Ο κωδικός αποθηκε�τηκε."
+
+#: ../actions/password.php:61 ../actions/register.php:88
+#: actions/profilesettings.php:380 actions/register.php:98
+msgid "Passwords don't match."
+msgstr "Οι κωδικοί δεν ταυτίζονται."
+
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr ""
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr ""
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
+msgid "People search"
+msgstr ""
+
+#: ../lib/stream.php:50 lib/personal.php:50
+msgid "Personal"
+msgstr "Π�οσωπικά"
+
+#: ../actions/invite.php:133 actions/invite.php:141
+msgid "Personal message"
+msgstr ""
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#: ../actions/userauthorization.php:78
+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 \"Cancel\"."
+msgstr ""
+
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr ""
+
+#: ../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
+msgid "Preferences"
+msgstr "Π�οτιμήσεις"
+
+#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
+#: ../actions/smssettings.php:163 actions/emailsettings.php:180
+#: actions/imsettings.php:152 actions/smssettings.php:171
+msgid "Preferences saved."
+msgstr "Οι π�οτιμήσεις αποθηκε�τηκαν"
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Preferred language"
+msgstr ""
+
+#: ../lib/util.php:328 lib/util.php:344
+msgid "Privacy"
+msgstr ""
+
+#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
+#: classes/Notice.php:119
+msgid "Problem saving notice."
+msgstr ""
+
+#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
+#: lib/settingsaction.php:84
+msgid "Profile"
+msgstr ""
+
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
+msgid "Profile URL"
+msgstr ""
+
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
+msgid "Profile settings"
+msgstr ""
+
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: actions/postnotice.php:52 actions/updateprofile.php:53
+msgid "Profile unknown"
+msgstr ""
+
+#: ../actions/public.php:54 actions/public.php:54
+msgid "Public Stream Feed"
+msgstr ""
+
+#: ../actions/public.php:33 actions/public.php:33
+msgid "Public timeline"
+msgstr ""
+
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
+msgid "Recover"
+msgstr ""
+
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
+msgid "Recover password"
+msgstr ""
+
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
+msgid "Recovery code for unknown user."
+msgstr ""
+
+#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: actions/register.php:152 actions/register.php:207 lib/util.php:328
+msgid "Register"
+msgstr ""
+
+#: ../actions/register.php:28 actions/register.php:28
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+msgid "Registration successful"
+msgstr ""
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
+msgid "Reject"
+msgstr ""
+
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190
+msgid "Remember me"
+msgstr ""
+
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
+msgid "Remote profile with no matching profile"
+msgstr ""
+
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+msgid "Remote subscribe"
+msgstr ""
+
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
+#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59
+msgid "Remove"
+msgstr ""
+
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
+msgid "Remove OpenID"
+msgstr ""
+
+#: ../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 ""
+
+#: ../lib/stream.php:55 lib/personal.php:55
+msgid "Replies"
+msgstr ""
+
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
+#, php-format
+msgid "Replies to %s"
+msgstr ""
+
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
+msgid "Reset"
+msgstr ""
+
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
+msgid "Reset password"
+msgstr ""
+
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
+msgid "Same as password above"
+msgstr ""
+
+#: ../actions/register.php:156 actions/register.php:170
+msgid "Same as password above. Required."
+msgstr ""
+
+#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
+#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
+#: actions/emailsettings.php:104 actions/imsettings.php:82
+#: actions/profilesettings.php:101 actions/smssettings.php:100
+#: actions/twittersettings.php:83
+msgid "Save"
+msgstr ""
+
+#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
+#: lib/util.php:316
+msgid "Search"
+msgstr ""
+
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+msgid "Search Stream Feed"
+msgstr ""
+
+#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#, php-format
+msgid ""
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
+msgstr ""
+
+#: ../actions/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 ""
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr ""
+
+#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
+#: lib/util.php:1306 lib/util.php:1731
+msgid "Send"
+msgstr ""
+
+#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
+#: actions/emailsettings.php:74 actions/smssettings.php:82
+msgid "Send email to this address to post new notices."
+msgstr ""
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
+msgid "Send me notices through Jabber/GTalk."
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../lib/util.php:304 lib/util.php:320
+msgid "Settings"
+msgstr ""
+
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+msgid "Settings saved."
+msgstr ""
+
+#: ../actions/tag.php:60 actions/tag.php:60
+msgid "Showing most popular tags from the last week"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
+msgid "Someone else already has this OpenID."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
+#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
+msgid "Something weird happened."
+msgstr ""
+
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../lib/util.php:330 lib/util.php:346
+msgid "Source"
+msgstr ""
+
+#: ../actions/showstream.php:296 actions/showstream.php:311
+msgid "Statistics"
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
+msgid "Stored OpenID not found."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
+#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
+#: actions/showstream.php:197 actions/showstream.php:206
+msgid "Subscribe"
+msgstr ""
+
+#: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: actions/showstream.php:328 actions/subscribers.php:27
+msgid "Subscribers"
+msgstr ""
+
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
+msgid "Subscription authorized"
+msgstr ""
+
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
+msgid "Subscription rejected"
+msgstr ""
+
+#: ../actions/showstream.php:230 ../actions/showstream.php:307
+#: ../actions/subscriptions.php:27 actions/showstream.php:240
+#: actions/showstream.php:322 actions/subscriptions.php:27
+msgid "Subscriptions"
+msgstr ""
+
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
+msgid "System error uploading file."
+msgstr ""
+
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317
+msgid "Tags"
+msgstr ""
+
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
+msgid "Text"
+msgstr ""
+
+#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
+msgid "Text search"
+msgstr ""
+
+#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
+msgid "That OpenID does not belong to you."
+msgstr ""
+
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
+msgid "That address has already been confirmed."
+msgstr ""
+
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
+msgid "That confirmation code is not for you!"
+msgstr ""
+
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+msgid "That file is too big."
+msgstr ""
+
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
+msgid "That is already your Jabber ID."
+msgstr ""
+
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
+msgid "That is not your Jabber ID."
+msgstr ""
+
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+msgid "That is not your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+msgid "That is not your phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
+#: actions/emailsettings.php:244 actions/imsettings.php:218
+msgid "That is the wrong IM address."
+msgstr ""
+
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: actions/newnotice.php:49 actions/twitapistatuses.php:330
+msgid "That's too long. Max notice size is 140 chars."
+msgstr ""
+
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr ""
+
+#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
+#: ../actions/smssettings.php:274 actions/emailsettings.php:282
+#: actions/imsettings.php:258 actions/smssettings.php:282
+msgid "The address was removed."
+msgstr ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#, php-format
+msgid "These are the people who listen to %s's notices."
+msgstr ""
+
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
+msgid "These are the people who listen to your notices."
+msgstr ""
+
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#, php-format
+msgid "These are the people whose notices %s listens to."
+msgstr ""
+
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+msgid "These are the people whose notices you listen to."
+msgstr ""
+
+#: ../actions/invite.php:89 actions/invite.php:96
+msgid ""
+"These people are already users and you were automatically subscribed to "
+"them:"
+msgstr ""
+
+#: ../actions/recoverpassword.php:88
+msgid "This confirmation code is too old. Please start again."
+msgstr ""
+
+#: ../lib/openid.php:195
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
+#, php-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511
+msgid "This method requires a POST or 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
+msgid "This method requires a POST."
+msgstr ""
+
+#: ../lib/util.php:164 lib/util.php:246
+msgid "This page is not available in a media type you accept"
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+msgid "Timezone not selected."
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+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
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr ""
+
+#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
+msgid "URL of your profile on another compatible microblogging service"
+msgstr ""
+
+#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
+#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: actions/emailsettings.php:144 actions/imsettings.php:118
+#: actions/recoverpassword.php:39 actions/smssettings.php:143
+#: actions/twittersettings.php:108
+msgid "Unexpected form submission."
+msgstr ""
+
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
+msgid "Unexpected password reset."
+msgstr ""
+
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
+#: ../actions/finishremotesubscribe.php:58
+#: actions/finishremotesubscribe.php:60
+msgid "Unknown version of OMB protocol."
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr ""
+
+#: ../actions/showstream.php:209 actions/showstream.php:219
+msgid "Unsubscribe"
+msgstr ""
+
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: actions/postnotice.php:45 actions/updateprofile.php:46
+msgid "Unsupported OMB version"
+msgstr ""
+
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+msgid "Unsupported image file format."
+msgstr ""
+
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: ../actions/avatar.php:68 actions/profilesettings.php:161
+msgid "Upload"
+msgstr ""
+
+#: ../actions/avatar.php:27
+msgid ""
+"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 license, also. Use a picture that belongs to you and that you want to "
+"share."
+msgstr ""
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../actions/invite.php:114 actions/invite.php:121
+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
+msgid "Used only for updates, announcements, and password recovery"
+msgstr ""
+
+#: ../actions/finishremotesubscribe.php:86
+#: actions/finishremotesubscribe.php:88
+msgid "User being listened to doesn't exist."
+msgstr ""
+
+#: ../actions/all.php:41 ../actions/avatarbynickname.php:48
+#: ../actions/foaf.php:47 ../actions/replies.php:41
+#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
+#: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
+#: ../actions/twitapiusers.php:82 actions/all.php:41
+#: actions/avatarbynickname.php:48 actions/foaf.php:47 actions/replies.php:41
+#: actions/showfavorites.php:41 actions/showstream.php:44
+#: actions/twitapiaccount.php:80 actions/twitapifavorites.php:68
+#: actions/twitapistatuses.php:235 actions/twitapistatuses.php:609
+#: actions/twitapiusers.php:87 lib/mailbox.php:50
+msgid "User has no profile."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
+msgid "User nickname"
+msgstr ""
+
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../lib/util.php:1159 lib/util.php:1293
+#, php-format
+msgid "What's up, %s?"
+msgstr ""
+
+#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: actions/profilesettings.php:87 actions/register.php:189
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr ""
+
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#, php-format
+msgid "Wrong image type for '%s'"
+msgstr ""
+
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#, php-format
+msgid "Wrong size image at '%s'"
+msgstr ""
+
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+msgid "Yes"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
+msgid "You already have this OpenID!"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
+msgid "You are already logged in!"
+msgstr ""
+
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+msgid "You are not friends with the specified user."
+msgstr ""
+
+#: ../actions/password.php:27
+msgid "You can change your password here. Choose a good one!"
+msgstr ""
+
+#: ../actions/register.php:135 actions/register.php:145
+msgid "You can create a new account to start posting notices."
+msgstr ""
+
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
+#: ../actions/openidsettings.php:86
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+
+#: ../actions/imsettings.php:28 actions/imsettings.php:28
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
+msgstr ""
+
+#: ../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
+msgid "You can use the local subscription!"
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: actions/finishopenidlogin.php:38 actions/register.php:68
+msgid "You can't register if you don't agree to the license."
+msgstr ""
+
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
+msgid "You did not send us that profile"
+msgstr ""
+
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr ""
+
+#: ../actions/invite.php:103 actions/invite.php:110
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
+msgstr ""
+
+#: ../actions/recoverpassword.php:149
+msgid "You've been identified. Enter a  new password below. "
+msgstr ""
+
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+msgid "Your OpenID URL"
+msgstr ""
+
+#: ../actions/recoverpassword.php:164
+msgid "Your nickname on this server, or your registered email address."
+msgstr ""
+
+#: ../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 ""
+
+#: ../lib/util.php:943 lib/util.php:992
+msgid "a few seconds ago"
+msgstr ""
+
+#: ../lib/util.php:955 lib/util.php:1004
+#, php-format
+msgid "about %d days ago"
+msgstr ""
+
+#: ../lib/util.php:951 lib/util.php:1000
+#, php-format
+msgid "about %d hours ago"
+msgstr ""
+
+#: ../lib/util.php:947 lib/util.php:996
+#, php-format
+msgid "about %d minutes ago"
+msgstr ""
+
+#: ../lib/util.php:959 lib/util.php:1008
+#, php-format
+msgid "about %d months ago"
+msgstr ""
+
+#: ../lib/util.php:953 lib/util.php:1002
+msgid "about a day ago"
+msgstr ""
+
+#: ../lib/util.php:945 lib/util.php:994
+msgid "about a minute ago"
+msgstr ""
+
+#: ../lib/util.php:957 lib/util.php:1006
+msgid "about a month ago"
+msgstr ""
+
+#: ../lib/util.php:961 lib/util.php:1010
+msgid "about a year ago"
+msgstr ""
+
+#: ../lib/util.php:949 lib/util.php:998
+msgid "about an hour ago"
+msgstr ""
+
+#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99
+msgid "delete"
+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
+msgid "in reply to..."
+msgstr ""
+
+#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
+#: ../lib/stream.php:124 actions/noticesearch.php:143
+#: actions/showstream.php:433 lib/stream.php:91
+msgid "reply"
+msgstr ""
+
+#: ../actions/password.php:44 actions/profilesettings.php:183
+msgid "same as password above"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+msgid "unsupported file type"
+msgstr ""
+
+#: ../lib/util.php:1309 lib/util.php:1443
+msgid "« After"
+msgstr ""
+
+#: actions/deletenotice.php:74 actions/disfavor.php:43
+#: actions/emailsettings.php:127 actions/favor.php:45
+#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
+#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
+#: actions/openidsettings.php:123 actions/profilesettings.php:47
+#: actions/recoverpassword.php:282 actions/register.php:42
+#: actions/remotesubscribe.php:40 actions/smssettings.php:124
+#: actions/subscribe.php:44 actions/twittersettings.php:97
+#: actions/unsubscribe.php:41 actions/userauthorization.php:35
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/disfavor.php:55
+msgid "This notice is not a favorite!"
+msgstr ""
+
+#: actions/disfavor.php:63
+msgid "Could not delete favorite."
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Favor"
+msgstr ""
+
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+
+#: actions/emailsettings.php:95
+msgid "Send me email when someone sends me a private message."
+msgstr ""
+
+#: actions/favor.php:53 actions/twitapifavorites.php:142
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132
+msgid "Could not create favorite."
+msgstr ""
+
+#: actions/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#, php-format
+msgid "%s favorite notices"
+msgstr ""
+
+#: actions/favoritesrss.php:64
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr ""
+
+#: actions/inbox.php:28
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+
+#: actions/invite.php:178
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+msgstr ""
+
+#: actions/login.php:104
+msgid "Automatically login in the future; "
+msgstr ""
+
+#: actions/login.php:122
+msgid "For security reasons, please re-enter your "
+msgstr ""
+
+#: actions/login.php:126
+msgid "Login with your username and password. "
+msgstr ""
+
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+msgid "That's too long. Max message size is 140 chars."
+msgstr ""
+
+#: actions/newmessage.php:65
+msgid "No recipient specified."
+msgstr ""
+
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206
+msgid "You can't send a message to this user."
+msgstr ""
+
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly "
+"instead."
+msgstr ""
+
+#: actions/newmessage.php:108
+msgid "No such user"
+msgstr ""
+
+#: actions/newmessage.php:117
+msgid "New message"
+msgstr ""
+
+#: actions/noticesearch.php:95
+msgid "Notice without matching profile"
+msgstr ""
+
+#: actions/openidsettings.php:28
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr ""
+
+#: actions/openidsettings.php:46
+msgid "If you want to add an OpenID to your account, "
+msgstr ""
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr ""
+
+#: actions/openidsettings.php:87
+msgid "You can remove an OpenID from your account "
+msgstr ""
+
+#: actions/outbox.php:28
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr ""
+
+#: actions/outbox.php:30
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#: actions/outbox.php:53
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+
+#: actions/peoplesearch.php:28
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+msgstr ""
+
+#: actions/profilesettings.php:27
+msgid "You can update your personal profile info here "
+msgstr ""
+
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+msgid "User without matching profile"
+msgstr ""
+
+#: actions/recoverpassword.php:91
+msgid "This confirmation code is too old. "
+msgstr ""
+
+#: actions/recoverpassword.php:141
+msgid "If you've forgotten or lost your"
+msgstr ""
+
+#: actions/recoverpassword.php:154
+msgid "You've been identified. Enter a "
+msgstr ""
+
+#: actions/recoverpassword.php:169
+msgid "Your nickname on this server, "
+msgstr ""
+
+#: actions/recoverpassword.php:271
+msgid "Instructions for recovering your password "
+msgstr ""
+
+#: actions/recoverpassword.php:327
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95
+msgid "Password must be 6 or more characters."
+msgstr ""
+
+#: actions/register.php:216
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
+msgstr ""
+
+#: actions/register.php:227
+msgid "(You should receive a message by email momentarily, with "
+msgstr ""
+
+#: actions/remotesubscribe.php:51
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
+msgstr ""
+
+#: actions/showfavorites.php:61
+#, php-format
+msgid "Feed for favorites of %s"
+msgstr ""
+
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+msgid "Could not retrieve favorite notices."
+msgstr ""
+
+#: actions/showmessage.php:33
+msgid "No such message."
+msgstr ""
+
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
+msgstr ""
+
+#: actions/showmessage.php:61
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr ""
+
+#: actions/showmessage.php:66
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr ""
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr ""
+
+#: actions/smssettings.php:312
+#, php-format
+msgid "Mobile carrier for your phone. "
+msgstr ""
+
+#: actions/twitapidirect_messages.php:76
+#, php-format
+msgid "Direct messages to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:77
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:81
+msgid "Direct Messages You've Sent"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:82
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:128
+msgid "No message text!"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:138
+msgid "Recipient user not found."
+msgstr ""
+
+#: actions/twitapidirect_messages.php:141
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
+#: actions/twitapifavorites.php:92
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr ""
+
+#: actions/twitapifavorites.php:95
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr ""
+
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#, php-format
+msgid "%s added your notice as a favorite"
+msgstr ""
+
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+msgstr ""
+
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+msgstr ""
+
+#: actions/twittersettings.php:41
+msgid "Twitter settings"
+msgstr ""
+
+#: actions/twittersettings.php:48
+msgid "Twitter Account"
+msgstr ""
+
+#: actions/twittersettings.php:56
+msgid "Current verified Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr ""
+
+#: actions/twittersettings.php:65
+msgid "No spaces, please."
+msgstr ""
+
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr ""
+
+#: actions/twittersettings.php:72
+msgid "Automatically send my notices to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:75
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:78
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+
+#: actions/twittersettings.php:128
+msgid "Could not verify your Twitter credentials!"
+msgstr ""
+
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+msgid "Unable to save your Twitter settings!"
+msgstr ""
+
+#: actions/twittersettings.php:174
+msgid "Twitter settings saved."
+msgstr ""
+
+#: actions/twittersettings.php:192
+msgid "That is not your Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+msgid "Couldn't remove Twitter user."
+msgstr ""
+
+#: actions/twittersettings.php:212
+msgid "Twitter account removed."
+msgstr ""
+
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+msgid "Couldn't save Twitter preferences."
+msgstr ""
+
+#: actions/twittersettings.php:245
+msgid "Twitter preferences saved."
+msgstr ""
+
+#: actions/userauthorization.php:84
+msgid "Please check these details to make sure "
+msgstr ""
+
+#: actions/userauthorization.php:324
+msgid "The subscription has been authorized, but no "
+msgstr ""
+
+#: actions/userauthorization.php:334
+msgid "The subscription has been rejected, but no "
+msgstr ""
+
+#: classes/Channel.php:113
+msgid "Command results"
+msgstr ""
+
+#: classes/Channel.php:148
+msgid "Command complete"
+msgstr ""
+
+#: classes/Channel.php:158
+msgid "Command failed"
+msgstr ""
+
+#: classes/Command.php:39
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: classes/Command.php:96
+#, php-format
+msgid "Subscriptions: %1$s\n"
+msgstr ""
+
+#: classes/Command.php:125 classes/Command.php:242
+msgid "User has no last notice"
+msgstr ""
+
+#: classes/Command.php:146
+msgid "Notice marked as fave."
+msgstr ""
+
+#: classes/Command.php:166
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr ""
+
+#: classes/Command.php:169
+#, php-format
+msgid "Fullname: %s"
+msgstr ""
+
+#: classes/Command.php:172
+#, php-format
+msgid "Location: %s"
+msgstr ""
+
+#: classes/Command.php:175
+#, php-format
+msgid "Homepage: %s"
+msgstr ""
+
+#: classes/Command.php:178
+#, php-format
+msgid "About: %s"
+msgstr ""
+
+#: classes/Command.php:200
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
+
+#: classes/Command.php:214
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
+
+#: classes/Command.php:216
+msgid "Error sending direct message."
+msgstr ""
+
+#: classes/Command.php:263
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: classes/Command.php:270
+#, php-format
+msgid "Subscribed to %s"
+msgstr ""
+
+#: classes/Command.php:288
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
+
+#: classes/Command.php:295
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr ""
+
+#: classes/Command.php:310 classes/Command.php:330
+msgid "Command not yet implemented."
+msgstr ""
+
+#: classes/Command.php:313
+msgid "Notification off."
+msgstr ""
+
+#: classes/Command.php:315
+msgid "Can't turn off notification."
+msgstr ""
+
+#: classes/Command.php:333
+msgid "Notification on."
+msgstr ""
+
+#: classes/Command.php:335
+msgid "Can't turn on notification."
+msgstr ""
+
+#: classes/Command.php:344
+msgid "Commands:\n"
+msgstr ""
+
+#: classes/Message.php:53
+msgid "Could not insert message."
+msgstr ""
+
+#: classes/Message.php:63
+msgid "Could not update message with new URI."
+msgstr ""
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr ""
+
+#: lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:249
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:253
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+msgstr ""
+
+#: lib/mailbox.php:43
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/openid.php:195
+msgid "This form should automatically submit itself. "
+msgstr ""
+
+#: lib/personal.php:65
+msgid "Favorites"
+msgstr ""
+
+#: lib/personal.php:66
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
+#: lib/personal.php:66
+msgid "User"
+msgstr ""
+
+#: lib/personal.php:75
+msgid "Inbox"
+msgstr ""
+
+#: lib/personal.php:76
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personal.php:80
+msgid "Outbox"
+msgstr ""
+
+#: lib/personal.php:81
+msgid "Your sent messages"
+msgstr ""
+
+#: lib/settingsaction.php:99
+msgid "Twitter"
+msgstr ""
+
+#: lib/settingsaction.php:100
+msgid "Twitter integration options"
+msgstr ""
+
+#: lib/util.php:1718
+msgid "To"
+msgstr ""
+
+#: scripts/maildaemon.php:45
+msgid "Could not parse message."
+msgstr ""
diff --git a/locale/en_GB/LC_MESSAGES/laconica.mo b/locale/en_GB/LC_MESSAGES/laconica.mo
index 5a91fffe6..a62774f34 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 f0f31b419..726a771b1 100644
--- a/locale/en_GB/LC_MESSAGES/laconica.po
+++ b/locale/en_GB/LC_MESSAGES/laconica.po
@@ -1,5 +1,13 @@
+# #-#-#-#-#  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.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  laconica.pot (laconica)  #-#-#-#-#\n"
 "Project-Id-Version: laconica\n"
 "Report-Msgid-Bugs-To: john@nextraweb.com\n"
 "POT-Creation-Date: 2008-07-14 21:07+1200\n"
@@ -9,6 +17,16 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: ../actions/noticesearchrss.php:64
 #, php-format
@@ -28,7 +46,7 @@ msgstr ""
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s is now listening to your notices on %2$s."
 
-#: ../actions/subscribe.php:86
+#: ../actions/subscribe.php:86 ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -145,7 +163,8 @@ msgstr "Authorise subscription"
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Automatically log-in in the future; not for shared computers!"
 
-#: ../actions/avatar.php:32
+#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: actions/profilesettings.php:34
 msgid "Avatar"
 msgstr ""
 
@@ -168,7 +187,9 @@ msgstr ""
 msgid "Before »"
 msgstr "Before →"
 
-#: ../actions/profilesettings.php:52
+#: ../actions/profilesettings.php:52 ../actions/profilesettings.php:49
+#: ../actions/register.php:170 actions/profilesettings.php:82
+#: actions/register.php:184
 msgid "Bio"
 msgstr ""
 
@@ -230,7 +251,7 @@ msgstr "Connect"
 msgid "Connect existing account"
 msgstr "Connect existing account"
 
-#: ../lib/util.php:304
+#: ../lib/util.php:304 ../lib/util.php:332 lib/util.php:348
 msgid "Contact"
 msgstr ""
 
@@ -327,7 +348,9 @@ msgstr "DB error inserting reply: %s"
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Describe yourself and your interests in 140 chars"
 
-#: ../actions/register.php:181
+#: ../actions/register.php:181 ../actions/register.php:158
+#: ../actions/register.php:161 ../lib/settingsaction.php:87
+#: actions/register.php:172 actions/register.php:175 lib/settingsaction.php:87
 msgid "Email"
 msgstr ""
 
@@ -689,7 +712,8 @@ msgstr "Nickname or e-mail"
 msgid "No Jabber ID."
 msgstr "No Jabber ID."
 
-#: ../actions/userauthorization.php:128
+#: ../actions/userauthorization.php:128 ../actions/userauthorization.php:129
+#: actions/userauthorization.php:136
 msgid "No authorization request!"
 msgstr ""
 
@@ -842,7 +866,8 @@ msgstr "Notices"
 msgid "Old password"
 msgstr "Old password"
 
-#: ../lib/util.php:288
+#: ../lib/util.php:288 ../lib/settingsaction.php:96 ../lib/util.php:314
+#: lib/settingsaction.php:90 lib/util.php:330
 msgid "OpenID"
 msgstr ""
 
@@ -907,6 +932,8 @@ msgid "Password recovery requested"
 msgstr "Password recovery requested"
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:274
+#: ../actions/recoverpassword.php:313 actions/profilesettings.php:408
+#: actions/recoverpassword.php:326
 msgid "Password saved."
 msgstr ""
 
@@ -918,7 +945,7 @@ msgstr "Passwords don’t match."
 msgid "People search"
 msgstr "People search"
 
-#: ../lib/stream.php:44
+#: ../lib/stream.php:44 ../lib/stream.php:50 lib/personal.php:50
 msgid "Personal"
 msgstr ""
 
@@ -996,27 +1023,37 @@ msgstr "Recovery code for unknown user."
 msgid "Register"
 msgstr "Register"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/userauthorization.php:119 ../actions/userauthorization.php:120
+#: actions/userauthorization.php:127
 msgid "Reject"
 msgstr ""
 
 #: ../actions/login.php:99 ../actions/register.php:183
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190
 msgid "Remember me"
 msgstr ""
 
-#: ../actions/updateprofile.php:69
+#: ../actions/updateprofile.php:69 ../actions/updateprofile.php:70
+#: actions/updateprofile.php:71
 msgid "Remote profile with no matching profile"
 msgstr ""
 
-#: ../actions/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
 msgid "Remote subscribe"
 msgstr ""
 
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59
 msgid "Remove"
 msgstr ""
 
-#: ../actions/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
 msgid "Remove OpenID"
 msgstr ""
 
@@ -1026,40 +1063,51 @@ msgid ""
 "remove it, add another OpenID first."
 msgstr ""
 
-#: ../lib/stream.php:49
+#: ../lib/stream.php:49 ../lib/stream.php:55 lib/personal.php:55
 msgid "Replies"
 msgstr ""
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
+#: ../lib/stream.php:56 actions/replies.php:47 actions/repliesrss.php:62
+#: lib/personal.php:56
 #, php-format
 msgid "Replies to %s"
 msgstr ""
 
-#: ../actions/recoverpassword.php:168
+#: ../actions/recoverpassword.php:168 ../actions/recoverpassword.php:183
+#: actions/recoverpassword.php:189
 msgid "Reset"
 msgstr ""
 
-#: ../actions/recoverpassword.php:158
+#: ../actions/recoverpassword.php:158 ../actions/recoverpassword.php:173
+#: actions/recoverpassword.php:178
 msgid "Reset password"
 msgstr ""
 
 #: ../actions/recoverpassword.php:167 ../actions/register.php:180
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
 msgid "Same as password above"
 msgstr ""
 
 #: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
+#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
+#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
+#: actions/emailsettings.php:104 actions/imsettings.php:82
+#: actions/profilesettings.php:101 actions/smssettings.php:100
+#: actions/twittersettings.php:83
 msgid "Save"
 msgstr ""
 
-#: ../lib/searchaction.php:73 ../lib/util.php:277
+#: ../lib/searchaction.php:73 ../lib/util.php:277 ../lib/searchaction.php:84
+#: ../lib/util.php:300 lib/searchaction.php:84 lib/util.php:316
 msgid "Search"
 msgstr ""
 
-#: ../actions/noticesearch.php:80
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
 msgid "Search Stream Feed"
 msgstr ""
 
-#: ../actions/noticesearch.php:30
+#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -1073,52 +1121,64 @@ msgid ""
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 
-#: ../lib/util.php:982
+#: ../lib/util.php:982 ../actions/invite.php:137 ../lib/util.php:1172
+#: actions/invite.php:145 lib/util.php:1306 lib/util.php:1731
 msgid "Send"
 msgstr ""
 
-#: ../actions/imsettings.php:71
+#: ../actions/imsettings.php:71 ../actions/imsettings.php:70
+#: actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
-#: ../lib/util.php:282
+#: ../lib/util.php:282 ../lib/util.php:304 lib/util.php:320
 msgid "Settings"
 msgstr ""
 
-#: ../actions/profilesettings.php:183
+#: ../actions/profilesettings.php:183 ../actions/profilesettings.php:192
+#: actions/profilesettings.php:307
 msgid "Settings saved."
 msgstr ""
 
-#: ../actions/finishaddopenid.php:66
+#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
+#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
 msgid "Something weird happened."
 msgstr ""
 
-#: ../lib/util.php:302
+#: ../lib/util.php:302 ../lib/util.php:330 lib/util.php:346
 msgid "Source"
 msgstr ""
 
-#: ../actions/showstream.php:277
+#: ../actions/showstream.php:277 ../actions/showstream.php:296
+#: actions/showstream.php:311
 msgid "Statistics"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../actions/finishopenidlogin.php:246 actions/finishopenidlogin.php:188
+#: actions/finishopenidlogin.php:252
 msgid "Stored OpenID not found."
 msgstr ""
 
 #: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
-#: ../actions/showstream.php:181
+#: ../actions/showstream.php:181 ../actions/showstream.php:188
+#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
+#: actions/showstream.php:197 actions/showstream.php:206
 msgid "Subscribe"
 msgstr ""
 
 #: ../actions/showstream.php:294 ../actions/subscribers.php:27
+#: ../actions/showstream.php:313 actions/showstream.php:328
+#: actions/subscribers.php:27
 msgid "Subscribers"
 msgstr ""
 
-#: ../actions/userauthorization.php:309
+#: ../actions/userauthorization.php:309 ../actions/userauthorization.php:310
+#: actions/userauthorization.php:322
 msgid "Subscription authorized"
 msgstr ""
 
@@ -1135,7 +1195,7 @@ msgstr "Subscriptions"
 msgid "System error uploading file."
 msgstr "System error uploading file."
 
-#: ../actions/noticesearch.php:34
+#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
 msgid "Text search"
 msgstr ""
 
@@ -1143,51 +1203,61 @@ msgstr ""
 msgid "That OpenID does not belong to you."
 msgstr "That OpenID does not belong to you."
 
-#: ../actions/confirmaddress.php:52
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
 msgid "That address has already been confirmed."
 msgstr ""
 
-#: ../actions/confirmaddress.php:43
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
 msgid "That confirmation code is not for you!"
 msgstr ""
 
-#: ../actions/avatar.php:80
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
 msgid "That file is too big."
 msgstr ""
 
-#: ../actions/imsettings.php:161
+#: ../actions/imsettings.php:161 ../actions/imsettings.php:170
+#: actions/imsettings.php:178
 msgid "That is already your Jabber ID."
 msgstr ""
 
-#: ../actions/imsettings.php:224
+#: ../actions/imsettings.php:224 ../actions/imsettings.php:233
+#: actions/imsettings.php:241
 msgid "That is not your Jabber ID."
 msgstr ""
 
-#: ../actions/imsettings.php:201
+#: ../actions/imsettings.php:201 ../actions/emailsettings.php:226
+#: ../actions/imsettings.php:210 actions/emailsettings.php:244
+#: actions/imsettings.php:218
 msgid "That is the wrong IM address."
 msgstr ""
 
-#: ../actions/newnotice.php:52
+#: ../actions/newnotice.php:52 ../actions/newnotice.php:49
+#: ../actions/twitapistatuses.php:408 actions/newnotice.php:49
+#: actions/twitapistatuses.php:330
 msgid "That's too long. Max notice size is 140 chars."
 msgstr ""
 
-#: ../actions/confirmaddress.php:86
+#: ../actions/confirmaddress.php:86 ../actions/confirmaddress.php:92
+#: actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
 
-#: ../actions/imsettings.php:241
+#: ../actions/imsettings.php:241 ../actions/emailsettings.php:264
+#: ../actions/imsettings.php:250 ../actions/smssettings.php:274
+#: actions/emailsettings.php:282 actions/imsettings.php:258
+#: actions/smssettings.php:282
 msgid "The address was removed."
 msgstr ""
 
-#: ../actions/userauthorization.php:311
+#: ../actions/userauthorization.php:311 ../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 ""
 
-#: ../actions/userauthorization.php:321
+#: ../actions/userauthorization.php:321 ../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 "
@@ -1199,20 +1269,20 @@ msgstr ""
 msgid "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 actions/subscribers.php:33
 msgid "These are the people who listen to your notices."
 msgstr ""
 
-#: ../actions/subscriptions.php:35
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr ""
 
-#: ../actions/subscriptions.php:33
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
 msgid "These are the people whose notices you listen to."
 msgstr ""
 
-#: ../actions/recoverpassword.php:87
+#: ../actions/recoverpassword.php:87 ../actions/recoverpassword.php:88
 msgid "This confirmation code is too old. Please start again."
 msgstr ""
 
@@ -1222,7 +1292,7 @@ msgid ""
 "button to go to your OpenID provider."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:56
+#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -1230,7 +1300,7 @@ msgid ""
 "your existing account, if you have one."
 msgstr ""
 
-#: ../lib/util.php:147
+#: ../lib/util.php:147 ../lib/util.php:164 lib/util.php:246
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
@@ -1243,50 +1313,61 @@ msgid ""
 "your profile URL below."
 msgstr ""
 
-#: ../actions/profilesettings.php:51
+#: ../actions/profilesettings.php:51 ../actions/profilesettings.php:48
+#: ../actions/register.php:169 actions/profilesettings.php:81
+#: actions/register.php:183
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
-#: ../actions/remotesubscribe.php:74
+#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
 msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
 #: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
+#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
+#: ../actions/smssettings.php:135 actions/emailsettings.php:144
+#: actions/imsettings.php:118 actions/recoverpassword.php:39
+#: actions/smssettings.php:143 actions/twittersettings.php:108
 msgid "Unexpected form submission."
 msgstr ""
 
-#: ../actions/recoverpassword.php:237
+#: ../actions/recoverpassword.php:237 ../actions/recoverpassword.php:276
+#: actions/recoverpassword.php:289
 msgid "Unexpected password reset."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:58
+#: actions/finishremotesubscribe.php:60
 msgid "Unknown version of OMB protocol."
 msgstr ""
 
-#: ../lib/util.php:245
+#: ../lib/util.php:245 ../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 ""
 
-#: ../actions/confirmaddress.php:48
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr ""
 
-#: ../actions/showstream.php:193
+#: ../actions/showstream.php:193 ../actions/showstream.php:209
+#: actions/showstream.php:219
 msgid "Unsubscribe"
 msgstr ""
 
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
+#: ../actions/updateprofile.php:45 actions/postnotice.php:45
+#: actions/updateprofile.php:46
 msgid "Unsupported OMB version"
 msgstr ""
 
-#: ../actions/avatar.php:105
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
 msgid "Unsupported image file format."
 msgstr ""
 
-#: ../actions/avatar.php:68
+#: ../actions/avatar.php:68 actions/profilesettings.php:161
 msgid "Upload"
 msgstr ""
 
@@ -1299,47 +1380,62 @@ msgid ""
 msgstr ""
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:182
+#: ../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 ""
 
 #: ../actions/finishremotesubscribe.php:86
+#: actions/finishremotesubscribe.php:88
 msgid "User being listened to doesn't exist."
 msgstr ""
 
 #: ../actions/all.php:41 ../actions/avatarbynickname.php:48
 #: ../actions/foaf.php:43 ../actions/replies.php:41
-#: ../actions/showstream.php:44
+#: ../actions/showstream.php:44 ../actions/foaf.php:47
+#: ../actions/twitapiaccount.php:82 ../actions/twitapistatuses.php:319
+#: ../actions/twitapistatuses.php:685 ../actions/twitapiusers.php:82
+#: actions/all.php:41 actions/avatarbynickname.php:48 actions/foaf.php:47
+#: actions/replies.php:41 actions/showfavorites.php:41
+#: actions/showstream.php:44 actions/twitapiaccount.php:80
+#: actions/twitapifavorites.php:68 actions/twitapistatuses.php:235
+#: actions/twitapistatuses.php:609 actions/twitapiusers.php:87
+#: lib/mailbox.php:50
 msgid "User has no profile."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
 msgid "User nickname"
 msgstr ""
 
-#: ../lib/util.php:969
+#: ../lib/util.php:969 ../lib/util.php:1159 lib/util.php:1293
 #, php-format
 msgid "What's up, %s?"
 msgstr ""
 
-#: ../actions/profilesettings.php:57
+#: ../actions/profilesettings.php:57 ../actions/profilesettings.php:54
+#: ../actions/register.php:175 actions/profilesettings.php:87
+#: actions/register.php:189
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
-#: ../actions/updateprofile.php:127
+#: ../actions/updateprofile.php:127 ../actions/updateprofile.php:128
+#: actions/updateprofile.php:129
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr ""
 
-#: ../actions/updateprofile.php:122
+#: ../actions/updateprofile.php:122 ../actions/updateprofile.php:123
+#: actions/updateprofile.php:124
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr ""
 
-#: ../actions/finishaddopenid.php:64
+#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr ""
 
-#: ../actions/recoverpassword.php:31
+#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
 msgid "You are already logged in!"
 msgstr ""
 
@@ -1347,7 +1443,8 @@ msgstr ""
 msgid "You can change your password here. Choose a good one!"
 msgstr ""
 
-#: ../actions/register.php:164
+#: ../actions/register.php:164 ../actions/register.php:135
+#: actions/register.php:145
 msgid "You can create a new account to start posting notices."
 msgstr ""
 
@@ -1357,7 +1454,7 @@ msgid ""
 "\"Remove\"."
 msgstr ""
 
-#: ../actions/imsettings.php:28
+#: ../actions/imsettings.php:28 actions/imsettings.php:28
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant "
@@ -1371,26 +1468,30 @@ msgid ""
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 msgid "You can use the local subscription!"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
+#: ../actions/register.php:61 actions/finishopenidlogin.php:38
+#: actions/register.php:68
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 
-#: ../actions/updateprofile.php:62
+#: ../actions/updateprofile.php:62 ../actions/updateprofile.php:63
+#: actions/updateprofile.php:64
 msgid "You did not send us that profile"
 msgstr ""
 
-#: ../actions/recoverpassword.php:134
+#: ../actions/recoverpassword.php:134 ../actions/recoverpassword.php:149
 msgid "You've been identified. Enter a  new password below. "
 msgstr ""
 
-#: ../actions/openidlogin.php:67
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
 msgid "Your OpenID URL"
 msgstr ""
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:149 ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 
@@ -1401,61 +1502,65 @@ msgid ""
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
 
-#: ../lib/util.php:814
+#: ../lib/util.php:814 ../lib/util.php:943 lib/util.php:992
 msgid "a few seconds ago"
 msgstr ""
 
-#: ../lib/util.php:826
+#: ../lib/util.php:826 ../lib/util.php:955 lib/util.php:1004
 #, php-format
 msgid "about %d days ago"
 msgstr ""
 
-#: ../lib/util.php:822
+#: ../lib/util.php:822 ../lib/util.php:951 lib/util.php:1000
 #, php-format
 msgid "about %d hours ago"
 msgstr ""
 
-#: ../lib/util.php:818
+#: ../lib/util.php:818 ../lib/util.php:947 lib/util.php:996
 #, php-format
 msgid "about %d minutes ago"
 msgstr ""
 
-#: ../lib/util.php:830
+#: ../lib/util.php:830 ../lib/util.php:959 lib/util.php:1008
 #, php-format
 msgid "about %d months ago"
 msgstr ""
 
-#: ../lib/util.php:824
+#: ../lib/util.php:824 ../lib/util.php:953 lib/util.php:1002
 msgid "about a day ago"
 msgstr ""
 
-#: ../lib/util.php:816
+#: ../lib/util.php:816 ../lib/util.php:945 lib/util.php:994
 msgid "about a minute ago"
 msgstr ""
 
-#: ../lib/util.php:828
+#: ../lib/util.php:828 ../lib/util.php:957 lib/util.php:1006
 msgid "about a month ago"
 msgstr ""
 
-#: ../lib/util.php:832
+#: ../lib/util.php:832 ../lib/util.php:961 lib/util.php:1010
 msgid "about a year ago"
 msgstr ""
 
-#: ../lib/util.php:820
+#: ../lib/util.php:820 ../lib/util.php:949 lib/util.php:998
 msgid "about an hour ago"
 msgstr ""
 
 #: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101
+#: ../lib/stream.php:101 ../actions/noticesearch.php:130
+#: ../actions/showstream.php:408 ../lib/stream.php:117
+#: actions/noticesearch.php:136 actions/showstream.php:426 lib/stream.php:84
 msgid "in reply to..."
 msgstr ""
 
 #: ../actions/noticesearch.php:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108
+#: ../lib/stream.php:108 ../actions/noticesearch.php:137
+#: ../actions/showstream.php:415 ../lib/stream.php:124
+#: actions/noticesearch.php:143 actions/showstream.php:433 lib/stream.php:91
 msgid "reply"
 msgstr ""
 
-#: ../actions/password.php:44
+#: ../actions/password.php:44 actions/profilesettings.php:183
 msgid "same as password above"
 msgstr ""
 
@@ -1463,3 +1568,1308 @@ msgstr ""
 #: ../lib/util.php:1127
 msgid "« After"
 msgstr "� After"
+
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+msgid " from "
+msgstr ""
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
+
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#, php-format
+msgid "%s public timeline"
+msgstr ""
+
+#: ../lib/mail.php:206 lib/mail.php:212
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/register.php:154 actions/register.php:168
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55
+msgid "API method not found!"
+msgstr ""
+
+#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
+#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
+#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
+#: ../actions/twitapidirect_messages.php:49
+#: ../actions/twitapidirect_messages.php:56
+#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
+#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
+#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
+#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
+#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
+#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
+#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
+#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
+#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
+#: actions/twitapistatuses.php:690
+msgid "API method under construction."
+msgstr ""
+
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
+
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for "
+"non-humans)"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
+
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr ""
+
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+msgid "Change email handling"
+msgstr ""
+
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+msgid "Change your profile settings"
+msgstr ""
+
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+msgid "Could not follow user: User not found."
+msgstr ""
+
+#: ../lib/subs.php:54 lib/subs.php:61
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: ../lib/subs.php:46 lib/subs.php:46
+msgid "Could not subscribe."
+msgstr ""
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+msgid "Couldn't update user record."
+msgstr ""
+
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr ""
+
+#: ../classes/Notice.php:72 classes/Notice.php:86
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr ""
+
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr ""
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr ""
+
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: ../actions/tag.php:55 actions/tag.php:55
+#, php-format
+msgid "Feed for tag %s"
+msgstr ""
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr ""
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr ""
+
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+msgid "I want to post notices by email."
+msgstr ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+msgid "IM"
+msgstr ""
+
+#: ../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
+msgid "Incoming email"
+msgstr ""
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+msgid "Incoming email address removed."
+msgstr ""
+
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Language"
+msgstr ""
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+msgid "Language is too long (max 50 chars)."
+msgstr ""
+
+#: ../actions/register.php:166 actions/register.php:180
+msgid "Longer name, preferably your \"real\" name"
+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 ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr ""
+
+#: ../lib/mail.php:144 lib/mail.php:144
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+msgid "New incoming email address added."
+msgstr ""
+
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+msgid "No"
+msgstr ""
+
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr ""
+
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+msgid "No email address."
+msgstr ""
+
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+msgid "No incoming email address."
+msgstr ""
+
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+msgid "No status with that ID found."
+msgstr ""
+
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+msgid "Not a registered user."
+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
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+msgid "Not found"
+msgstr ""
+
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr ""
+
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
+
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr ""
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr ""
+
+#: ../actions/invite.php:133 actions/invite.php:141
+msgid "Personal message"
+msgstr ""
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Preferred language"
+msgstr ""
+
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/register.php:28 actions/register.php:28
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+msgid "Registration successful"
+msgstr ""
+
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/register.php:156 actions/register.php:170
+msgid "Same as password above. Required."
+msgstr ""
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr ""
+
+#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
+#: actions/emailsettings.php:74 actions/smssettings.php:82
+msgid "Send email to this address to post new notices."
+msgstr ""
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../actions/tag.php:60 actions/tag.php:60
+msgid "Showing most popular tags from the last week"
+msgstr ""
+
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317
+msgid "Tags"
+msgstr ""
+
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
+msgid "Text"
+msgstr ""
+
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+msgid "That is not your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+msgid "That is not your phone number."
+msgstr ""
+
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/invite.php:89 actions/invite.php:96
+msgid ""
+"These people are already users and you were automatically subscribed to "
+"them:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511
+msgid "This method requires a POST or 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
+msgid "This method requires a POST."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+msgid "Timezone not selected."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+msgid "Two user ids or screen_names must be supplied."
+msgstr ""
+
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this "
+"service."
+msgstr ""
+
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+msgid "Yes"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+msgid "You are not friends with the specified user."
+msgstr ""
+
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr ""
+
+#: ../actions/invite.php:103 actions/invite.php:110
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
+msgstr ""
+
+#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99
+msgid "delete"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+msgid "unsupported file type"
+msgstr ""
+
+#: actions/deletenotice.php:74 actions/disfavor.php:43
+#: actions/emailsettings.php:127 actions/favor.php:45
+#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
+#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
+#: actions/openidsettings.php:123 actions/profilesettings.php:47
+#: actions/recoverpassword.php:282 actions/register.php:42
+#: actions/remotesubscribe.php:40 actions/smssettings.php:124
+#: actions/subscribe.php:44 actions/twittersettings.php:97
+#: actions/unsubscribe.php:41 actions/userauthorization.php:35
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/disfavor.php:55
+msgid "This notice is not a favorite!"
+msgstr ""
+
+#: actions/disfavor.php:63
+msgid "Could not delete favorite."
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Favor"
+msgstr ""
+
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+
+#: actions/emailsettings.php:95
+msgid "Send me email when someone sends me a private message."
+msgstr ""
+
+#: actions/favor.php:53 actions/twitapifavorites.php:142
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132
+msgid "Could not create favorite."
+msgstr ""
+
+#: actions/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#, php-format
+msgid "%s favorite notices"
+msgstr ""
+
+#: actions/favoritesrss.php:64
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr ""
+
+#: actions/inbox.php:28
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+
+#: actions/invite.php:178
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+msgstr ""
+
+#: actions/login.php:104
+msgid "Automatically login in the future; "
+msgstr ""
+
+#: actions/login.php:122
+msgid "For security reasons, please re-enter your "
+msgstr ""
+
+#: actions/login.php:126
+msgid "Login with your username and password. "
+msgstr ""
+
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+msgid "That's too long. Max message size is 140 chars."
+msgstr ""
+
+#: actions/newmessage.php:65
+msgid "No recipient specified."
+msgstr ""
+
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206
+msgid "You can't send a message to this user."
+msgstr ""
+
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly "
+"instead."
+msgstr ""
+
+#: actions/newmessage.php:108
+msgid "No such user"
+msgstr ""
+
+#: actions/newmessage.php:117
+msgid "New message"
+msgstr ""
+
+#: actions/noticesearch.php:95
+msgid "Notice without matching profile"
+msgstr ""
+
+#: actions/openidsettings.php:28
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr ""
+
+#: actions/openidsettings.php:46
+msgid "If you want to add an OpenID to your account, "
+msgstr ""
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr ""
+
+#: actions/openidsettings.php:87
+msgid "You can remove an OpenID from your account "
+msgstr ""
+
+#: actions/outbox.php:28
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr ""
+
+#: actions/outbox.php:30
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#: actions/outbox.php:53
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+
+#: actions/peoplesearch.php:28
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+msgstr ""
+
+#: actions/profilesettings.php:27
+msgid "You can update your personal profile info here "
+msgstr ""
+
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+msgid "User without matching profile"
+msgstr ""
+
+#: actions/recoverpassword.php:91
+msgid "This confirmation code is too old. "
+msgstr ""
+
+#: actions/recoverpassword.php:141
+msgid "If you've forgotten or lost your"
+msgstr ""
+
+#: actions/recoverpassword.php:154
+msgid "You've been identified. Enter a "
+msgstr ""
+
+#: actions/recoverpassword.php:169
+msgid "Your nickname on this server, "
+msgstr ""
+
+#: actions/recoverpassword.php:271
+msgid "Instructions for recovering your password "
+msgstr ""
+
+#: actions/recoverpassword.php:327
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95
+msgid "Password must be 6 or more characters."
+msgstr ""
+
+#: actions/register.php:216
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
+msgstr ""
+
+#: actions/register.php:227
+msgid "(You should receive a message by email momentarily, with "
+msgstr ""
+
+#: actions/remotesubscribe.php:51
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
+msgstr ""
+
+#: actions/showfavorites.php:61
+#, php-format
+msgid "Feed for favorites of %s"
+msgstr ""
+
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+msgid "Could not retrieve favorite notices."
+msgstr ""
+
+#: actions/showmessage.php:33
+msgid "No such message."
+msgstr ""
+
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
+msgstr ""
+
+#: actions/showmessage.php:61
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr ""
+
+#: actions/showmessage.php:66
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr ""
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr ""
+
+#: actions/smssettings.php:312
+#, php-format
+msgid "Mobile carrier for your phone. "
+msgstr ""
+
+#: actions/twitapidirect_messages.php:76
+#, php-format
+msgid "Direct messages to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:77
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:81
+msgid "Direct Messages You've Sent"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:82
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:128
+msgid "No message text!"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:138
+msgid "Recipient user not found."
+msgstr ""
+
+#: actions/twitapidirect_messages.php:141
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
+#: actions/twitapifavorites.php:92
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr ""
+
+#: actions/twitapifavorites.php:95
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr ""
+
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#, php-format
+msgid "%s added your notice as a favorite"
+msgstr ""
+
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+msgstr ""
+
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+msgstr ""
+
+#: actions/twittersettings.php:41
+msgid "Twitter settings"
+msgstr ""
+
+#: actions/twittersettings.php:48
+msgid "Twitter Account"
+msgstr ""
+
+#: actions/twittersettings.php:56
+msgid "Current verified Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr ""
+
+#: actions/twittersettings.php:65
+msgid "No spaces, please."
+msgstr ""
+
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr ""
+
+#: actions/twittersettings.php:72
+msgid "Automatically send my notices to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:75
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:78
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+
+#: actions/twittersettings.php:128
+msgid "Could not verify your Twitter credentials!"
+msgstr ""
+
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+msgid "Unable to save your Twitter settings!"
+msgstr ""
+
+#: actions/twittersettings.php:174
+msgid "Twitter settings saved."
+msgstr ""
+
+#: actions/twittersettings.php:192
+msgid "That is not your Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+msgid "Couldn't remove Twitter user."
+msgstr ""
+
+#: actions/twittersettings.php:212
+msgid "Twitter account removed."
+msgstr ""
+
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+msgid "Couldn't save Twitter preferences."
+msgstr ""
+
+#: actions/twittersettings.php:245
+msgid "Twitter preferences saved."
+msgstr ""
+
+#: actions/userauthorization.php:84
+msgid "Please check these details to make sure "
+msgstr ""
+
+#: actions/userauthorization.php:324
+msgid "The subscription has been authorized, but no "
+msgstr ""
+
+#: actions/userauthorization.php:334
+msgid "The subscription has been rejected, but no "
+msgstr ""
+
+#: classes/Channel.php:113
+msgid "Command results"
+msgstr ""
+
+#: classes/Channel.php:148
+msgid "Command complete"
+msgstr ""
+
+#: classes/Channel.php:158
+msgid "Command failed"
+msgstr ""
+
+#: classes/Command.php:39
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: classes/Command.php:96
+#, php-format
+msgid "Subscriptions: %1$s\n"
+msgstr ""
+
+#: classes/Command.php:125 classes/Command.php:242
+msgid "User has no last notice"
+msgstr ""
+
+#: classes/Command.php:146
+msgid "Notice marked as fave."
+msgstr ""
+
+#: classes/Command.php:166
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr ""
+
+#: classes/Command.php:169
+#, php-format
+msgid "Fullname: %s"
+msgstr ""
+
+#: classes/Command.php:172
+#, php-format
+msgid "Location: %s"
+msgstr ""
+
+#: classes/Command.php:175
+#, php-format
+msgid "Homepage: %s"
+msgstr ""
+
+#: classes/Command.php:178
+#, php-format
+msgid "About: %s"
+msgstr ""
+
+#: classes/Command.php:200
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
+
+#: classes/Command.php:214
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
+
+#: classes/Command.php:216
+msgid "Error sending direct message."
+msgstr ""
+
+#: classes/Command.php:263
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: classes/Command.php:270
+#, php-format
+msgid "Subscribed to %s"
+msgstr ""
+
+#: classes/Command.php:288
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
+
+#: classes/Command.php:295
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr ""
+
+#: classes/Command.php:310 classes/Command.php:330
+msgid "Command not yet implemented."
+msgstr ""
+
+#: classes/Command.php:313
+msgid "Notification off."
+msgstr ""
+
+#: classes/Command.php:315
+msgid "Can't turn off notification."
+msgstr ""
+
+#: classes/Command.php:333
+msgid "Notification on."
+msgstr ""
+
+#: classes/Command.php:335
+msgid "Can't turn on notification."
+msgstr ""
+
+#: classes/Command.php:344
+msgid "Commands:\n"
+msgstr ""
+
+#: classes/Message.php:53
+msgid "Could not insert message."
+msgstr ""
+
+#: classes/Message.php:63
+msgid "Could not update message with new URI."
+msgstr ""
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr ""
+
+#: lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:249
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:253
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+msgstr ""
+
+#: lib/mailbox.php:43
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/openid.php:195
+msgid "This form should automatically submit itself. "
+msgstr ""
+
+#: lib/personal.php:65
+msgid "Favorites"
+msgstr ""
+
+#: lib/personal.php:66
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
+#: lib/personal.php:66
+msgid "User"
+msgstr ""
+
+#: lib/personal.php:75
+msgid "Inbox"
+msgstr ""
+
+#: lib/personal.php:76
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personal.php:80
+msgid "Outbox"
+msgstr ""
+
+#: lib/personal.php:81
+msgid "Your sent messages"
+msgstr ""
+
+#: lib/settingsaction.php:99
+msgid "Twitter"
+msgstr ""
+
+#: lib/settingsaction.php:100
+msgid "Twitter integration options"
+msgstr ""
+
+#: lib/util.php:1718
+msgid "To"
+msgstr ""
+
+#: scripts/maildaemon.php:45
+msgid "Could not parse message."
+msgstr ""
diff --git a/locale/en_NZ/LC_MESSAGES/laconica.mo b/locale/en_NZ/LC_MESSAGES/laconica.mo
deleted file mode 100644
index afa13ed32..000000000
--- a/locale/en_NZ/LC_MESSAGES/laconica.mo
+++ /dev/null
diff --git a/locale/en_NZ/LC_MESSAGES/laconica.po b/locale/en_NZ/LC_MESSAGES/laconica.po
deleted file mode 100644
index a8409cf9f..000000000
--- a/locale/en_NZ/LC_MESSAGES/laconica.po
+++ /dev/null
@@ -1,2919 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: laconica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-17 11:01-0400\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Mike Cochrane <mikec@mikenz.geek.nz>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-Language: English\n"
-"X-Poedit-Country: NEW ZEALAND\n"
-
-#: ../actions/noticesearchrss.php:64
-#, php-format
-msgid " Search Stream for \"%s\""
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:82
-#: ../actions/register.php:193
-msgid ""
-" except this private data: password, email address, IM address, phone "
-"number."
-msgstr ""
-
-#: ../actions/subscribe.php:84
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr ""
-
-#: ../actions/subscribe.php:86
-#, php-format
-msgid ""
-"%1$s is now listening to your notices on %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s.\n"
-msgstr ""
-
-#: ../actions/shownotice.php:45
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr ""
-
-#: ../actions/publicrss.php:60
-#, php-format
-msgid "%s Public Stream"
-msgstr ""
-
-#: ../actions/all.php:47
-#: ../actions/allrss.php:70
-#: ../lib/stream.php:45
-#, php-format
-msgid "%s and friends"
-msgstr ""
-
-#: ../lib/util.php:233
-#, php-format
-msgid ""
-"**%%site.name%%** is a microblogging service brought to you by "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
-msgstr ""
-
-#: ../lib/util.php:235
-#, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr ""
-
-#: ../lib/util.php:250
-msgid ". Contributors should be attributed by full name or nickname."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:73
-#: ../actions/profilesettings.php:43
-#: ../actions/register.php:176
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-
-#: ../actions/password.php:42
-#: ../actions/register.php:178
-msgid "6 or more characters"
-msgstr ""
-
-#: ../actions/recoverpassword.php:165
-msgid "6 or more characters, and don't forget it!"
-msgstr ""
-
-#: ../actions/imsettings.php:188
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
-msgstr ""
-
-#: ../lib/util.php:296
-msgid "About"
-msgstr ""
-
-#: ../actions/userauthorization.php:118
-msgid "Accept"
-msgstr ""
-
-#: ../actions/imsettings.php:64
-#: ../actions/openidsettings.php:57
-msgid "Add"
-msgstr ""
-
-#: ../actions/openidsettings.php:43
-msgid "Add OpenID"
-msgstr ""
-
-#: ../actions/imsettings.php:39
-msgid "Address"
-msgstr ""
-
-#: ../actions/showstream.php:254
-msgid "All subscriptions"
-msgstr ""
-
-#: ../actions/publicrss.php:62
-#, php-format
-msgid "All updates for %s"
-msgstr ""
-
-#: ../actions/noticesearchrss.php:66
-#, php-format
-msgid "All updates matching search term \"%s\""
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:29
-#: ../actions/login.php:27
-#: ../actions/openidlogin.php:29
-#: ../actions/register.php:28
-msgid "Already logged in."
-msgstr ""
-
-#: ../actions/subscribe.php:48
-msgid "Already subscribed!."
-msgstr ""
-
-#: ../actions/userauthorization.php:76
-msgid "Authorize subscription"
-msgstr "Authorise subscription"
-
-#: ../actions/login.php:100
-#: ../actions/register.php:184
-msgid "Automatically login in the future; not for shared computers!"
-msgstr ""
-
-#: ../actions/avatar.php:32
-msgid "Avatar"
-msgstr ""
-
-#: ../actions/avatar.php:113
-msgid "Avatar updated."
-msgstr ""
-
-#: ../actions/imsettings.php:55
-#, 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 ""
-
-#: ../lib/util.php:1136
-msgid "Before »"
-msgstr ""
-
-#: ../actions/profilesettings.php:52
-msgid "Bio"
-msgstr ""
-
-#: ../actions/profilesettings.php:93
-#: ../actions/updateprofile.php:102
-msgid "Bio is too long (max 140 chars)."
-msgstr ""
-
-#: ../actions/updateprofile.php:118
-#, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr ""
-
-#: ../actions/password.php:85
-#: ../actions/recoverpassword.php:261
-msgid "Can't save new password."
-msgstr ""
-
-#: ../actions/imsettings.php:59
-msgid "Cancel"
-msgstr ""
-
-#: ../lib/openid.php:121
-msgid "Cannot instantiate OpenID consumer object."
-msgstr ""
-
-#: ../actions/imsettings.php:154
-msgid "Cannot normalize that Jabber ID"
-msgstr "Cannot normalise that Jabber ID"
-
-#: ../actions/password.php:45
-msgid "Change"
-msgstr ""
-
-#: ../actions/password.php:32
-msgid "Change password"
-msgstr ""
-
-#: ../actions/password.php:43
-#: ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
-msgid "Confirm"
-msgstr ""
-
-#: ../actions/confirmaddress.php:84
-msgid "Confirm Address"
-msgstr ""
-
-#: ../actions/imsettings.php:213
-msgid "Confirmation cancelled."
-msgstr ""
-
-#: ../actions/confirmaddress.php:38
-msgid "Confirmation code not found."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:91
-msgid "Connect"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:86
-msgid "Connect existing account"
-msgstr ""
-
-#: ../lib/util.php:304
-msgid "Contact"
-msgstr ""
-
-#: ../lib/openid.php:178
-#, php-format
-msgid "Could not create OpenID form: %s"
-msgstr ""
-
-#: ../lib/openid.php:160
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr ""
-
-#: ../actions/updateprofile.php:161
-msgid "Could not save avatar info"
-msgstr ""
-
-#: ../actions/updateprofile.php:154
-msgid "Could not save new profile info"
-msgstr ""
-
-#: ../actions/profilesettings.php:146
-msgid "Couldn't confirm email."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:99
-msgid "Couldn't convert request tokens to access tokens."
-msgstr ""
-
-#: ../actions/subscribe.php:59
-msgid "Couldn't create subscription."
-msgstr ""
-
-#: ../actions/confirmaddress.php:78
-#: ../actions/imsettings.php:209
-msgid "Couldn't delete email confirmation."
-msgstr ""
-
-#: ../actions/unsubscribe.php:56
-msgid "Couldn't delete subscription."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:125
-msgid "Couldn't get a request token."
-msgstr ""
-
-#: ../actions/imsettings.php:178
-msgid "Couldn't insert confirmation code."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:180
-msgid "Couldn't insert new subscription."
-msgstr ""
-
-#: ../actions/profilesettings.php:175
-msgid "Couldn't save profile."
-msgstr ""
-
-#: ../actions/confirmaddress.php:70
-#: ../actions/imsettings.php:129
-#: ../actions/imsettings.php:234
-#: ../actions/profilesettings.php:123
-msgid "Couldn't update user."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:84
-msgid "Create"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:70
-msgid "Create a new user with this nickname."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:68
-msgid "Create new account"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:191
-msgid "Creating new account for OpenID that already has a user."
-msgstr ""
-
-#: ../actions/imsettings.php:45
-msgid "Current confirmed Jabber/GTalk address."
-msgstr ""
-
-#: ../actions/showstream.php:337
-msgid "Currently"
-msgstr ""
-
-#: ../lib/util.php:893
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr ""
-
-#: ../actions/profilesettings.php:54
-msgid "Describe yourself and your interests in 140 chars"
-msgstr ""
-
-#: ../actions/register.php:181
-msgid "Email"
-msgstr ""
-
-#: ../actions/profilesettings.php:46
-msgid "Email address"
-msgstr ""
-
-#: ../actions/profilesettings.php:102
-#: ../actions/register.php:63
-msgid "Email address already exists."
-msgstr ""
-
-#: ../lib/mail.php:82
-msgid "Email address confirmation"
-msgstr ""
-
-#: ../actions/recoverpassword.php:176
-msgid "Enter a nickname or email address."
-msgstr ""
-
-#: ../actions/userauthorization.php:136
-msgid "Error authorizing token"
-msgstr "Error authorising token"
-
-#: ../actions/finishopenidlogin.php:282
-msgid "Error connecting user to OpenID."
-msgstr ""
-
-#: ../actions/finishaddopenid.php:78
-msgid "Error connecting user."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:151
-msgid "Error inserting avatar"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:143
-msgid "Error inserting new profile"
-msgstr ""
-
-#: ../actions/postnotice.php:88
-msgid "Error inserting notice"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:167
-msgid "Error inserting remote profile"
-msgstr ""
-
-#: ../actions/recoverpassword.php:201
-msgid "Error saving address confirmation."
-msgstr ""
-
-#: ../actions/userauthorization.php:139
-msgid "Error saving remote profile"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:222
-#: ../lib/openid.php:226
-msgid "Error saving the profile."
-msgstr ""
-
-#: ../lib/openid.php:237
-msgid "Error saving the user."
-msgstr ""
-
-#: ../actions/password.php:80
-msgid "Error saving user; invalid."
-msgstr ""
-
-#: ../actions/login.php:43
-#: ../actions/login.php:69
-#: ../actions/recoverpassword.php:268
-#: ../actions/register.php:73
-msgid "Error setting user."
-msgstr ""
-
-#: ../actions/finishaddopenid.php:83
-msgid "Error updating profile"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:161
-msgid "Error updating remote profile"
-msgstr ""
-
-#: ../actions/recoverpassword.php:79
-msgid "Error with confirmation code."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:89
-msgid "Existing nickname"
-msgstr ""
-
-#: ../lib/util.php:298
-msgid "FAQ"
-msgstr ""
-
-#: ../actions/avatar.php:115
-msgid "Failed updating avatar."
-msgstr ""
-
-#: ../actions/all.php:61
-#: ../actions/allrss.php:74
-#, php-format
-msgid "Feed for friends of %s"
-msgstr ""
-
-#: ../actions/replies.php:61
-#: ../actions/repliesrss.php:80
-#, php-format
-msgid "Feed for replies to %s"
-msgstr ""
-
-#: ../actions/profilesettings.php:44
-msgid "Full name"
-msgstr ""
-
-#: ../actions/profilesettings.php:90
-#: ../actions/updateprofile.php:92
-msgid "Full name is too long (max 255 chars)."
-msgstr ""
-
-#: ../lib/util.php:279
-msgid "Help"
-msgstr ""
-
-#: ../lib/util.php:274
-msgid "Home"
-msgstr ""
-
-#: ../actions/profilesettings.php:49
-msgid "Homepage"
-msgstr ""
-
-#: ../actions/profilesettings.php:87
-msgid "Homepage is not a valid URL."
-msgstr ""
-
-#: ../actions/imsettings.php:61
-msgid "IM Address"
-msgstr ""
-
-#: ../actions/imsettings.php:33
-msgid "IM Settings"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:88
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/recoverpassword.php:122
-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 ""
-
-#: ../actions/password.php:69
-msgid "Incorrect old password"
-msgstr ""
-
-#: ../actions/login.php:63
-msgid "Incorrect username or password."
-msgstr ""
-
-#: ../actions/recoverpassword.php:226
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
-msgstr ""
-
-#: ../actions/updateprofile.php:113
-#, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr ""
-
-#: ../actions/updateprofile.php:97
-#, php-format
-msgid "Invalid homepage '%s'"
-msgstr ""
-
-#: ../actions/updateprofile.php:81
-#, php-format
-msgid "Invalid license URL '%s'"
-msgstr ""
-
-#: ../actions/postnotice.php:61
-msgid "Invalid notice content"
-msgstr ""
-
-#: ../actions/postnotice.php:67
-msgid "Invalid notice uri"
-msgstr ""
-
-#: ../actions/postnotice.php:72
-msgid "Invalid notice url"
-msgstr ""
-
-#: ../actions/updateprofile.php:86
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:96
-msgid "Invalid profile URL (bad format)"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:77
-msgid "Invalid profile URL returned by server."
-msgstr ""
-
-#: ../actions/avatarbynickname.php:37
-msgid "Invalid size."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:264
-#: ../actions/register.php:68
-#: ../actions/register.php:84
-msgid "Invalid username or password."
-msgstr ""
-
-#: ../lib/util.php:237
-#, 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 ""
-
-#: ../actions/imsettings.php:164
-msgid "Jabber ID already belongs to another user."
-msgstr ""
-
-#: ../actions/imsettings.php:63
-#, 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 ""
-
-#: ../actions/profilesettings.php:55
-msgid "Location"
-msgstr ""
-
-#: ../actions/profilesettings.php:96
-#: ../actions/updateprofile.php:107
-msgid "Location is too long (max 255 chars)."
-msgstr ""
-
-#: ../actions/login.php:93
-#: ../actions/login.php:102
-#: ../actions/openidlogin.php:68
-#: ../lib/util.php:286
-msgid "Login"
-msgstr ""
-
-#: ../actions/openidlogin.php:44
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr ""
-
-#: ../actions/login.php:112
-#, 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 ""
-
-#: ../lib/util.php:284
-msgid "Logout"
-msgstr ""
-
-#: ../actions/login.php:106
-msgid "Lost or forgotten password?"
-msgstr ""
-
-#: ../actions/showstream.php:281
-msgid "Member since"
-msgstr ""
-
-#: ../actions/userrss.php:70
-#, php-format
-msgid "Microblog by %s"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:79
-#: ../actions/register.php:190
-msgid "My text and files are available under "
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:71
-msgid "New nickname"
-msgstr ""
-
-#: ../actions/newnotice.php:100
-msgid "New notice"
-msgstr ""
-
-#: ../actions/password.php:41
-#: ../actions/recoverpassword.php:164
-msgid "New password"
-msgstr ""
-
-#: ../actions/recoverpassword.php:275
-msgid "New password successfully saved. You are now logged in."
-msgstr ""
-
-#: ../actions/login.php:97
-#: ../actions/profilesettings.php:41
-#: ../actions/register.php:175
-msgid "Nickname"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:175
-#: ../actions/profilesettings.php:99
-#: ../actions/register.php:59
-msgid "Nickname already in use. Try another one."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:165
-#: ../actions/profilesettings.php:80
-#: ../actions/register.php:57
-#: ../actions/updateprofile.php:76
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:170
-msgid "Nickname not allowed."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:72
-msgid "Nickname of the user you want to follow"
-msgstr ""
-
-#: ../actions/recoverpassword.php:147
-msgid "Nickname or email"
-msgstr ""
-
-#: ../actions/imsettings.php:147
-msgid "No Jabber ID."
-msgstr ""
-
-#: ../actions/userauthorization.php:128
-msgid "No authorization request!"
-msgstr "No authorisation request!"
-
-#: ../actions/confirmaddress.php:33
-msgid "No confirmation code."
-msgstr ""
-
-#: ../actions/newnotice.php:49
-msgid "No content!"
-msgstr ""
-
-#: ../actions/userbyid.php:27
-msgid "No id."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:65
-msgid "No nickname provided by remote server."
-msgstr ""
-
-#: ../actions/avatarbynickname.php:27
-msgid "No nickname."
-msgstr ""
-
-#: ../actions/imsettings.php:197
-msgid "No pending confirmation to cancel."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:72
-msgid "No profile URL returned by server."
-msgstr ""
-
-#: ../actions/recoverpassword.php:189
-msgid "No registered email address for that user."
-msgstr ""
-
-#: ../actions/userauthorization.php:48
-msgid "No request found!"
-msgstr ""
-
-#: ../actions/noticesearch.php:64
-#: ../actions/peoplesearch.php:64
-msgid "No results"
-msgstr ""
-
-#: ../actions/avatarbynickname.php:32
-msgid "No size."
-msgstr ""
-
-#: ../actions/openidsettings.php:135
-msgid "No such OpenID."
-msgstr ""
-
-#: ../actions/doc.php:29
-msgid "No such document."
-msgstr ""
-
-#: ../actions/shownotice.php:32
-#: ../actions/shownotice.php:65
-msgid "No such notice."
-msgstr ""
-
-#: ../actions/recoverpassword.php:56
-msgid "No such recovery code."
-msgstr ""
-
-#: ../actions/postnotice.php:56
-msgid "No such subscription"
-msgstr ""
-
-#: ../actions/all.php:34
-#: ../actions/allrss.php:35
-#: ../actions/avatarbynickname.php:43
-#: ../actions/foaf.php:36
-#: ../actions/recoverpassword.php:185
-#: ../actions/remotesubscribe.php:84
-#: ../actions/remotesubscribe.php:91
-#: ../actions/repliesrss.php:35
-#: ../actions/showstream.php:95
-#: ../actions/subscribe.php:43
-#: ../actions/unsubscribe.php:38
-#: ../actions/userbyid.php:31
-#: ../actions/userrss.php:35
-#: ../actions/xrds.php:31
-#: ../lib/gallery.php:53
-msgid "No such user."
-msgstr ""
-
-#: ../lib/gallery.php:76
-msgid "Nobody to show!"
-msgstr ""
-
-#: ../actions/recoverpassword.php:60
-msgid "Not a recovery code."
-msgstr ""
-
-#: ../actions/imsettings.php:158
-msgid "Not a valid Jabber ID"
-msgstr ""
-
-#: ../lib/openid.php:131
-msgid "Not a valid OpenID."
-msgstr ""
-
-#: ../actions/profilesettings.php:75
-#: ../actions/register.php:53
-msgid "Not a valid email address."
-msgstr ""
-
-#: ../actions/profilesettings.php:83
-#: ../actions/register.php:61
-msgid "Not a valid nickname."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:118
-msgid "Not a valid profile URL (incorrect services)."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:111
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:104
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr ""
-
-#: ../actions/avatar.php:95
-msgid "Not an image or corrupt file."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:51
-msgid "Not authorized."
-msgstr "Not authorised."
-
-#: ../actions/finishremotesubscribe.php:38
-msgid "Not expecting this response!"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:29
-#: ../actions/logout.php:28
-#: ../actions/newnotice.php:29
-#: ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24
-#: ../lib/settingsaction.php:27
-msgid "Not logged in."
-msgstr ""
-
-#: ../actions/unsubscribe.php:43
-msgid "Not subscribed!."
-msgstr ""
-
-#: ../actions/showstream.php:82
-#, php-format
-msgid "Notice feed for %s"
-msgstr ""
-
-#: ../actions/shownotice.php:39
-msgid "Notice has no profile"
-msgstr ""
-
-#: ../actions/showstream.php:297
-msgid "Notices"
-msgstr ""
-
-#: ../actions/password.php:39
-msgid "Old password"
-msgstr ""
-
-#: ../lib/util.php:288
-msgid "OpenID"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:61
-msgid "OpenID Account Setup"
-msgstr ""
-
-#: ../lib/openid.php:180
-msgid "OpenID Auto-Submit"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:99
-#: ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60
-msgid "OpenID Login"
-msgstr ""
-
-#: ../actions/openidlogin.php:65
-#: ../actions/openidsettings.php:49
-msgid "OpenID URL"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:42
-#: ../actions/finishopenidlogin.php:103
-msgid "OpenID authentication cancelled."
-msgstr ""
-
-#: ../actions/finishaddopenid.php:46
-#: ../actions/finishopenidlogin.php:107
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr ""
-
-#: ../lib/openid.php:133
-#, php-format
-msgid "OpenID failure: %s"
-msgstr ""
-
-#: ../actions/openidsettings.php:144
-msgid "OpenID removed."
-msgstr ""
-
-#: ../actions/openidsettings.php:37
-msgid "OpenID settings"
-msgstr ""
-
-#: ../actions/avatar.php:84
-msgid "Partial upload."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:90
-#: ../actions/login.php:98
-#: ../actions/register.php:177
-msgid "Password"
-msgstr ""
-
-#: ../actions/recoverpassword.php:249
-msgid "Password and confirmation do not match."
-msgstr ""
-
-#: ../actions/recoverpassword.php:245
-msgid "Password must be 6 chars or more."
-msgstr ""
-
-#: ../actions/recoverpassword.php:222
-#: ../actions/recoverpassword.php:224
-msgid "Password recovery requested"
-msgstr ""
-
-#: ../actions/password.php:89
-#: ../actions/recoverpassword.php:274
-msgid "Password saved."
-msgstr ""
-
-#: ../actions/password.php:61
-#: ../actions/register.php:65
-msgid "Passwords don't match."
-msgstr ""
-
-#: ../actions/peoplesearch.php:33
-msgid "People search"
-msgstr ""
-
-#: ../lib/stream.php:44
-msgid "Personal"
-msgstr ""
-
-#: ../actions/userauthorization.php:77
-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 \"Cancel\"."
-msgstr ""
-
-#: ../actions/imsettings.php:74
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr ""
-
-#: ../actions/imsettings.php:68
-msgid "Preferences"
-msgstr ""
-
-#: ../actions/imsettings.php:135
-msgid "Preferences saved."
-msgstr ""
-
-#: ../lib/util.php:300
-msgid "Privacy"
-msgstr ""
-
-#: ../actions/newnotice.php:61
-#: ../actions/newnotice.php:69
-msgid "Problem saving notice."
-msgstr ""
-
-#: ../lib/stream.php:54
-msgid "Profile"
-msgstr ""
-
-#: ../actions/remotesubscribe.php:73
-msgid "Profile URL"
-msgstr ""
-
-#: ../actions/profilesettings.php:34
-msgid "Profile settings"
-msgstr ""
-
-#: ../actions/postnotice.php:51
-#: ../actions/updateprofile.php:51
-msgid "Profile unknown"
-msgstr ""
-
-#: ../lib/util.php:276
-msgid "Public"
-msgstr ""
-
-#: ../actions/public.php:54
-msgid "Public Stream Feed"
-msgstr ""
-
-#: ../actions/public.php:33
-msgid "Public timeline"
-msgstr ""
-
-#: ../actions/recoverpassword.php:151
-msgid "Recover"
-msgstr ""
-
-#: ../actions/recoverpassword.php:141
-msgid "Recover password"
-msgstr ""
-
-#: ../actions/recoverpassword.php:67
-msgid "Recovery code for unknown user."
-msgstr ""
-
-#: ../actions/register.php:171
-#: ../actions/register.php:195
-#: ../lib/util.php:287
-msgid "Register"
-msgstr ""
-
-#: ../actions/userauthorization.php:119
-msgid "Reject"
-msgstr ""
-
-#: ../actions/login.php:99
-#: ../actions/register.php:183
-msgid "Remember me"
-msgstr ""
-
-#: ../actions/updateprofile.php:69
-msgid "Remote profile with no matching profile"
-msgstr ""
-
-#: ../actions/remotesubscribe.php:65
-msgid "Remote subscribe"
-msgstr ""
-
-#: ../actions/imsettings.php:48
-#: ../actions/openidsettings.php:106
-msgid "Remove"
-msgstr ""
-
-#: ../actions/openidsettings.php:68
-msgid "Remove OpenID"
-msgstr ""
-
-#: ../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 ""
-
-#: ../lib/stream.php:49
-msgid "Replies"
-msgstr ""
-
-#: ../actions/replies.php:47
-#: ../actions/repliesrss.php:76
-#: ../lib/stream.php:50
-#, php-format
-msgid "Replies to %s"
-msgstr ""
-
-#: ../actions/recoverpassword.php:168
-msgid "Reset"
-msgstr ""
-
-#: ../actions/recoverpassword.php:158
-msgid "Reset password"
-msgstr ""
-
-#: ../actions/recoverpassword.php:167
-#: ../actions/register.php:180
-msgid "Same as password above"
-msgstr ""
-
-#: ../actions/imsettings.php:76
-#: ../actions/profilesettings.php:58
-msgid "Save"
-msgstr ""
-
-#: ../lib/searchaction.php:73
-#: ../lib/util.php:277
-msgid "Search"
-msgstr ""
-
-#: ../actions/noticesearch.php:80
-msgid "Search Stream Feed"
-msgstr ""
-
-#: ../actions/noticesearch.php:30
-#, php-format
-msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
-msgstr ""
-
-#: ../actions/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 ""
-
-#: ../lib/util.php:982
-msgid "Send"
-msgstr ""
-
-#: ../actions/imsettings.php:71
-msgid "Send me notices through Jabber/GTalk."
-msgstr ""
-
-#: ../lib/util.php:282
-msgid "Settings"
-msgstr ""
-
-#: ../actions/profilesettings.php:183
-msgid "Settings saved."
-msgstr ""
-
-#: ../actions/finishaddopenid.php:66
-msgid "Someone else already has this OpenID."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:42
-#: ../actions/openidsettings.php:126
-msgid "Something weird happened."
-msgstr ""
-
-#: ../lib/util.php:302
-msgid "Source"
-msgstr ""
-
-#: ../actions/showstream.php:277
-msgid "Statistics"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:182
-#: ../actions/finishopenidlogin.php:275
-msgid "Stored OpenID not found."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:75
-#: ../actions/showstream.php:172
-#: ../actions/showstream.php:181
-msgid "Subscribe"
-msgstr ""
-
-#: ../actions/showstream.php:294
-#: ../actions/subscribers.php:27
-msgid "Subscribers"
-msgstr ""
-
-#: ../actions/userauthorization.php:309
-msgid "Subscription authorized"
-msgstr "Subscription authorised"
-
-#: ../actions/userauthorization.php:319
-msgid "Subscription rejected"
-msgstr ""
-
-#: ../actions/showstream.php:212
-#: ../actions/showstream.php:288
-#: ../actions/subscriptions.php:27
-msgid "Subscriptions"
-msgstr ""
-
-#: ../actions/avatar.php:87
-msgid "System error uploading file."
-msgstr ""
-
-#: ../actions/noticesearch.php:34
-msgid "Text search"
-msgstr ""
-
-#: ../actions/openidsettings.php:140
-msgid "That OpenID does not belong to you."
-msgstr ""
-
-#: ../actions/confirmaddress.php:52
-msgid "That address has already been confirmed."
-msgstr ""
-
-#: ../actions/confirmaddress.php:43
-msgid "That confirmation code is not for you!"
-msgstr ""
-
-#: ../actions/avatar.php:80
-msgid "That file is too big."
-msgstr ""
-
-#: ../actions/imsettings.php:161
-msgid "That is already your Jabber ID."
-msgstr ""
-
-#: ../actions/imsettings.php:224
-msgid "That is not your Jabber ID."
-msgstr ""
-
-#: ../actions/imsettings.php:201
-msgid "That is the wrong IM address."
-msgstr ""
-
-#: ../actions/newnotice.php:52
-msgid "That's too long. Max notice size is 140 chars."
-msgstr ""
-
-#: ../actions/confirmaddress.php:86
-#, php-format
-msgid "The address \"%s\" has been confirmed for your account."
-msgstr ""
-
-#: ../actions/imsettings.php:241
-msgid "The address was removed."
-msgstr ""
-
-#: ../actions/userauthorization.php:311
-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 ""
-"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:321
-msgid ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the site's instructions for details on how to fully reject the "
-"subscription."
-msgstr ""
-
-#: ../actions/subscribers.php:35
-#, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr ""
-
-#: ../actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
-msgstr ""
-
-#: ../actions/subscriptions.php:35
-#, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr ""
-
-#: ../actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr ""
-
-#: ../actions/recoverpassword.php:87
-msgid "This confirmation code is too old. Please start again."
-msgstr ""
-
-#: ../lib/openid.php:195
-msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:56
-#, php-format
-msgid ""
-"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."
-msgstr ""
-
-#: ../lib/util.php:147
-msgid "This page is not available in a media type you accept"
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/profilesettings.php:51
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr ""
-
-#: ../actions/remotesubscribe.php:74
-msgid "URL of your profile on another compatible microblogging service"
-msgstr ""
-
-#: ../actions/imsettings.php:105
-#: ../actions/recoverpassword.php:39
-msgid "Unexpected form submission."
-msgstr ""
-
-#: ../actions/recoverpassword.php:237
-msgid "Unexpected password reset."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:58
-msgid "Unknown version of OMB protocol."
-msgstr ""
-
-#: ../lib/util.php:245
-msgid ""
-"Unless otherwise specified, contents of this site are copyright by the "
-"contributors and available under the "
-msgstr ""
-
-#: ../actions/confirmaddress.php:48
-#, php-format
-msgid "Unrecognized address type %s"
-msgstr ""
-
-#: ../actions/showstream.php:193
-msgid "Unsubscribe"
-msgstr ""
-
-#: ../actions/postnotice.php:44
-#: ../actions/updateprofile.php:44
-msgid "Unsupported OMB version"
-msgstr ""
-
-#: ../actions/avatar.php:105
-msgid "Unsupported image file format."
-msgstr ""
-
-#: ../actions/avatar.php:68
-msgid "Upload"
-msgstr ""
-
-#: ../actions/avatar.php:27
-msgid ""
-"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 license, also. Use a picture that belongs to you and that you want to "
-"share."
-msgstr ""
-
-#: ../actions/profilesettings.php:48
-#: ../actions/register.php:182
-msgid "Used only for updates, announcements, and password recovery"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:86
-msgid "User being listened to doesn't exist."
-msgstr ""
-
-#: ../actions/all.php:41
-#: ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:43
-#: ../actions/replies.php:41
-#: ../actions/showstream.php:44
-msgid "User has no profile."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:71
-msgid "User nickname"
-msgstr ""
-
-#: ../lib/util.php:969
-#, php-format
-msgid "What's up, %s?"
-msgstr ""
-
-#: ../actions/profilesettings.php:57
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Where you are, like \"Town or City, Region, Country\""
-
-#: ../actions/updateprofile.php:127
-#, php-format
-msgid "Wrong image type for '%s'"
-msgstr ""
-
-#: ../actions/updateprofile.php:122
-#, php-format
-msgid "Wrong size image at '%s'"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:64
-msgid "You already have this OpenID!"
-msgstr ""
-
-#: ../actions/recoverpassword.php:31
-msgid "You are already logged in!"
-msgstr ""
-
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
-msgstr ""
-
-#: ../actions/register.php:164
-msgid "You can create a new account to start posting notices."
-msgstr ""
-
-#: ../actions/openidsettings.php:86
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr ""
-
-#: ../actions/imsettings.php:28
-#, php-format
-msgid ""
-"You can send and receive notices through Jabber/GTalk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
-msgstr ""
-
-#: ../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
-msgid "You can use the local subscription!"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:33
-#: ../actions/register.php:51
-msgid "You can't register if you don't agree to the license."
-msgstr ""
-
-#: ../actions/updateprofile.php:62
-msgid "You did not send us that profile"
-msgstr ""
-
-#: ../actions/recoverpassword.php:134
-msgid "You've been identified. Enter a  new password below. "
-msgstr ""
-
-#: ../actions/openidlogin.php:67
-msgid "Your OpenID URL"
-msgstr ""
-
-#: ../actions/recoverpassword.php:149
-msgid "Your nickname on this server, or your registered email address."
-msgstr ""
-
-#: ../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 ""
-
-#: ../lib/util.php:814
-msgid "a few seconds ago"
-msgstr ""
-
-#: ../lib/util.php:826
-#, php-format
-msgid "about %d days ago"
-msgstr ""
-
-#: ../lib/util.php:822
-#, php-format
-msgid "about %d hours ago"
-msgstr ""
-
-#: ../lib/util.php:818
-#, php-format
-msgid "about %d minutes ago"
-msgstr ""
-
-#: ../lib/util.php:830
-#, php-format
-msgid "about %d months ago"
-msgstr ""
-
-#: ../lib/util.php:824
-msgid "about a day ago"
-msgstr ""
-
-#: ../lib/util.php:816
-msgid "about a minute ago"
-msgstr ""
-
-#: ../lib/util.php:828
-msgid "about a month ago"
-msgstr ""
-
-#: ../lib/util.php:832
-msgid "about a year ago"
-msgstr ""
-
-#: ../lib/util.php:820
-msgid "about an hour ago"
-msgstr ""
-
-#: ../actions/noticesearch.php:126
-#: ../actions/showstream.php:383
-#: ../lib/stream.php:101
-msgid "in reply to..."
-msgstr ""
-
-#: ../actions/noticesearch.php:133
-#: ../actions/showstream.php:390
-#: ../lib/stream.php:108
-msgid "reply"
-msgstr ""
-
-#: ../actions/password.php:44
-msgid "same as password above"
-msgstr ""
-
-#: ../lib/util.php:1127
-msgid "« After"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:177
-msgid ""
-" except this private data: password, email address, IM address, phone "
-"number."
-msgstr ""
-
-#: ../actions/showstream.php:400 ../lib/stream.php:105
-msgid " from "
-msgstr ""
-
-#: ../actions/twitapistatuses.php:470
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../lib/mail.php:120
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr ""
-
-#: ../lib/mail.php:122
-#, php-format
-msgid ""
-"%1$s is now listening to your notices on %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s.\n"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:474
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-
-#: ../actions/all.php:47 ../actions/allrss.php:60
-#: ../actions/twitapistatuses.php:235 ../lib/stream.php:51
-#, php-format
-msgid "%s and friends"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
-msgstr ""
-
-#: ../lib/mail.php:202
-#, php-format
-msgid "%s status"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:335
-#, php-format
-msgid "%s timeline"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:199
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr ""
-
-#: ../lib/util.php:256
-#, php-format
-msgid ""
-"**%%site.name%%** is a microblogging service brought to you by "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
-msgstr ""
-
-#: ../lib/util.php:258
-#, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr ""
-
-#: ../lib/util.php:273
-msgid ". Contributors should be attributed by full name or nickname."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-
-#: ../actions/register.php:143
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-
-#: ../actions/password.php:42
-msgid "6 or more characters"
-msgstr ""
-
-#: ../actions/recoverpassword.php:180
-msgid "6 or more characters, and don't forget it!"
-msgstr ""
-
-#: ../actions/register.php:145
-msgid "6 or more characters. Required."
-msgstr ""
-
-#: ../actions/imsettings.php:197
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
-msgstr ""
-
-#: ../actions/emailsettings.php:213
-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 ""
-
-#: ../actions/smssettings.php:216
-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 ""
-
-#: ../lib/util.php:321
-msgid "About"
-msgstr ""
-
-#: ../actions/userauthorization.php:119
-msgid "Accept"
-msgstr ""
-
-#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
-#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
-msgid "Add"
-msgstr ""
-
-#: ../lib/settingsaction.php:97
-msgid "Add or remove OpenIDs"
-msgstr ""
-
-#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39
-msgid "Address"
-msgstr ""
-
-#: ../actions/showstream.php:273
-msgid "All subscriptions"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
-#: ../actions/openidlogin.php:29 ../actions/register.php:30
-msgid "Already logged in."
-msgstr ""
-
-#: ../actions/subscribe.php:49
-msgid "Already subscribed!."
-msgstr ""
-
-#: ../actions/deletenotice.php:54
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/userauthorization.php:77
-msgid "Authorize subscription"
-msgstr "Authorise subscription"
-
-#: ../actions/login.php:104 ../actions/register.php:164
-msgid "Automatically login in the future; not for shared computers!"
-msgstr ""
-
-#: ../actions/profilesettings.php:65
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
-msgstr ""
-
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-msgid "Avatar"
-msgstr ""
-
-#: ../actions/emailsettings.php:54
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-msgstr ""
-
-#: ../actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
-
-#: ../lib/util.php:1301
-msgid "Before »"
-msgstr ""
-
-#: ../actions/profilesettings.php:49 ../actions/register.php:156
-msgid "Bio"
-msgstr ""
-
-#: ../actions/profilesettings.php:101 ../actions/register.php:78
-#: ../actions/updateprofile.php:103
-msgid "Bio is too long (max 140 chars)."
-msgstr ""
-
-#: ../lib/deleteaction.php:41
-msgid "Can't delete this notice."
-msgstr ""
-
-#: ../actions/updateprofile.php:119
-#, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr ""
-
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
-msgid "Can't save new password."
-msgstr ""
-
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62
-msgid "Cancel"
-msgstr ""
-
-#: ../actions/imsettings.php:163
-msgid "Cannot normalize that Jabber ID"
-msgstr "Cannot normalise that Jabber ID"
-
-#: ../actions/emailsettings.php:181
-#, fuzzy
-msgid "Cannot normalize that email address"
-msgstr "Cannot normalise that Jabber ID"
-
-#: ../lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
-msgstr ""
-
-#: ../lib/settingsaction.php:85
-msgid "Change your profile settings"
-msgstr ""
-
-#: ../actions/password.php:43 ../actions/recoverpassword.php:181
-#: ../actions/register.php:146 ../actions/smssettings.php:65
-msgid "Confirm"
-msgstr ""
-
-#: ../actions/confirmaddress.php:86
-msgid "Confirm Address"
-msgstr ""
-
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245
-msgid "Confirmation cancelled."
-msgstr ""
-
-#: ../actions/smssettings.php:63
-msgid "Confirmation code"
-msgstr ""
-
-#: ../actions/register.php:188
-#, php-format
-msgid ""
-"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."
-msgstr ""
-
-#: ../lib/util.php:329
-msgid "Contact"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:48
-msgid "Could not follow user: User not found."
-msgstr ""
-
-#: ../actions/updateprofile.php:162
-msgid "Could not save avatar info"
-msgstr ""
-
-#: ../actions/updateprofile.php:155
-msgid "Could not save new profile info"
-msgstr ""
-
-#: ../actions/subscribe.php:62
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../actions/subscribe.php:54
-msgid "Could not subscribe."
-msgstr ""
-
-#: ../actions/recoverpassword.php:102
-msgid "Could not update user with confirmed email address."
-msgstr ""
-
-#: ../actions/confirmaddress.php:80 ../actions/emailsettings.php:234
-#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
-msgid "Couldn't delete email confirmation."
-msgstr ""
-
-#: ../actions/unsubscribe.php:57
-msgid "Couldn't delete subscription."
-msgstr ""
-
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206
-msgid "Couldn't insert confirmation code."
-msgstr ""
-
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:92
-msgid "Couldn't save profile."
-msgstr ""
-
-#: ../actions/profilesettings.php:161
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-msgid "Couldn't update user record."
-msgstr ""
-
-#: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
-#: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
-#: ../actions/imsettings.php:243 ../actions/profilesettings.php:141
-#: ../actions/smssettings.php:157 ../actions/smssettings.php:269
-msgid "Couldn't update user."
-msgstr ""
-
-#: ../actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:44
-msgid "Current confirmed email address."
-msgstr ""
-
-#: ../actions/showstream.php:356
-msgid "Currently"
-msgstr ""
-
-#: ../classes/Notice.php:72
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr ""
-
-#: ../lib/util.php:1044
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr ""
-
-#: ../actions/deletenotice.php:41
-msgid "Delete notice"
-msgstr ""
-
-#: ../actions/profilesettings.php:51 ../actions/register.php:158
-msgid "Describe yourself and your interests in 140 chars"
-msgstr ""
-
-#: ../actions/register.php:148 ../lib/settingsaction.php:87
-msgid "Email"
-msgstr ""
-
-#: ../actions/emailsettings.php:59
-msgid "Email Address"
-msgstr ""
-
-#: ../actions/emailsettings.php:32
-msgid "Email Settings"
-msgstr ""
-
-#: ../actions/register.php:69
-msgid "Email address already exists."
-msgstr ""
-
-#: ../lib/mail.php:90
-msgid "Email address confirmation"
-msgstr ""
-
-#: ../actions/emailsettings.php:61
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/recoverpassword.php:191
-msgid "Enter a nickname or email address."
-msgstr ""
-
-#: ../actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/userauthorization.php:137
-msgid "Error authorizing token"
-msgstr "Error authorising token"
-
-#: ../actions/finishopenidlogin.php:253
-msgid "Error connecting user to OpenID."
-msgstr ""
-
-#: ../actions/recoverpassword.php:240
-msgid "Error saving address confirmation."
-msgstr ""
-
-#: ../actions/userauthorization.php:140
-msgid "Error saving remote profile"
-msgstr ""
-
-#: ../lib/openid.php:226
-msgid "Error saving the profile."
-msgstr ""
-
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:94
-msgid "Error setting user."
-msgstr ""
-
-#: ../actions/recoverpassword.php:80
-msgid "Error with confirmation code."
-msgstr ""
-
-#: ../lib/util.php:323
-msgid "FAQ"
-msgstr ""
-
-#: ../actions/all.php:61 ../actions/allrss.php:64
-#, php-format
-msgid "Feed for friends of %s"
-msgstr ""
-
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#, php-format
-msgid "Feed for replies to %s"
-msgstr ""
-
-#: ../actions/tag.php:55
-#, php-format
-msgid "Feed for tag %s"
-msgstr ""
-
-#: ../lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/login.php:122
-msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
-msgstr ""
-
-#: ../actions/profilesettings.php:44 ../actions/register.php:150
-msgid "Full name"
-msgstr ""
-
-#: ../actions/profilesettings.php:98 ../actions/register.php:75
-#: ../actions/updateprofile.php:93
-msgid "Full name is too long (max 255 chars)."
-msgstr ""
-
-#: ../lib/util.php:319
-msgid "Help"
-msgstr ""
-
-#: ../lib/util.php:297
-msgid "Home"
-msgstr ""
-
-#: ../actions/profilesettings.php:46 ../actions/register.php:153
-msgid "Homepage"
-msgstr ""
-
-#: ../actions/profilesettings.php:95 ../actions/register.php:72
-msgid "Homepage is not a valid URL."
-msgstr ""
-
-#: ../actions/emailsettings.php:91
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102
-msgid "IM"
-msgstr ""
-
-#: ../actions/imsettings.php:60
-msgid "IM Address"
-msgstr ""
-
-#: ../actions/recoverpassword.php:137
-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 ""
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283
-msgid "Incoming email address removed."
-msgstr ""
-
-#: ../actions/login.php:67
-msgid "Incorrect username or password."
-msgstr ""
-
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
-msgstr ""
-
-#: ../actions/updateprofile.php:114
-#, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr ""
-
-#: ../actions/updateprofile.php:98
-#, php-format
-msgid "Invalid homepage '%s'"
-msgstr ""
-
-#: ../actions/updateprofile.php:82
-#, php-format
-msgid "Invalid license URL '%s'"
-msgstr ""
-
-#: ../actions/updateprofile.php:87
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:89
-#: ../actions/register.php:107
-msgid "Invalid username or password."
-msgstr ""
-
-#: ../lib/util.php:260
-#, 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 ""
-
-#: ../actions/imsettings.php:173
-msgid "Jabber ID already belongs to another user."
-msgstr ""
-
-#: ../actions/imsettings.php:62
-#, 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 ""
-
-#: ../actions/profilesettings.php:57
-msgid "Language"
-msgstr ""
-
-#: ../actions/profilesettings.php:113
-msgid "Language is too long (max 50 chars)."
-msgstr ""
-
-#: ../actions/profilesettings.php:52 ../actions/register.php:159
-msgid "Location"
-msgstr ""
-
-#: ../actions/profilesettings.php:104 ../actions/register.php:81
-#: ../actions/updateprofile.php:108
-msgid "Location is too long (max 255 chars)."
-msgstr ""
-
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:307
-msgid "Login"
-msgstr ""
-
-#: ../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 ""
-
-#: ../lib/util.php:305
-msgid "Logout"
-msgstr ""
-
-#: ../actions/register.php:152
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
-
-#: ../actions/login.php:110
-msgid "Lost or forgotten password?"
-msgstr ""
-
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr ""
-
-#: ../actions/showstream.php:300
-msgid "Member since"
-msgstr ""
-
-#: ../actions/smssettings.php:304
-#, php-format
-msgid ""
-"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
-"email but isn't listed here, send email to let us know at %s."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:174
-msgid "My text and files are available under "
-msgstr ""
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-msgid "New"
-msgstr ""
-
-#: ../lib/mail.php:140
-#, php-format
-msgid "New email address for posting to %s"
-msgstr ""
-
-#: ../actions/emailsettings.php:297
-msgid "New incoming email address added."
-msgstr ""
-
-#: ../actions/newnotice.php:85
-msgid "New notice"
-msgstr ""
-
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-msgid "New password"
-msgstr ""
-
-#: ../actions/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
-msgstr ""
-
-#: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:142
-msgid "Nickname"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:65
-msgid "Nickname already in use. Try another one."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:63 ../actions/updateprofile.php:77
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-
-#: ../actions/recoverpassword.php:162
-msgid "Nickname or email"
-msgstr ""
-
-#: ../actions/deletenotice.php:59
-msgid "No"
-msgstr ""
-
-#: ../actions/imsettings.php:156
-msgid "No Jabber ID."
-msgstr ""
-
-#: ../actions/userauthorization.php:129
-msgid "No authorization request!"
-msgstr "No authorisation request!"
-
-#: ../actions/smssettings.php:181
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316
-msgid "No code entered"
-msgstr ""
-
-#: ../actions/newnotice.php:44
-msgid "No content!"
-msgstr ""
-
-#: ../actions/emailsettings.php:174
-msgid "No email address."
-msgstr ""
-
-#: ../actions/userbyid.php:32
-msgid "No id."
-msgstr ""
-
-#: ../actions/emailsettings.php:271
-msgid "No incoming email address."
-msgstr ""
-
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229
-msgid "No pending confirmation to cancel."
-msgstr ""
-
-#: ../actions/smssettings.php:176
-msgid "No phone number."
-msgstr ""
-
-#: ../actions/recoverpassword.php:226
-msgid "No registered email address for that user."
-msgstr ""
-
-#: ../actions/userauthorization.php:49
-msgid "No request found!"
-msgstr ""
-
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-msgid "No results"
-msgstr ""
-
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30
-msgid "No such notice."
-msgstr ""
-
-#: ../actions/all.php:34 ../actions/allrss.php:35
-#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
-#: ../actions/remotesubscribe.php:84 ../actions/remotesubscribe.php:91
-#: ../actions/replies.php:57 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:110 ../actions/subscribe.php:44
-#: ../actions/unsubscribe.php:39 ../actions/userbyid.php:36
-#: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
-msgid "No such user."
-msgstr ""
-
-#: ../actions/recoverpassword.php:211
-msgid "No user with that email address or username."
-msgstr ""
-
-#: ../lib/gallery.php:80
-msgid "Nobody to show!"
-msgstr ""
-
-#: ../scripts/maildaemon.php:50
-msgid "Not a registered user."
-msgstr ""
-
-#: ../actions/imsettings.php:167
-msgid "Not a valid Jabber ID"
-msgstr ""
-
-#: ../actions/emailsettings.php:185
-msgid "Not a valid email address"
-msgstr ""
-
-#: ../actions/register.php:59
-msgid "Not a valid email address."
-msgstr ""
-
-#: ../actions/profilesettings.php:91 ../actions/register.php:67
-msgid "Not a valid nickname."
-msgstr ""
-
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:28
-#: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
-#: ../lib/settingsaction.php:27
-msgid "Not logged in."
-msgstr ""
-
-#: ../actions/unsubscribe.php:44
-msgid "Not subscribed!."
-msgstr ""
-
-#: ../actions/opensearch.php:35
-msgid "Notice Search"
-msgstr ""
-
-#: ../actions/showstream.php:316
-msgid "Notices"
-msgstr ""
-
-#: ../actions/tag.php:35 ../actions/tag.php:81
-#, php-format
-msgid "Notices tagged with %s"
-msgstr ""
-
-#: ../lib/settingsaction.php:96 ../lib/util.php:311
-msgid "OpenID"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60
-msgid "OpenID Login"
-msgstr ""
-
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-msgid "OpenID URL"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-msgid "OpenID authentication cancelled."
-msgstr ""
-
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
-#: ../actions/register.php:144 ../lib/settingsaction.php:93
-msgid "Password"
-msgstr ""
-
-#: ../actions/recoverpassword.php:288
-msgid "Password and confirmation do not match."
-msgstr ""
-
-#: ../actions/recoverpassword.php:284
-msgid "Password must be 6 chars or more."
-msgstr ""
-
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-msgid "Password recovery requested"
-msgstr ""
-
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-msgid "Password saved."
-msgstr ""
-
-#: ../actions/password.php:61 ../actions/register.php:84
-msgid "Passwords don't match."
-msgstr ""
-
-#: ../lib/searchaction.php:100
-msgid "People"
-msgstr ""
-
-#: ../actions/opensearch.php:33
-msgid "People Search"
-msgstr ""
-
-#: ../lib/stream.php:50
-msgid "Personal"
-msgstr ""
-
-#: ../actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-
-#: ../actions/userauthorization.php:78
-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 \"Cancel\"."
-msgstr ""
-
-#: ../actions/imsettings.php:73
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr ""
-
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94
-msgid "Preferences"
-msgstr ""
-
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163
-msgid "Preferences saved."
-msgstr ""
-
-#: ../actions/profilesettings.php:57
-msgid "Preferred language"
-msgstr ""
-
-#: ../lib/util.php:325
-msgid "Privacy"
-msgstr ""
-
-#: ../classes/Notice.php:95 ../classes/Notice.php:102
-msgid "Problem saving notice."
-msgstr ""
-
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60
-msgid "Profile"
-msgstr ""
-
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-msgid "Profile unknown"
-msgstr ""
-
-#: ../actions/imsettings.php:79
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
-
-#: ../actions/emailsettings.php:94
-msgid "Publish a MicroID for my email address."
-msgstr ""
-
-#: ../actions/tag.php:75 ../actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
-
-#: ../actions/recoverpassword.php:166
-msgid "Recover"
-msgstr ""
-
-#: ../actions/recoverpassword.php:156
-msgid "Recover password"
-msgstr ""
-
-#: ../actions/register.php:138 ../actions/register.php:179 ../lib/util.php:309
-msgid "Register"
-msgstr ""
-
-#: ../actions/register.php:28
-msgid "Registration not allowed."
-msgstr ""
-
-#: ../actions/register.php:186
-msgid "Registration successful"
-msgstr ""
-
-#: ../actions/userauthorization.php:120
-msgid "Reject"
-msgstr ""
-
-#: ../actions/login.php:103 ../actions/register.php:162
-msgid "Remember me"
-msgstr ""
-
-#: ../actions/updateprofile.php:70
-msgid "Remote profile with no matching profile"
-msgstr ""
-
-#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
-#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
-#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
-msgid "Remove"
-msgstr ""
-
-#: ../lib/stream.php:55
-msgid "Replies"
-msgstr ""
-
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
-#, php-format
-msgid "Replies to %s"
-msgstr ""
-
-#: ../actions/recoverpassword.php:183
-msgid "Reset"
-msgstr ""
-
-#: ../actions/recoverpassword.php:173
-msgid "Reset password"
-msgstr ""
-
-#: ../lib/settingsaction.php:99
-msgid "SMS"
-msgstr ""
-
-#: ../actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
-
-#: ../actions/smssettings.php:33
-msgid "SMS Settings"
-msgstr ""
-
-#: ../lib/mail.php:215
-msgid "SMS confirmation"
-msgstr ""
-
-#: ../actions/recoverpassword.php:182
-msgid "Same as password above"
-msgstr ""
-
-#: ../actions/register.php:147
-msgid "Same as password above. Required."
-msgstr ""
-
-#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
-#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
-msgid "Save"
-msgstr ""
-
-#: ../lib/searchaction.php:84 ../lib/util.php:299
-msgid "Search"
-msgstr ""
-
-#: ../actions/smssettings.php:296
-msgid "Select a carrier"
-msgstr ""
-
-#: ../lib/util.php:1155
-msgid "Send"
-msgstr ""
-
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
-msgstr ""
-
-#: ../actions/emailsettings.php:88
-msgid "Send me notices of new subscriptions through email."
-msgstr ""
-
-#: ../actions/imsettings.php:70
-msgid "Send me notices through Jabber/GTalk."
-msgstr ""
-
-#: ../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
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr ""
-
-#: ../lib/util.php:303
-msgid "Settings"
-msgstr ""
-
-#: ../actions/profilesettings.php:192
-msgid "Settings saved."
-msgstr ""
-
-#: ../actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-msgid "Something weird happened."
-msgstr ""
-
-#: ../scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-
-#: ../lib/util.php:327
-msgid "Source"
-msgstr ""
-
-#: ../actions/showstream.php:296
-msgid "Statistics"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-msgid "Stored OpenID not found."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197
-msgid "Subscribe"
-msgstr ""
-
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-msgid "Subscribers"
-msgstr ""
-
-#: ../actions/userauthorization.php:310
-msgid "Subscription authorized"
-msgstr "Subscription authorised"
-
-#: ../actions/userauthorization.php:320
-msgid "Subscription rejected"
-msgstr ""
-
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27
-msgid "Subscriptions"
-msgstr ""
-
-#: ../actions/tag.php:41 ../lib/util.php:300
-msgid "Tags"
-msgstr ""
-
-#: ../lib/searchaction.php:104
-msgid "Text"
-msgstr ""
-
-#: ../actions/emailsettings.php:191
-msgid "That email address already belongs to another user."
-msgstr ""
-
-#: ../actions/imsettings.php:170
-msgid "That is already your Jabber ID."
-msgstr ""
-
-#: ../actions/emailsettings.php:188
-msgid "That is already your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:188
-msgid "That is already your phone number."
-msgstr ""
-
-#: ../actions/imsettings.php:233
-msgid "That is not your Jabber ID."
-msgstr ""
-
-#: ../actions/emailsettings.php:249
-msgid "That is not your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:257
-msgid "That is not your phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-msgid "That is the wrong IM address."
-msgstr ""
-
-#: ../actions/smssettings.php:233
-msgid "That is the wrong confirmation number."
-msgstr ""
-
-#: ../actions/smssettings.php:191
-msgid "That phone number already belongs to another user."
-msgstr ""
-
-#: ../actions/newnotice.php:47
-msgid "That's too long. Max notice size is 140 chars."
-msgstr ""
-
-#: ../actions/confirmaddress.php:88
-#, php-format
-msgid "The address \"%s\" has been confirmed for your account."
-msgstr ""
-
-#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274
-msgid "The address was removed."
-msgstr ""
-
-#: ../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 ""
-"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
-msgid ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the site's instructions for details on how to fully reject the "
-"subscription."
-msgstr ""
-
-#: ../actions/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
-msgstr ""
-
-#: ../lib/util.php:163
-msgid "This page is not available in a media type you accept"
-msgstr ""
-
-#: ../actions/profilesettings.php:63
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107
-msgid "Timezone not selected."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:150
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
-
-#: ../actions/profilesettings.php:48 ../actions/register.php:155
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr ""
-
-#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
-#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
-msgid "Unexpected form submission."
-msgstr ""
-
-#: ../actions/recoverpassword.php:276
-msgid "Unexpected password reset."
-msgstr ""
-
-#: ../index.php:57
-msgid "Unknown action"
-msgstr ""
-
-#: ../lib/util.php:268
-msgid ""
-"Unless otherwise specified, contents of this site are copyright by the "
-"contributors and available under the "
-msgstr ""
-
-#: ../actions/showstream.php:209
-msgid "Unsubscribe"
-msgstr ""
-
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-msgid "Unsupported OMB version"
-msgstr ""
-
-#: ../lib/twitterapi.php:248 ../lib/twitterapi.php:269
-msgid "Unsupported type"
-msgstr ""
-
-#: ../lib/settingsaction.php:100
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:238
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:338
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr ""
-
-#: ../actions/register.php:149
-msgid "Used only for updates, announcements, and password recovery"
-msgstr ""
-
-#: ../actions/all.php:41 ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:47 ../actions/replies.php:41
-#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:78
-#: ../actions/twitapistatuses.php:316 ../actions/twitapistatuses.php:622
-#: ../actions/twitapiusers.php:82
-msgid "User has no profile."
-msgstr ""
-
-#: ../actions/profilesettings.php:63
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../lib/util.php:1142
-#, php-format
-msgid "What's up, %s?"
-msgstr ""
-
-#: ../actions/profilesettings.php:54 ../actions/register.php:161
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Where you are, like \"Town or City, Region, Country\""
-
-#: ../actions/updateprofile.php:128
-#, php-format
-msgid "Wrong image type for '%s'"
-msgstr ""
-
-#: ../actions/updateprofile.php:123
-#, php-format
-msgid "Wrong size image at '%s'"
-msgstr ""
-
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-msgid "Yes"
-msgstr ""
-
-#: ../actions/deletenotice.php:37
-msgid ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:115
-msgid "You are not friends with the specified user."
-msgstr ""
-
-#: ../actions/register.php:131
-msgid "You can create a new account to start posting notices."
-msgstr ""
-
-#: ../actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-msgid "You can use the local subscription!"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:57
-msgid "You can't register if you don't agree to the license."
-msgstr ""
-
-#: ../actions/updateprofile.php:63
-msgid "You did not send us that profile"
-msgstr ""
-
-#: ../lib/mail.php:143
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
-"Send email to %2$s to post new messages.\n"
-"\n"
-"More email instructions at %3$s.\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s"
-msgstr ""
-
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
-msgstr ""
-
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
-msgstr ""
-
-#: ../lib/util.php:930
-msgid "a few seconds ago"
-msgstr ""
-
-#: ../lib/util.php:942
-#, php-format
-msgid "about %d days ago"
-msgstr ""
-
-#: ../lib/util.php:938
-#, php-format
-msgid "about %d hours ago"
-msgstr ""
-
-#: ../lib/util.php:934
-#, php-format
-msgid "about %d minutes ago"
-msgstr ""
-
-#: ../lib/util.php:946
-#, php-format
-msgid "about %d months ago"
-msgstr ""
-
-#: ../lib/util.php:940
-msgid "about a day ago"
-msgstr ""
-
-#: ../lib/util.php:932
-msgid "about a minute ago"
-msgstr ""
-
-#: ../lib/util.php:944
-msgid "about a month ago"
-msgstr ""
-
-#: ../lib/util.php:948
-msgid "about a year ago"
-msgstr ""
-
-#: ../lib/util.php:936
-msgid "about an hour ago"
-msgstr ""
-
-#: ../actions/showstream.php:423 ../lib/stream.php:128
-msgid "delete"
-msgstr ""
-
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:113
-msgid "in reply to..."
-msgstr ""
-
-#: ../lib/twitterapi.php:354
-msgid "not a supported data format"
-msgstr ""
-
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:120
-msgid "reply"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:692
-msgid "unsupported file type"
-msgstr ""
-
-#: ../lib/util.php:1292
-msgid "« After"
-msgstr ""
diff --git a/locale/eo/LC_MESSAGES/laconica.mo b/locale/eo/LC_MESSAGES/laconica.mo
deleted file mode 100644
index 6caac24f4..000000000
--- a/locale/eo/LC_MESSAGES/laconica.mo
+++ /dev/null
diff --git a/locale/eo/LC_MESSAGES/laconica.po b/locale/eo/LC_MESSAGES/laconica.po
deleted file mode 100644
index f1b317be2..000000000
--- a/locale/eo/LC_MESSAGES/laconica.po
+++ /dev/null
@@ -1,2109 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-27 14:57-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../actions/noticesearchrss.php:64
-#, php-format
-msgid " Search Stream for \"%s\""
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
-msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr ""
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-msgid " from "
-msgstr ""
-
-#: ../actions/twitapistatuses.php:478
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/invite.php:168
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-
-#: ../lib/mail.php:124
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr ""
-
-#: ../lib/mail.php:126
-#, php-format
-msgid ""
-"%1$s is now listening to your notices on %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s.\n"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:482
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-
-#: ../actions/shownotice.php:45
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr ""
-
-#: ../actions/invite.php:84 ../actions/invite.php:92
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/publicrss.php:62
-#, php-format
-msgid "%s Public Stream"
-msgstr ""
-
-#: ../actions/all.php:47 ../actions/allrss.php:60
-#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51
-#, php-format
-msgid "%s and friends"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
-msgstr ""
-
-#: ../lib/mail.php:206
-#, php-format
-msgid "%s status"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:338
-#, php-format
-msgid "%s timeline"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:213
-msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr ""
-
-#: ../lib/util.php:257
-#, php-format
-msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
-msgstr ""
-
-#: ../lib/util.php:259
-#, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr ""
-
-#: ../lib/util.php:274
-msgid ". Contributors should be attributed by full name or nickname."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-
-#: ../actions/register.php:152
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-
-#: ../actions/password.php:42
-msgid "6 or more characters"
-msgstr ""
-
-#: ../actions/recoverpassword.php:180
-msgid "6 or more characters, and don't forget it!"
-msgstr ""
-
-#: ../actions/register.php:154
-msgid "6 or more characters. Required."
-msgstr ""
-
-#: ../actions/imsettings.php:197
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
-msgstr ""
-
-#: ../actions/emailsettings.php:213
-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 ""
-
-#: ../actions/smssettings.php:216
-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 ""
-
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122
-msgid "API method not found!"
-msgstr ""
-
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-msgid "API method under construction."
-msgstr ""
-
-#: ../lib/util.php:324
-msgid "About"
-msgstr ""
-
-#: ../actions/userauthorization.php:119
-msgid "Accept"
-msgstr ""
-
-#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
-#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
-msgid "Add"
-msgstr ""
-
-#: ../actions/openidsettings.php:43
-msgid "Add OpenID"
-msgstr ""
-
-#: ../lib/settingsaction.php:97
-msgid "Add or remove OpenIDs"
-msgstr ""
-
-#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39
-msgid "Address"
-msgstr ""
-
-#: ../actions/invite.php:131
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../actions/showstream.php:273
-msgid "All subscriptions"
-msgstr ""
-
-#: ../actions/publicrss.php:64
-#, php-format
-msgid "All updates for %s"
-msgstr ""
-
-#: ../actions/noticesearchrss.php:66
-#, php-format
-msgid "All updates matching search term \"%s\""
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
-#: ../actions/openidlogin.php:29 ../actions/register.php:30
-msgid "Already logged in."
-msgstr ""
-
-#: ../lib/subs.php:42
-msgid "Already subscribed!."
-msgstr ""
-
-#: ../actions/deletenotice.php:54
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/userauthorization.php:77
-msgid "Authorize subscription"
-msgstr ""
-
-#: ../actions/login.php:104 ../actions/register.php:178
-msgid "Automatically login in the future; not for shared computers!"
-msgstr ""
-
-#: ../actions/profilesettings.php:65
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr ""
-
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-msgid "Avatar"
-msgstr ""
-
-#: ../actions/avatar.php:113
-msgid "Avatar updated."
-msgstr ""
-
-#: ../actions/imsettings.php:55
-#, 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 ""
-
-#: ../actions/emailsettings.php:54
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-msgstr ""
-
-#: ../actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
-
-#: ../lib/util.php:1318
-msgid "Before »"
-msgstr ""
-
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
-msgid "Bio"
-msgstr ""
-
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103
-msgid "Bio is too long (max 140 chars)."
-msgstr ""
-
-#: ../lib/deleteaction.php:41
-msgid "Can't delete this notice."
-msgstr ""
-
-#: ../actions/updateprofile.php:119
-#, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr ""
-
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
-msgid "Can't save new password."
-msgstr ""
-
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62
-msgid "Cancel"
-msgstr ""
-
-#: ../lib/openid.php:121
-msgid "Cannot instantiate OpenID consumer object."
-msgstr ""
-
-#: ../actions/imsettings.php:163
-msgid "Cannot normalize that Jabber ID"
-msgstr ""
-
-#: ../actions/emailsettings.php:181
-msgid "Cannot normalize that email address"
-msgstr ""
-
-#: ../actions/password.php:45
-msgid "Change"
-msgstr ""
-
-#: ../lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
-#: ../actions/password.php:32
-msgid "Change password"
-msgstr ""
-
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
-msgstr ""
-
-#: ../lib/settingsaction.php:85
-msgid "Change your profile settings"
-msgstr ""
-
-#: ../actions/password.php:43 ../actions/recoverpassword.php:181
-#: ../actions/register.php:155 ../actions/smssettings.php:65
-msgid "Confirm"
-msgstr ""
-
-#: ../actions/confirmaddress.php:90
-msgid "Confirm Address"
-msgstr ""
-
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245
-msgid "Confirmation cancelled."
-msgstr ""
-
-#: ../actions/smssettings.php:63
-msgid "Confirmation code"
-msgstr ""
-
-#: ../actions/confirmaddress.php:38
-msgid "Confirmation code not found."
-msgstr ""
-
-#: ../actions/register.php:202
-#, php-format
-msgid ""
-"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."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:91
-msgid "Connect"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:86
-msgid "Connect existing account"
-msgstr ""
-
-#: ../lib/util.php:332
-msgid "Contact"
-msgstr ""
-
-#: ../lib/openid.php:178
-#, php-format
-msgid "Could not create OpenID form: %s"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr ""
-
-#: ../lib/openid.php:160
-#, php-format
-msgid "Could not redirect to server: %s"
-msgstr ""
-
-#: ../actions/updateprofile.php:162
-msgid "Could not save avatar info"
-msgstr ""
-
-#: ../actions/updateprofile.php:155
-msgid "Could not save new profile info"
-msgstr ""
-
-#: ../lib/subs.php:54
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../lib/subs.php:46
-msgid "Could not subscribe."
-msgstr ""
-
-#: ../actions/recoverpassword.php:102
-msgid "Could not update user with confirmed email address."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:99
-msgid "Couldn't convert request tokens to access tokens."
-msgstr ""
-
-#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
-#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
-msgid "Couldn't delete email confirmation."
-msgstr ""
-
-#: ../lib/subs.php:103
-msgid "Couldn't delete subscription."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:93
-msgid "Couldn't find any statuses."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:127
-msgid "Couldn't get a request token."
-msgstr ""
-
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206
-msgid "Couldn't insert confirmation code."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:180
-msgid "Couldn't insert new subscription."
-msgstr ""
-
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-msgid "Couldn't save profile."
-msgstr ""
-
-#: ../actions/profilesettings.php:161
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-msgid "Couldn't update user record."
-msgstr ""
-
-#: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
-#: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
-#: ../actions/imsettings.php:243 ../actions/profilesettings.php:141
-#: ../actions/smssettings.php:157 ../actions/smssettings.php:269
-msgid "Couldn't update user."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:84
-msgid "Create"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:70
-msgid "Create a new user with this nickname."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:68
-msgid "Create new account"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:191
-msgid "Creating new account for OpenID that already has a user."
-msgstr ""
-
-#: ../actions/imsettings.php:45
-msgid "Current confirmed Jabber/GTalk address."
-msgstr ""
-
-#: ../actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:44
-msgid "Current confirmed email address."
-msgstr ""
-
-#: ../actions/showstream.php:356
-msgid "Currently"
-msgstr ""
-
-#: ../classes/Notice.php:72
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr ""
-
-#: ../lib/util.php:1061
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr ""
-
-#: ../actions/deletenotice.php:41
-msgid "Delete notice"
-msgstr ""
-
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-msgid "Describe yourself and your interests in 140 chars"
-msgstr ""
-
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87
-msgid "Email"
-msgstr ""
-
-#: ../actions/emailsettings.php:59
-msgid "Email Address"
-msgstr ""
-
-#: ../actions/emailsettings.php:32
-msgid "Email Settings"
-msgstr ""
-
-#: ../actions/register.php:73
-msgid "Email address already exists."
-msgstr ""
-
-#: ../lib/mail.php:90
-msgid "Email address confirmation"
-msgstr ""
-
-#: ../actions/emailsettings.php:61
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/invite.php:129
-msgid "Email addresses"
-msgstr ""
-
-#: ../actions/recoverpassword.php:191
-msgid "Enter a nickname or email address."
-msgstr ""
-
-#: ../actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/userauthorization.php:137
-msgid "Error authorizing token"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:253
-msgid "Error connecting user to OpenID."
-msgstr ""
-
-#: ../actions/finishaddopenid.php:78
-msgid "Error connecting user."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:151
-msgid "Error inserting avatar"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:143
-msgid "Error inserting new profile"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:167
-msgid "Error inserting remote profile"
-msgstr ""
-
-#: ../actions/recoverpassword.php:240
-msgid "Error saving address confirmation."
-msgstr ""
-
-#: ../actions/userauthorization.php:140
-msgid "Error saving remote profile"
-msgstr ""
-
-#: ../lib/openid.php:226
-msgid "Error saving the profile."
-msgstr ""
-
-#: ../lib/openid.php:237
-msgid "Error saving the user."
-msgstr ""
-
-#: ../actions/password.php:80
-msgid "Error saving user; invalid."
-msgstr ""
-
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
-msgid "Error setting user."
-msgstr ""
-
-#: ../actions/finishaddopenid.php:83
-msgid "Error updating profile"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:161
-msgid "Error updating remote profile"
-msgstr ""
-
-#: ../actions/recoverpassword.php:80
-msgid "Error with confirmation code."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:89
-msgid "Existing nickname"
-msgstr ""
-
-#: ../lib/util.php:326
-msgid "FAQ"
-msgstr ""
-
-#: ../actions/avatar.php:115
-msgid "Failed updating avatar."
-msgstr ""
-
-#: ../actions/all.php:61 ../actions/allrss.php:64
-#, php-format
-msgid "Feed for friends of %s"
-msgstr ""
-
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#, php-format
-msgid "Feed for replies to %s"
-msgstr ""
-
-#: ../actions/tag.php:55
-#, php-format
-msgid "Feed for tag %s"
-msgstr ""
-
-#: ../lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/login.php:122
-msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
-msgstr ""
-
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
-msgid "Full name"
-msgstr ""
-
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93
-msgid "Full name is too long (max 255 chars)."
-msgstr ""
-
-#: ../lib/util.php:322
-msgid "Help"
-msgstr ""
-
-#: ../lib/util.php:298
-msgid "Home"
-msgstr ""
-
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-msgid "Homepage"
-msgstr ""
-
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-msgid "Homepage is not a valid URL."
-msgstr ""
-
-#: ../actions/emailsettings.php:91
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102
-msgid "IM"
-msgstr ""
-
-#: ../actions/imsettings.php:60
-msgid "IM Address"
-msgstr ""
-
-#: ../actions/imsettings.php:33
-msgid "IM Settings"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:88
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
-msgstr ""
-
-#: ../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 ""
-
-#: ../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
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283
-msgid "Incoming email address removed."
-msgstr ""
-
-#: ../actions/password.php:69
-msgid "Incorrect old password"
-msgstr ""
-
-#: ../actions/login.php:67
-msgid "Incorrect username or password."
-msgstr ""
-
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
-msgstr ""
-
-#: ../actions/updateprofile.php:114
-#, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr ""
-
-#: ../actions/invite.php:55
-#, php-format
-msgid "Invalid email address: %s"
-msgstr ""
-
-#: ../actions/updateprofile.php:98
-#, php-format
-msgid "Invalid homepage '%s'"
-msgstr ""
-
-#: ../actions/updateprofile.php:82
-#, php-format
-msgid "Invalid license URL '%s'"
-msgstr ""
-
-#: ../actions/postnotice.php:61
-msgid "Invalid notice content"
-msgstr ""
-
-#: ../actions/postnotice.php:67
-msgid "Invalid notice uri"
-msgstr ""
-
-#: ../actions/postnotice.php:72
-msgid "Invalid notice url"
-msgstr ""
-
-#: ../actions/updateprofile.php:87
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:96
-msgid "Invalid profile URL (bad format)"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:77
-msgid "Invalid profile URL returned by server."
-msgstr ""
-
-#: ../actions/avatarbynickname.php:37
-msgid "Invalid size."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111
-msgid "Invalid username or password."
-msgstr ""
-
-#: ../actions/invite.php:79
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123
-msgid "Invite new users"
-msgstr ""
-
-#: ../lib/util.php:261
-#, 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 ""
-
-#: ../actions/imsettings.php:173
-msgid "Jabber ID already belongs to another user."
-msgstr ""
-
-#: ../actions/imsettings.php:62
-#, 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 ""
-
-#: ../actions/profilesettings.php:57
-msgid "Language"
-msgstr ""
-
-#: ../actions/profilesettings.php:113
-msgid "Language is too long (max 50 chars)."
-msgstr ""
-
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-msgid "Location"
-msgstr ""
-
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108
-msgid "Location is too long (max 255 chars)."
-msgstr ""
-
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310
-msgid "Login"
-msgstr ""
-
-#: ../actions/openidlogin.php:44
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr ""
-
-#: ../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 ""
-
-#: ../lib/util.php:308
-msgid "Logout"
-msgstr ""
-
-#: ../actions/register.php:166
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
-
-#: ../actions/login.php:110
-msgid "Lost or forgotten password?"
-msgstr ""
-
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr ""
-
-#: ../actions/showstream.php:300
-msgid "Member since"
-msgstr ""
-
-#: ../actions/userrss.php:70
-#, php-format
-msgid "Microblog by %s"
-msgstr ""
-
-#: ../actions/smssettings.php:304
-#, php-format
-msgid ""
-"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
-"email but isn't listed here, send email to let us know at %s."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-msgid "My text and files are available under "
-msgstr ""
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-msgid "New"
-msgstr ""
-
-#: ../lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
-msgstr ""
-
-#: ../actions/emailsettings.php:297
-msgid "New incoming email address added."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:71
-msgid "New nickname"
-msgstr ""
-
-#: ../actions/newnotice.php:87
-msgid "New notice"
-msgstr ""
-
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-msgid "New password"
-msgstr ""
-
-#: ../actions/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
-msgstr ""
-
-#: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151
-msgid "Nickname"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69
-msgid "Nickname already in use. Try another one."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:67 ../actions/updateprofile.php:77
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:170
-msgid "Nickname not allowed."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:72
-msgid "Nickname of the user you want to follow"
-msgstr ""
-
-#: ../actions/recoverpassword.php:162
-msgid "Nickname or email"
-msgstr ""
-
-#: ../actions/deletenotice.php:59
-msgid "No"
-msgstr ""
-
-#: ../actions/imsettings.php:156
-msgid "No Jabber ID."
-msgstr ""
-
-#: ../actions/userauthorization.php:129
-msgid "No authorization request!"
-msgstr ""
-
-#: ../actions/smssettings.php:181
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316
-msgid "No code entered"
-msgstr ""
-
-#: ../actions/confirmaddress.php:33
-msgid "No confirmation code."
-msgstr ""
-
-#: ../actions/newnotice.php:44
-msgid "No content!"
-msgstr ""
-
-#: ../actions/emailsettings.php:174
-msgid "No email address."
-msgstr ""
-
-#: ../actions/userbyid.php:32
-msgid "No id."
-msgstr ""
-
-#: ../actions/emailsettings.php:271
-msgid "No incoming email address."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:65
-msgid "No nickname provided by remote server."
-msgstr ""
-
-#: ../actions/avatarbynickname.php:27
-msgid "No nickname."
-msgstr ""
-
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229
-msgid "No pending confirmation to cancel."
-msgstr ""
-
-#: ../actions/smssettings.php:176
-msgid "No phone number."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:72
-msgid "No profile URL returned by server."
-msgstr ""
-
-#: ../actions/recoverpassword.php:226
-msgid "No registered email address for that user."
-msgstr ""
-
-#: ../actions/userauthorization.php:49
-msgid "No request found!"
-msgstr ""
-
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-msgid "No results"
-msgstr ""
-
-#: ../actions/avatarbynickname.php:32
-msgid "No size."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:595
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555
-msgid "No status with that ID found."
-msgstr ""
-
-#: ../actions/openidsettings.php:135
-msgid "No such OpenID."
-msgstr ""
-
-#: ../actions/doc.php:29
-msgid "No such document."
-msgstr ""
-
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30
-msgid "No such notice."
-msgstr ""
-
-#: ../actions/recoverpassword.php:56
-msgid "No such recovery code."
-msgstr ""
-
-#: ../actions/postnotice.php:56
-msgid "No such subscription"
-msgstr ""
-
-#: ../actions/all.php:34 ../actions/allrss.php:35
-#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
-#: ../actions/remotesubscribe.php:84 ../actions/remotesubscribe.php:91
-#: ../actions/replies.php:57 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:110 ../actions/userbyid.php:36
-#: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
-#: ../lib/subs.php:33 ../lib/subs.php:82
-msgid "No such user."
-msgstr ""
-
-#: ../actions/recoverpassword.php:211
-msgid "No user with that email address or username."
-msgstr ""
-
-#: ../lib/gallery.php:80
-msgid "Nobody to show!"
-msgstr ""
-
-#: ../actions/recoverpassword.php:60
-msgid "Not a recovery code."
-msgstr ""
-
-#: ../scripts/maildaemon.php:50
-msgid "Not a registered user."
-msgstr ""
-
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332
-msgid "Not a supported data format."
-msgstr ""
-
-#: ../actions/imsettings.php:167
-msgid "Not a valid Jabber ID"
-msgstr ""
-
-#: ../lib/openid.php:131
-msgid "Not a valid OpenID."
-msgstr ""
-
-#: ../actions/emailsettings.php:185
-msgid "Not a valid email address"
-msgstr ""
-
-#: ../actions/register.php:63
-msgid "Not a valid email address."
-msgstr ""
-
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-msgid "Not a valid nickname."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:120
-msgid "Not a valid profile URL (incorrect services)."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:113
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:104
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr ""
-
-#: ../actions/avatar.php:95
-msgid "Not an image or corrupt file."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:51
-msgid "Not authorized."
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:38
-msgid "Not expecting this response!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:422
-msgid "Not found"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:28
-#: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
-#: ../lib/settingsaction.php:27
-msgid "Not logged in."
-msgstr ""
-
-#: ../lib/subs.php:91
-msgid "Not subscribed!."
-msgstr ""
-
-#: ../actions/opensearch.php:35
-msgid "Notice Search"
-msgstr ""
-
-#: ../actions/showstream.php:82
-#, php-format
-msgid "Notice feed for %s"
-msgstr ""
-
-#: ../actions/shownotice.php:39
-msgid "Notice has no profile"
-msgstr ""
-
-#: ../actions/showstream.php:316
-msgid "Notices"
-msgstr ""
-
-#: ../actions/tag.php:35 ../actions/tag.php:81
-#, php-format
-msgid "Notices tagged with %s"
-msgstr ""
-
-#: ../actions/password.php:39
-msgid "Old password"
-msgstr ""
-
-#: ../lib/settingsaction.php:96 ../lib/util.php:314
-msgid "OpenID"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:61
-msgid "OpenID Account Setup"
-msgstr ""
-
-#: ../lib/openid.php:180
-msgid "OpenID Auto-Submit"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60
-msgid "OpenID Login"
-msgstr ""
-
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-msgid "OpenID URL"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-msgid "OpenID authentication cancelled."
-msgstr ""
-
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr ""
-
-#: ../lib/openid.php:133
-#, php-format
-msgid "OpenID failure: %s"
-msgstr ""
-
-#: ../actions/openidsettings.php:144
-msgid "OpenID removed."
-msgstr ""
-
-#: ../actions/openidsettings.php:37
-msgid "OpenID settings"
-msgstr ""
-
-#: ../actions/invite.php:135
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
-#: ../actions/avatar.php:84
-msgid "Partial upload."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
-#: ../actions/register.php:153 ../lib/settingsaction.php:93
-msgid "Password"
-msgstr ""
-
-#: ../actions/recoverpassword.php:288
-msgid "Password and confirmation do not match."
-msgstr ""
-
-#: ../actions/recoverpassword.php:284
-msgid "Password must be 6 chars or more."
-msgstr ""
-
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-msgid "Password recovery requested"
-msgstr ""
-
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-msgid "Password saved."
-msgstr ""
-
-#: ../actions/password.php:61 ../actions/register.php:88
-msgid "Passwords don't match."
-msgstr ""
-
-#: ../lib/searchaction.php:100
-msgid "People"
-msgstr ""
-
-#: ../actions/opensearch.php:33
-msgid "People Search"
-msgstr ""
-
-#: ../actions/peoplesearch.php:33
-msgid "People search"
-msgstr ""
-
-#: ../lib/stream.php:50
-msgid "Personal"
-msgstr ""
-
-#: ../actions/invite.php:133
-msgid "Personal message"
-msgstr ""
-
-#: ../actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-
-#: ../actions/userauthorization.php:78
-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 \"Cancel\"."
-msgstr ""
-
-#: ../actions/imsettings.php:73
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr ""
-
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94
-msgid "Preferences"
-msgstr ""
-
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163
-msgid "Preferences saved."
-msgstr ""
-
-#: ../actions/profilesettings.php:57
-msgid "Preferred language"
-msgstr ""
-
-#: ../lib/util.php:328
-msgid "Privacy"
-msgstr ""
-
-#: ../classes/Notice.php:95 ../classes/Notice.php:106
-msgid "Problem saving notice."
-msgstr ""
-
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60
-msgid "Profile"
-msgstr ""
-
-#: ../actions/remotesubscribe.php:73
-msgid "Profile URL"
-msgstr ""
-
-#: ../actions/profilesettings.php:34
-msgid "Profile settings"
-msgstr ""
-
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-msgid "Profile unknown"
-msgstr ""
-
-#: ../actions/public.php:54
-msgid "Public Stream Feed"
-msgstr ""
-
-#: ../actions/public.php:33
-msgid "Public timeline"
-msgstr ""
-
-#: ../actions/imsettings.php:79
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
-
-#: ../actions/emailsettings.php:94
-msgid "Publish a MicroID for my email address."
-msgstr ""
-
-#: ../actions/tag.php:75 ../actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
-
-#: ../actions/recoverpassword.php:166
-msgid "Recover"
-msgstr ""
-
-#: ../actions/recoverpassword.php:156
-msgid "Recover password"
-msgstr ""
-
-#: ../actions/recoverpassword.php:67
-msgid "Recovery code for unknown user."
-msgstr ""
-
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
-msgid "Register"
-msgstr ""
-
-#: ../actions/register.php:28
-msgid "Registration not allowed."
-msgstr ""
-
-#: ../actions/register.php:200
-msgid "Registration successful"
-msgstr ""
-
-#: ../actions/userauthorization.php:120
-msgid "Reject"
-msgstr ""
-
-#: ../actions/login.php:103 ../actions/register.php:176
-msgid "Remember me"
-msgstr ""
-
-#: ../actions/updateprofile.php:70
-msgid "Remote profile with no matching profile"
-msgstr ""
-
-#: ../actions/remotesubscribe.php:65
-msgid "Remote subscribe"
-msgstr ""
-
-#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
-#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
-#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
-msgid "Remove"
-msgstr ""
-
-#: ../actions/openidsettings.php:68
-msgid "Remove OpenID"
-msgstr ""
-
-#: ../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 ""
-
-#: ../lib/stream.php:55
-msgid "Replies"
-msgstr ""
-
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
-#, php-format
-msgid "Replies to %s"
-msgstr ""
-
-#: ../actions/recoverpassword.php:183
-msgid "Reset"
-msgstr ""
-
-#: ../actions/recoverpassword.php:173
-msgid "Reset password"
-msgstr ""
-
-#: ../lib/settingsaction.php:99
-msgid "SMS"
-msgstr ""
-
-#: ../actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
-
-#: ../actions/smssettings.php:33
-msgid "SMS Settings"
-msgstr ""
-
-#: ../lib/mail.php:219
-msgid "SMS confirmation"
-msgstr ""
-
-#: ../actions/recoverpassword.php:182
-msgid "Same as password above"
-msgstr ""
-
-#: ../actions/register.php:156
-msgid "Same as password above. Required."
-msgstr ""
-
-#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
-#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
-msgid "Save"
-msgstr ""
-
-#: ../lib/searchaction.php:84 ../lib/util.php:300
-msgid "Search"
-msgstr ""
-
-#: ../actions/noticesearch.php:80
-msgid "Search Stream Feed"
-msgstr ""
-
-#: ../actions/noticesearch.php:30
-#, php-format
-msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
-msgstr ""
-
-#: ../actions/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 ""
-
-#: ../actions/smssettings.php:296
-msgid "Select a carrier"
-msgstr ""
-
-#: ../actions/invite.php:137 ../lib/util.php:1172
-msgid "Send"
-msgstr ""
-
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
-msgstr ""
-
-#: ../actions/emailsettings.php:88
-msgid "Send me notices of new subscriptions through email."
-msgstr ""
-
-#: ../actions/imsettings.php:70
-msgid "Send me notices through Jabber/GTalk."
-msgstr ""
-
-#: ../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
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr ""
-
-#: ../lib/util.php:304
-msgid "Settings"
-msgstr ""
-
-#: ../actions/profilesettings.php:192
-msgid "Settings saved."
-msgstr ""
-
-#: ../actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:66
-msgid "Someone else already has this OpenID."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-msgid "Something weird happened."
-msgstr ""
-
-#: ../scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-
-#: ../lib/util.php:330
-msgid "Source"
-msgstr ""
-
-#: ../actions/showstream.php:296
-msgid "Statistics"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-msgid "Stored OpenID not found."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197
-msgid "Subscribe"
-msgstr ""
-
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-msgid "Subscribers"
-msgstr ""
-
-#: ../actions/userauthorization.php:310
-msgid "Subscription authorized"
-msgstr ""
-
-#: ../actions/userauthorization.php:320
-msgid "Subscription rejected"
-msgstr ""
-
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27
-msgid "Subscriptions"
-msgstr ""
-
-#: ../actions/avatar.php:87
-msgid "System error uploading file."
-msgstr ""
-
-#: ../actions/tag.php:41 ../lib/util.php:301
-msgid "Tags"
-msgstr ""
-
-#: ../lib/searchaction.php:104
-msgid "Text"
-msgstr ""
-
-#: ../actions/noticesearch.php:34
-msgid "Text search"
-msgstr ""
-
-#: ../actions/openidsettings.php:140
-msgid "That OpenID does not belong to you."
-msgstr ""
-
-#: ../actions/confirmaddress.php:52
-msgid "That address has already been confirmed."
-msgstr ""
-
-#: ../actions/confirmaddress.php:43
-msgid "That confirmation code is not for you!"
-msgstr ""
-
-#: ../actions/emailsettings.php:191
-msgid "That email address already belongs to another user."
-msgstr ""
-
-#: ../actions/avatar.php:80
-msgid "That file is too big."
-msgstr ""
-
-#: ../actions/imsettings.php:170
-msgid "That is already your Jabber ID."
-msgstr ""
-
-#: ../actions/emailsettings.php:188
-msgid "That is already your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:188
-msgid "That is already your phone number."
-msgstr ""
-
-#: ../actions/imsettings.php:233
-msgid "That is not your Jabber ID."
-msgstr ""
-
-#: ../actions/emailsettings.php:249
-msgid "That is not your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:257
-msgid "That is not your phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-msgid "That is the wrong IM address."
-msgstr ""
-
-#: ../actions/smssettings.php:233
-msgid "That is the wrong confirmation number."
-msgstr ""
-
-#: ../actions/smssettings.php:191
-msgid "That phone number already belongs to another user."
-msgstr ""
-
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
-msgid "That's too long. Max notice size is 140 chars."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:74
-msgid "That's too long. Max notice size is 255 chars."
-msgstr ""
-
-#: ../actions/confirmaddress.php:92
-#, php-format
-msgid "The address \"%s\" has been confirmed for your account."
-msgstr ""
-
-#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274
-msgid "The address was removed."
-msgstr ""
-
-#: ../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 ""
-
-#: ../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 ""
-
-#: ../actions/subscribers.php:35
-#, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr ""
-
-#: ../actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
-msgstr ""
-
-#: ../actions/subscriptions.php:35
-#, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr ""
-
-#: ../actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr ""
-
-#: ../actions/invite.php:89
-msgid ""
-"These people are already users and you were automatically subscribed to them:"
-msgstr ""
-
-#: ../actions/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
-msgstr ""
-
-#: ../lib/openid.php:195
-msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:56
-#, php-format
-msgid ""
-"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."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-msgid "This method requires a POST or DELETE."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381
-msgid "This method requires a POST."
-msgstr ""
-
-#: ../lib/util.php:164
-msgid "This page is not available in a media type you accept"
-msgstr ""
-
-#: ../actions/profilesettings.php:63
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107
-msgid "Timezone not selected."
-msgstr ""
-
-#: ../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 ""
-
-#: ../actions/twitapifriendships.php:163
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
-
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr ""
-
-#: ../actions/remotesubscribe.php:74
-msgid "URL of your profile on another compatible microblogging service"
-msgstr ""
-
-#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
-#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
-msgid "Unexpected form submission."
-msgstr ""
-
-#: ../actions/recoverpassword.php:276
-msgid "Unexpected password reset."
-msgstr ""
-
-#: ../index.php:57
-msgid "Unknown action"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:58
-msgid "Unknown version of OMB protocol."
-msgstr ""
-
-#: ../lib/util.php:269
-msgid ""
-"Unless otherwise specified, contents of this site are copyright by the "
-"contributors and available under the "
-msgstr ""
-
-#: ../actions/confirmaddress.php:48
-#, php-format
-msgid "Unrecognized address type %s"
-msgstr ""
-
-#: ../actions/showstream.php:209
-msgid "Unsubscribe"
-msgstr ""
-
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-msgid "Unsupported OMB version"
-msgstr ""
-
-#: ../actions/avatar.php:105
-msgid "Unsupported image file format."
-msgstr ""
-
-#: ../lib/settingsaction.php:100
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:241
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:341
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
-#: ../actions/avatar.php:68
-msgid "Upload"
-msgstr ""
-
-#: ../actions/avatar.php:27
-msgid ""
-"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 license, also. Use a picture that belongs to you and that you want to "
-"share."
-msgstr ""
-
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr ""
-
-#: ../actions/invite.php:114
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
-msgstr ""
-
-#: ../actions/register.php:159 ../actions/register.php:162
-msgid "Used only for updates, announcements, and password recovery"
-msgstr ""
-
-#: ../actions/finishremotesubscribe.php:86
-msgid "User being listened to doesn't exist."
-msgstr ""
-
-#: ../actions/all.php:41 ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:47 ../actions/replies.php:41
-#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
-#: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
-#: ../actions/twitapiusers.php:82
-msgid "User has no profile."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:71
-msgid "User nickname"
-msgstr ""
-
-#: ../actions/twitapiusers.php:75
-msgid "User not found."
-msgstr ""
-
-#: ../actions/profilesettings.php:63
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../lib/util.php:1159
-#, php-format
-msgid "What's up, %s?"
-msgstr ""
-
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr ""
-
-#: ../actions/updateprofile.php:128
-#, php-format
-msgid "Wrong image type for '%s'"
-msgstr ""
-
-#: ../actions/updateprofile.php:123
-#, php-format
-msgid "Wrong size image at '%s'"
-msgstr ""
-
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-msgid "Yes"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:64
-msgid "You already have this OpenID!"
-msgstr ""
-
-#: ../actions/deletenotice.php:37
-msgid ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
-msgstr ""
-
-#: ../actions/recoverpassword.php:31
-msgid "You are already logged in!"
-msgstr ""
-
-#: ../actions/invite.php:81
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr ""
-
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
-msgstr ""
-
-#: ../actions/register.php:135
-msgid "You can create a new account to start posting notices."
-msgstr ""
-
-#: ../actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
-#: ../actions/openidsettings.php:86
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr ""
-
-#: ../actions/imsettings.php:28
-#, php-format
-msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
-msgstr ""
-
-#: ../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
-msgid "You can use the local subscription!"
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-msgid "You can't register if you don't agree to the license."
-msgstr ""
-
-#: ../actions/updateprofile.php:63
-msgid "You did not send us that profile"
-msgstr ""
-
-#: ../lib/mail.php:147
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
-"Send email to %2$s to post new messages.\n"
-"\n"
-"More email instructions at %3$s.\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:612
-msgid "You may not delete another user's status."
-msgstr ""
-
-#: ../actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr ""
-
-#: ../actions/invite.php:103
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
-
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
-msgstr ""
-
-#: ../actions/openidlogin.php:67
-msgid "Your OpenID URL"
-msgstr ""
-
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
-msgstr ""
-
-#: ../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 ""
-
-#: ../lib/util.php:943
-msgid "a few seconds ago"
-msgstr ""
-
-#: ../lib/util.php:955
-#, php-format
-msgid "about %d days ago"
-msgstr ""
-
-#: ../lib/util.php:951
-#, php-format
-msgid "about %d hours ago"
-msgstr ""
-
-#: ../lib/util.php:947
-#, php-format
-msgid "about %d minutes ago"
-msgstr ""
-
-#: ../lib/util.php:959
-#, php-format
-msgid "about %d months ago"
-msgstr ""
-
-#: ../lib/util.php:953
-msgid "about a day ago"
-msgstr ""
-
-#: ../lib/util.php:945
-msgid "about a minute ago"
-msgstr ""
-
-#: ../lib/util.php:957
-msgid "about a month ago"
-msgstr ""
-
-#: ../lib/util.php:961
-msgid "about a year ago"
-msgstr ""
-
-#: ../lib/util.php:949
-msgid "about an hour ago"
-msgstr ""
-
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-msgid "delete"
-msgstr ""
-
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117
-msgid "in reply to..."
-msgstr ""
-
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124
-msgid "reply"
-msgstr ""
-
-#: ../actions/password.php:44
-msgid "same as password above"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:755
-msgid "unsupported file type"
-msgstr ""
-
-#: ../lib/util.php:1309
-msgid "« After"
-msgstr ""
diff --git a/locale/es/LC_MESSAGES/laconica.mo b/locale/es/LC_MESSAGES/laconica.mo
index 5fa91b665..fa655909f 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 72055348b..4cc5a0719 100644
--- a/locale/es/LC_MESSAGES/laconica.po
+++ b/locale/es/LC_MESSAGES/laconica.po
@@ -6,9 +6,20 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-27 14:57-0400\n"
+"POT-Creation-Date: 2008-07-14 21:07+1200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-10-13 21:07+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,64 +32,20 @@ msgstr ""
 msgid " Search Stream for \"%s\""
 msgstr "Busca \"%s\" en el Corriente"
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
 msgid ""
-" except this private data: password, email address, IM address, phone number."
+" except this private data: password, email address, IM address, phone "
+"number."
 msgstr ""
 "excepto los siguientes datos privados: contraseña, dirección de correo "
 "electrónico, dirección de mensajería instantánea, número de teléfono."
 
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-msgid " from "
-msgstr ""
-
-#: ../actions/twitapistatuses.php:478
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/invite.php:168
-#, fuzzy, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s ahora está escuchando tus avisos en %2$s"
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-
-#: ../lib/mail.php:124
+#: ../actions/subscribe.php:84
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s ahora está escuchando tus avisos en %2$s"
 
-#: ../lib/mail.php:126
+#: ../actions/subscribe.php:86
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -95,159 +62,73 @@ msgstr ""
 "Atentamente,\n"
 "%4$s.\n"
 
-#: ../actions/twitapistatuses.php:482
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-
 #: ../actions/shownotice.php:45
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "estado de %1$s en %2$s"
 
-#: ../actions/invite.php:84 ../actions/invite.php:92
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:60
 #, php-format
 msgid "%s Public Stream"
 msgstr "Flujo público de %s"
 
-#: ../actions/all.php:47 ../actions/allrss.php:60
-#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51
+#: ../actions/all.php:47 ../actions/allrss.php:70 ../lib/stream.php:45
 #, php-format
 msgid "%s and friends"
 msgstr "%s y amigos"
 
-#: ../actions/twitapistatuses.php:49
-#, fuzzy, php-format
-msgid "%s public timeline"
-msgstr "Línea temporal pública"
-
-#: ../lib/mail.php:206
-#, fuzzy, php-format
-msgid "%s status"
-msgstr "estado de %1$s en %2$s"
-
-#: ../actions/twitapistatuses.php:338
-#, fuzzy, php-format
-msgid "%s timeline"
-msgstr "Línea temporal pública"
-
-#: ../actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:213
-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:233
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** is a microblogging service brought to you by "
+"[%%site.broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
-"**%%site.name%%** es un servicio de microblogueo de [%%site.broughtby%%**](%%"
-"site.broughtbyurl%%)."
+"**%%site.name%%** es un servicio de microblogueo de "
+"[%%site.broughtby%%**](%%site.broughtbyurl%%)."
 
-#: ../lib/util.php:259
+#: ../lib/util.php:235
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** es un servicio de microblogueo."
 
-#: ../lib/util.php:274
+#: ../lib/util.php:250
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ". Los colaboradores deben ser citados por su nombre completo o apodo."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
+#: ../actions/register.php:176
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
-"1-64 letras en minúscula o números, sin signos de puntuación o espacios"
-
-#: ../actions/register.php:152
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 letras en minúscula o números, sin signos de puntuación o espacios"
+"1-64 letras en minúscula o números, sin signos de puntuación o "
+"espacios"
 
-#: ../actions/password.php:42
+#: ../actions/password.php:42 ../actions/register.php:178
 msgid "6 or more characters"
 msgstr "6 o más caracteres"
 
-#: ../actions/recoverpassword.php:180
+#: ../actions/recoverpassword.php:165
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 o más caracteres, ¡no te olvides!"
 
-#: ../actions/register.php:154
-#, fuzzy
-msgid "6 or more characters. Required."
-msgstr "6 o más caracteres"
-
-#: ../actions/imsettings.php:197
+#: ../actions/imsettings.php:188
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
-msgstr ""
-"Un código de confirmación fue enviado a la dirección de mensajería "
-"instantánea que agregaste. Debes aprobar a %s para que pueda enviarte "
-"mensajes."
-
-#: ../actions/emailsettings.php:213
-#, fuzzy
-msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
-msgstr ""
-"Un código de confirmación fue enviado a la dirección de mensajería "
-"instantánea que agregaste. Debes aprobar a %s para que pueda enviarte "
-"mensajes."
-
-#: ../actions/smssettings.php:216
-#, fuzzy
-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."
+"A confirmation code was sent to the IM address you added. You must approve "
+"%s for sending messages to you."
 msgstr ""
 "Un código de confirmación fue enviado a la dirección de mensajería "
 "instantánea que agregaste. Debes aprobar a %s para que pueda enviarte "
 "mensajes."
 
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122
-msgid "API method not found!"
-msgstr ""
-
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-msgid "API method under construction."
-msgstr ""
-
-#: ../lib/util.php:324
+#: ../lib/util.php:296
 msgid "About"
 msgstr "Acerca de"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/userauthorization.php:118
 msgid "Accept"
 msgstr "Aceptar"
 
-#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
-#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
 msgid "Add"
 msgstr "Añadir"
 
@@ -255,25 +136,15 @@ msgstr "Añadir"
 msgid "Add OpenID"
 msgstr "Añadir OpenID"
 
-#: ../lib/settingsaction.php:97
-#, fuzzy
-msgid "Add or remove OpenIDs"
-msgstr "Eliminar OpenID"
-
-#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39
+#: ../actions/imsettings.php:39
 msgid "Address"
 msgstr "Dirección"
 
-#: ../actions/invite.php:131
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../actions/showstream.php:273
+#: ../actions/showstream.php:254
 msgid "All subscriptions"
 msgstr "Todas las suscripciones"
 
-#: ../actions/publicrss.php:64
+#: ../actions/publicrss.php:62
 #, php-format
 msgid "All updates for %s"
 msgstr "Todas las actualizaciones para %s"
@@ -283,35 +154,26 @@ msgstr "Todas las actualizaciones para %s"
 msgid "All updates matching search term \"%s\""
 msgstr "Todas las actualizaciones que corresponden a la frase a buscar \"%s\""
 
-#: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
-#: ../actions/openidlogin.php:29 ../actions/register.php:30
+#: ../actions/finishopenidlogin.php:29 ../actions/login.php:27
+#: ../actions/openidlogin.php:29 ../actions/register.php:28
 msgid "Already logged in."
 msgstr "Ya estás conectado."
 
-#: ../lib/subs.php:42
+#: ../actions/subscribe.php:48
 msgid "Already subscribed!."
 msgstr "¡Ya está suscrito!"
 
-#: ../actions/deletenotice.php:54
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/userauthorization.php:77
+#: ../actions/userauthorization.php:76
 msgid "Authorize subscription"
 msgstr "Autorizar la suscripción"
 
-#: ../actions/login.php:104 ../actions/register.php:178
+#: ../actions/login.php:100 ../actions/register.php:184
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Iniciar sesión automáticamente en el futuro. ¡No usar en ordenadores "
 "compartidos! "
 
-#: ../actions/profilesettings.php:65
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr ""
-
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: ../actions/avatar.php:32
 msgid "Avatar"
 msgstr "Avatar"
 
@@ -326,52 +188,31 @@ msgid ""
 "message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "A la espera de una confirmación para esta dirección. Busca en tu cuenta "
-"Jabber/GTalk un mensaje con más instrucciones. (¿Has añadido a %s a tu lista "
-"de amigos?)"
-
-#: ../actions/emailsettings.php:54
-#, fuzzy
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-msgstr ""
-"A la espera de una confirmación para esta dirección. Busca en tu cuenta "
-"Jabber/GTalk un mensaje con más instrucciones. (¿Has añadido a %s a tu lista "
-"de amigos?)"
+"Jabber/GTalk un mensaje con más instrucciones. (¿Has añadido a %s a tu "
+"lista de amigos?)"
 
-#: ../actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
-
-#: ../lib/util.php:1318
+#: ../lib/util.php:1136
 msgid "Before »"
 msgstr "Antes"
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: ../actions/profilesettings.php:52
 msgid "Bio"
 msgstr "Biografía"
 
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103
+#: ../actions/profilesettings.php:93 ../actions/updateprofile.php:102
 msgid "Bio is too long (max 140 chars)."
 msgstr "La biografía es demasiado larga (máx. 140 caracteres)."
 
-#: ../lib/deleteaction.php:41
-#, fuzzy
-msgid "Can't delete this notice."
-msgstr "No se pudo eliminar la confirmación de correo electrónico."
-
-#: ../actions/updateprofile.php:119
+#: ../actions/updateprofile.php:118
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "No se puede leer el URL del avatar '%s'"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
+#: ../actions/password.php:85 ../actions/recoverpassword.php:261
 msgid "Can't save new password."
 msgstr "No se puede guardar la nueva contraseña."
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62
+#: ../actions/imsettings.php:59
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -379,79 +220,35 @@ msgstr "Cancelar"
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Imposible crear una instancia del objeto OpenID."
 
-#: ../actions/imsettings.php:163
+#: ../actions/imsettings.php:154
 msgid "Cannot normalize that Jabber ID"
 msgstr "No se puede normalizar este Jabber ID"
 
-#: ../actions/emailsettings.php:181
-#, fuzzy
-msgid "Cannot normalize that email address"
-msgstr "No se puede normalizar este Jabber ID"
-
 #: ../actions/password.php:45
 msgid "Change"
 msgstr "Cambiar"
 
-#: ../lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
 #: ../actions/password.php:32
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: ../lib/settingsaction.php:94
-#, fuzzy
-msgid "Change your password"
-msgstr "Cambiar contraseña"
-
-#: ../lib/settingsaction.php:85
-#, fuzzy
-msgid "Change your profile settings"
-msgstr "Configuración del perfil"
-
-#: ../actions/password.php:43 ../actions/recoverpassword.php:181
-#: ../actions/register.php:155 ../actions/smssettings.php:65
+#: ../actions/password.php:43 ../actions/recoverpassword.php:166
+#: ../actions/register.php:179
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: ../actions/confirmaddress.php:90
+#: ../actions/confirmaddress.php:84
 msgid "Confirm Address"
 msgstr "Confirmar la dirección"
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245
+#: ../actions/imsettings.php:213
 msgid "Confirmation cancelled."
 msgstr "Confirmación cancelada."
 
-#: ../actions/smssettings.php:63
-#, fuzzy
-msgid "Confirmation code"
-msgstr "Ningún código de confirmación."
-
 #: ../actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr "Código de confirmación no encontrado."
 
-#: ../actions/register.php:202
-#, php-format
-msgid ""
-"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."
-msgstr ""
-
 #: ../actions/finishopenidlogin.php:91
 msgid "Connect"
 msgstr "Conectarse"
@@ -460,7 +257,7 @@ msgstr "Conectarse"
 msgid "Connect existing account"
 msgstr "Conectarse a una cuenta existente"
 
-#: ../lib/util.php:332
+#: ../lib/util.php:304
 msgid "Contact"
 msgstr "Ponerse en contacto"
 
@@ -469,66 +266,44 @@ msgstr "Ponerse en contacto"
 msgid "Could not create OpenID form: %s"
 msgstr "No se pudo crear el formulario OpenID: %s"
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr ""
-
 #: ../lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "No se pudo redirigir al servidor: %s"
 
-#: ../actions/updateprofile.php:162
+#: ../actions/updateprofile.php:161
 msgid "Could not save avatar info"
 msgstr "No se pudo guardar la información del avatar"
 
-#: ../actions/updateprofile.php:155
+#: ../actions/updateprofile.php:154
 msgid "Could not save new profile info"
 msgstr "No se pudo guardar la información del nuevo perfil"
 
-#: ../lib/subs.php:54
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../lib/subs.php:46
-#, fuzzy
-msgid "Could not subscribe."
-msgstr "¡No estás suscrito!"
-
-#: ../actions/recoverpassword.php:102
-#, fuzzy
-msgid "Could not update user with confirmed email address."
-msgstr "No se pudo insertar el código de confirmación."
+#: ../actions/profilesettings.php:146
+msgid "Couldn't confirm email."
+msgstr "No se pudo confirmar el correo electrónico."
 
 #: ../actions/finishremotesubscribe.php:99
 msgid "Couldn't convert request tokens to access tokens."
 msgstr "No se pudieron convertir las señales de petición a señales de acceso."
 
-#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
-#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#: ../actions/subscribe.php:59
+msgid "Couldn't create subscription."
+msgstr "No se pudo crear la suscripción."
+
+#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
 msgid "Couldn't delete email confirmation."
 msgstr "No se pudo eliminar la confirmación de correo electrónico."
 
-#: ../lib/subs.php:103
+#: ../actions/unsubscribe.php:56
 msgid "Couldn't delete subscription."
 msgstr "No se pudo eliminar la suscripción."
 
-#: ../actions/twitapistatuses.php:93
-#, fuzzy
-msgid "Couldn't find any statuses."
-msgstr "No se pudo actualizar el usuario."
-
-#: ../actions/remotesubscribe.php:127
+#: ../actions/remotesubscribe.php:125
 msgid "Couldn't get a request token."
 msgstr "No se pudo obtener la señal de petición."
 
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206
+#: ../actions/imsettings.php:178
 msgid "Couldn't insert confirmation code."
 msgstr "No se pudo insertar el código de confirmación."
 
@@ -536,24 +311,12 @@ msgstr "No se pudo insertar el código de confirmación."
 msgid "Couldn't insert new subscription."
 msgstr "No se pudo insertar una nueva suscripción."
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: ../actions/profilesettings.php:175
 msgid "Couldn't save profile."
 msgstr "No se pudo guardar el perfil."
 
-#: ../actions/profilesettings.php:161
-#, fuzzy
-msgid "Couldn't update user for autosubscribe."
-msgstr "No se pudo actualizar el usuario."
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#, fuzzy
-msgid "Couldn't update user record."
-msgstr "No se pudo actualizar el usuario."
-
-#: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
-#: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
-#: ../actions/imsettings.php:243 ../actions/profilesettings.php:141
-#: ../actions/smssettings.php:157 ../actions/smssettings.php:269
+#: ../actions/confirmaddress.php:70 ../actions/imsettings.php:129
+#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
 msgid "Couldn't update user."
 msgstr "No se pudo actualizar el usuario."
 
@@ -577,83 +340,44 @@ msgstr "Crear nueva cuenta para un OpenID que ya tiene un usuario."
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Dirección actual Jabber/Gtalk confirmada."
 
-#: ../actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:44
-#, fuzzy
-msgid "Current confirmed email address."
-msgstr "Dirección actual Jabber/Gtalk confirmada."
-
-#: ../actions/showstream.php:356
+#: ../actions/showstream.php:337
 msgid "Currently"
 msgstr "Actualmente"
 
-#: ../classes/Notice.php:72
-#, fuzzy, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "Error de BD al insertar respuesta: %s"
-
-#: ../lib/util.php:1061
+#: ../lib/util.php:893
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Error de BD al insertar respuesta: %s"
 
-#: ../actions/deletenotice.php:41
-#, fuzzy
-msgid "Delete notice"
-msgstr "Nuevo aviso"
-
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: ../actions/profilesettings.php:54
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Cuéntanos algo sobre ti y tus intereses en 140 caracteres"
 
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87
+#: ../actions/register.php:181
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: ../actions/emailsettings.php:59
-#, fuzzy
-msgid "Email Address"
+#: ../actions/profilesettings.php:46
+msgid "Email address"
 msgstr "Dirección de correo electrónico"
 
-#: ../actions/emailsettings.php:32
-#, fuzzy
-msgid "Email Settings"
-msgstr "Configuración"
-
-#: ../actions/register.php:73
+#: ../actions/profilesettings.php:102 ../actions/register.php:63
 msgid "Email address already exists."
 msgstr "La dirección de correo electrónico ya existe."
 
-#: ../lib/mail.php:90
+#: ../lib/mail.php:82
 msgid "Email address confirmation"
 msgstr "Confirmacion de correo electronico"
 
-#: ../actions/emailsettings.php:61
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/invite.php:129
-#, fuzzy
-msgid "Email addresses"
-msgstr "Dirección de correo electrónico"
-
-#: ../actions/recoverpassword.php:191
+#: ../actions/recoverpassword.php:176
 msgid "Enter a nickname or email address."
 msgstr "Ingresa un apodo o correo electronico"
 
-#: ../actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/userauthorization.php:137
+#: ../actions/userauthorization.php:136
 msgid "Error authorizing token"
 msgstr "Error al autorizar señal"
 
-#: ../actions/finishopenidlogin.php:253
+#: ../actions/finishopenidlogin.php:282
 msgid "Error connecting user to OpenID."
 msgstr "Error al conectar tu usuario a OpenID"
 
@@ -669,19 +393,23 @@ msgstr "Error al insertar el avatar"
 msgid "Error inserting new profile"
 msgstr "Error al insertar el nuevo perfil"
 
+#: ../actions/postnotice.php:88
+msgid "Error inserting notice"
+msgstr "Error al insertar aviso"
+
 #: ../actions/finishremotesubscribe.php:167
 msgid "Error inserting remote profile"
 msgstr "Error al insertar perfil remoto"
 
-#: ../actions/recoverpassword.php:240
+#: ../actions/recoverpassword.php:201
 msgid "Error saving address confirmation."
 msgstr "Error al guardar confirmación de la dirección."
 
-#: ../actions/userauthorization.php:140
+#: ../actions/userauthorization.php:139
 msgid "Error saving remote profile"
 msgstr "Error al guardar perfil remoto"
 
-#: ../lib/openid.php:226
+#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
 msgid "Error saving the profile."
 msgstr "Error al guardar el perfil."
 
@@ -693,8 +421,8 @@ msgstr "Error al guardar el usuario."
 msgid "Error saving user; invalid."
 msgstr "Error al guardar el usuario; inválido."
 
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
+#: ../actions/login.php:43 ../actions/login.php:69
+#: ../actions/recoverpassword.php:268 ../actions/register.php:73
 msgid "Error setting user."
 msgstr "Error al configurar el usuario."
 
@@ -706,7 +434,7 @@ msgstr "Error al actualizar el perfil"
 msgid "Error updating remote profile"
 msgstr "Error al actualizar el perfil remoto"
 
-#: ../actions/recoverpassword.php:80
+#: ../actions/recoverpassword.php:79
 msgid "Error with confirmation code."
 msgstr "Error con el código de confirmación."
 
@@ -714,7 +442,7 @@ msgstr "Error con el código de confirmación."
 msgid "Existing nickname"
 msgstr "Apodo existente"
 
-#: ../lib/util.php:326
+#: ../lib/util.php:298
 msgid "FAQ"
 msgstr "Preguntas Frecuentes"
 
@@ -722,30 +450,17 @@ msgstr "Preguntas Frecuentes"
 msgid "Failed updating avatar."
 msgstr "Error al actualizar avatar."
 
-#: ../actions/all.php:61 ../actions/allrss.php:64
+#: ../actions/all.php:61 ../actions/allrss.php:74
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Feed de los amigos de %s"
 
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: ../actions/replies.php:61 ../actions/repliesrss.php:80
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Feed de respuestas a %s"
 
-#: ../actions/tag.php:55
-#, fuzzy, php-format
-msgid "Feed for tag %s"
-msgstr "Feed de respuestas a %s"
-
-#: ../lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/login.php:122
+#: ../actions/login.php:118
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -753,40 +468,31 @@ msgstr ""
 "Por razones de seguridad, por favor vuelve a escribir tu nombre de usuario y "
 "contraseña antes de cambiar tu configuración."
 
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: ../actions/profilesettings.php:44
 msgid "Full name"
 msgstr "Nombre completo"
 
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93
+#: ../actions/profilesettings.php:90 ../actions/updateprofile.php:92
 msgid "Full name is too long (max 255 chars)."
 msgstr "Tu nombre es demasiado largo (max. 255 carac.)"
 
-#: ../lib/util.php:322
+#: ../lib/util.php:279
 msgid "Help"
 msgstr "Ayuda"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:274
 msgid "Home"
 msgstr "Portada"
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: ../actions/profilesettings.php:49
 msgid "Homepage"
 msgstr "Página personal"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: ../actions/profilesettings.php:87
 msgid "Homepage is not a valid URL."
 msgstr "La página personal no es un URL válido."
 
-#: ../actions/emailsettings.php:91
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102
-msgid "IM"
-msgstr ""
-
-#: ../actions/imsettings.php:60
+#: ../actions/imsettings.php:61
 msgid "IM Address"
 msgstr "Dirección de mensajería instantánea"
 
@@ -810,33 +516,23 @@ msgstr ""
 "Si quieres agregar una cuenta OpenID, ponla en el campo de abajo y haz clic "
 "en \"Añadir\"."
 
-#: ../actions/recoverpassword.php:137
-#, fuzzy
+#: ../actions/recoverpassword.php:122
 msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
+"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 ""
 "Si olvidaste o perdiste tu contraseña, puedes recibir una nueva en la "
 "dirección de correo electrónico que usaste para registrar tu cuenta."
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283
-#, fuzzy
-msgid "Incoming email address removed."
-msgstr "La dirección fue eliminada."
-
 #: ../actions/password.php:69
 msgid "Incorrect old password"
 msgstr "Contraseña antigua incorrecta."
 
-#: ../actions/login.php:67
+#: ../actions/login.php:63
 msgid "Incorrect username or password."
 msgstr "Nombre de usuario o contraseña incorrectos."
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:226
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -844,22 +540,17 @@ msgstr ""
 "Se enviaron instrucciones para recuperar tu contraseña a la dirección de "
 "correo registrada."
 
-#: ../actions/updateprofile.php:114
+#: ../actions/updateprofile.php:113
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "El URL del avatar '%s' es inválido"
 
-#: ../actions/invite.php:55
-#, fuzzy, php-format
-msgid "Invalid email address: %s"
-msgstr "Correo electrónico no válido"
-
-#: ../actions/updateprofile.php:98
+#: ../actions/updateprofile.php:97
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "El sitio '%s' es inválido"
 
-#: ../actions/updateprofile.php:82
+#: ../actions/updateprofile.php:81
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "El URL de la licencia '%s' es inválido"
@@ -876,7 +567,7 @@ msgstr "El URI del aviso es inválido"
 msgid "Invalid notice url"
 msgstr "El URL del aviso es inválido"
 
-#: ../actions/updateprofile.php:87
+#: ../actions/updateprofile.php:86
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "El URL del perfil '%s' es inválido"
@@ -893,43 +584,27 @@ msgstr "URL del perfil devuelto por el servidor inválido."
 msgid "Invalid size."
 msgstr "Tamaño inválido."
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111
+#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
+#: ../actions/register.php:84
 msgid "Invalid username or password."
 msgstr "Usuario o contraseña inválidos."
 
-#: ../actions/invite.php:79
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123
-msgid "Invite new users"
-msgstr ""
-
-#: ../lib/util.php:261
+#: ../lib/util.php:237
 #, 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)."
+"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 ""
 "Usa el software de microblogueo [Laconica](http://laconi.ca), versión %s, "
-"disponible bajo la [GNU Affero General Public License](http://www.fsf.org/"
-"licensing/licenses/agpl-3.0.html)."
+"disponible bajo la [GNU Affero General Public "
+"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:173
+#: ../actions/imsettings.php:164
 msgid "Jabber ID already belongs to another user."
 msgstr "El Jabber ID ya pertenece a otro usuario."
 
-#: ../actions/imsettings.php:62
+#: ../actions/imsettings.php:63
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -939,26 +614,16 @@ msgstr ""
 "Primero, asegúrate de agregar a %s a tu lista de amigos en tu cliente de "
 "mensajería instantánea o en GTalk."
 
-#: ../actions/profilesettings.php:57
-msgid "Language"
-msgstr ""
-
-#: ../actions/profilesettings.php:113
-#, fuzzy
-msgid "Language is too long (max 50 chars)."
-msgstr "La ubicación es demasiado larga (máx. 255 caracteres)."
-
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: ../actions/profilesettings.php:55
 msgid "Location"
 msgstr "Ubicación"
 
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108
+#: ../actions/profilesettings.php:96 ../actions/updateprofile.php:107
 msgid "Location is too long (max 255 chars)."
 msgstr "La ubicación es demasiado larga (máx. 255 caracteres)."
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310
+#: ../actions/login.php:93 ../actions/login.php:102
+#: ../actions/openidlogin.php:68 ../lib/util.php:286
 msgid "Login"
 msgstr "Inicio de sesión"
 
@@ -967,39 +632,26 @@ msgstr "Inicio de sesión"
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Inicio de sesión con una cuenta [OpenID](%%doc.openid%%)."
 
-#: ../actions/login.php:126
+#: ../actions/login.php:122
 #, 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%"
-"%). "
+"Login with your username and password. Don't have a username yet? "
+"[Register](%%action.register%%) a new account, or try "
+"[OpenID](%%action.openidlogin%%). "
 msgstr ""
-"Inicia una sesión con tu usuario y contraseña. ¿Aún no tienes usuario? [Crea]"
-"(%%action.register%%) una cuenta nueva o prueba [OpenID] (%%action."
-"openidlogin%%). "
+"Inicia una sesión con tu usuario y contraseña. ¿Aún no tienes usuario? "
+"[Crea](%%action.register%%) una cuenta nueva o prueba [OpenID] "
+"(%%action.openidlogin%%). "
 
-#: ../lib/util.php:308
+#: ../lib/util.php:284
 msgid "Logout"
 msgstr "Salir"
 
-#: ../actions/register.php:166
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
-
-#: ../actions/login.php:110
+#: ../actions/login.php:106
 msgid "Lost or forgotten password?"
 msgstr "¿Contraseña olvidada o perdida?"
 
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr ""
-
-#: ../actions/showstream.php:300
+#: ../actions/showstream.php:281
 msgid "Member since"
 msgstr "Miembro desde"
 
@@ -1008,59 +660,38 @@ msgstr "Miembro desde"
 msgid "Microblog by %s"
 msgstr "Microblog por %s"
 
-#: ../actions/smssettings.php:304
-#, php-format
-msgid ""
-"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
-"email but isn't listed here, send email to let us know at %s."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
 msgid "My text and files are available under "
 msgstr "Mi texto y archivos están disponibles bajo"
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-msgid "New"
-msgstr ""
-
-#: ../lib/mail.php:144
-#, fuzzy, php-format
-msgid "New email address for posting to %s"
-msgstr "Ninguna dirección de correo electrónico registrada por este usuario."
-
-#: ../actions/emailsettings.php:297
-#, fuzzy
-msgid "New incoming email address added."
-msgstr "Correo electrónico no válido"
-
 #: ../actions/finishopenidlogin.php:71
 msgid "New nickname"
 msgstr "Nuevo apodo"
 
-#: ../actions/newnotice.php:87
+#: ../actions/newnotice.php:100
 msgid "New notice"
 msgstr "Nuevo aviso"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
+#: ../actions/password.php:41 ../actions/recoverpassword.php:164
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:275
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nueva contraseña guardada correctamente. Has iniciado una sesión."
 
-#: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151
+#: ../actions/login.php:97 ../actions/profilesettings.php:41
+#: ../actions/register.php:175
 msgid "Nickname"
 msgstr "Apodo"
 
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69
+#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:99
+#: ../actions/register.php:59
 msgid "Nickname already in use. Try another one."
 msgstr "El apodo ya existe. Prueba otro."
 
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:67 ../actions/updateprofile.php:77
+#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:80
+#: ../actions/register.php:57 ../actions/updateprofile.php:76
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "El apodo debe tener solamente letras minúsculas y números y no puede tener "
@@ -1074,53 +705,30 @@ msgstr "Apodo prohibido."
 msgid "Nickname of the user you want to follow"
 msgstr "Apodo del usuario que quieres seguir"
 
-#: ../actions/recoverpassword.php:162
+#: ../actions/recoverpassword.php:147
 msgid "Nickname or email"
 msgstr "Apodo o correo electrónico"
 
-#: ../actions/deletenotice.php:59
-msgid "No"
-msgstr ""
-
-#: ../actions/imsettings.php:156
+#: ../actions/imsettings.php:147
 msgid "No Jabber ID."
 msgstr "Ningún Jabber ID."
 
-#: ../actions/userauthorization.php:129
+#: ../actions/userauthorization.php:128
 msgid "No authorization request!"
 msgstr "¡Ninguna petición de autorización!"
 
-#: ../actions/smssettings.php:181
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316
-#, fuzzy
-msgid "No code entered"
-msgstr "¡Ningún contenido!"
-
 #: ../actions/confirmaddress.php:33
 msgid "No confirmation code."
 msgstr "Ningún código de confirmación."
 
-#: ../actions/newnotice.php:44
+#: ../actions/newnotice.php:49
 msgid "No content!"
 msgstr "¡Ningún contenido!"
 
-#: ../actions/emailsettings.php:174
-#, fuzzy
-msgid "No email address."
-msgstr "Dirección de correo electrónico"
-
-#: ../actions/userbyid.php:32
+#: ../actions/userbyid.php:27
 msgid "No id."
 msgstr "Ningún identificador."
 
-#: ../actions/emailsettings.php:271
-#, fuzzy
-msgid "No incoming email address."
-msgstr "Correo electrónico no válido"
-
 #: ../actions/finishremotesubscribe.php:65
 msgid "No nickname provided by remote server."
 msgstr "Ningún apodo devuelto por el servidor remoto."
@@ -1129,25 +737,19 @@ msgstr "Ningún apodo devuelto por el servidor remoto."
 msgid "No nickname."
 msgstr "Ningún apodo."
 
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229
+#: ../actions/imsettings.php:197
 msgid "No pending confirmation to cancel."
 msgstr "Ninguna confirmación pendiente para cancelar."
 
-#: ../actions/smssettings.php:176
-#, fuzzy
-msgid "No phone number."
-msgstr "No existe ese usuario."
-
 #: ../actions/finishremotesubscribe.php:72
 msgid "No profile URL returned by server."
 msgstr "Ningun URL de perfil devuelto por el servidor."
 
-#: ../actions/recoverpassword.php:226
+#: ../actions/recoverpassword.php:189
 msgid "No registered email address for that user."
 msgstr "Ninguna dirección de correo electrónico registrada por este usuario."
 
-#: ../actions/userauthorization.php:49
+#: ../actions/userauthorization.php:48
 msgid "No request found!"
 msgstr "¡Ninguna petición encontrada!"
 
@@ -1159,14 +761,6 @@ msgstr "Ningún resultado"
 msgid "No size."
 msgstr "Ningún tamaño."
 
-#: ../actions/twitapistatuses.php:595
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555
-msgid "No status with that ID found."
-msgstr ""
-
 #: ../actions/openidsettings.php:135
 msgid "No such OpenID."
 msgstr "No existe esa cuenta OpenID."
@@ -1175,8 +769,7 @@ msgstr "No existe esa cuenta OpenID."
 msgid "No such document."
 msgstr "No existe ese documento."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30
+#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
 msgid "No such notice."
 msgstr "No existe ese aviso."
 
@@ -1189,21 +782,16 @@ msgid "No such subscription"
 msgstr "No existe esa suscripción"
 
 #: ../actions/all.php:34 ../actions/allrss.php:35
-#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
-#: ../actions/remotesubscribe.php:84 ../actions/remotesubscribe.php:91
-#: ../actions/replies.php:57 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:110 ../actions/userbyid.php:36
-#: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
-#: ../lib/subs.php:33 ../lib/subs.php:82
+#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:36
+#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
+#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
+#: ../actions/showstream.php:95 ../actions/subscribe.php:43
+#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
+#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
 msgid "No such user."
 msgstr "No existe ese usuario."
 
-#: ../actions/recoverpassword.php:211
-#, fuzzy
-msgid "No user with that email address or username."
-msgstr "Ninguna dirección de correo electrónico registrada por este usuario."
-
-#: ../lib/gallery.php:80
+#: ../lib/gallery.php:76
 msgid "Nobody to show!"
 msgstr "¡Nadie a mostrar!"
 
@@ -1211,44 +799,31 @@ msgstr "¡Nadie a mostrar!"
 msgid "Not a recovery code."
 msgstr "No es un código de recuperación."
 
-#: ../scripts/maildaemon.php:50
-#, fuzzy
-msgid "Not a registered user."
-msgstr "No es un código de recuperación."
-
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332
-#, fuzzy
-msgid "Not a supported data format."
-msgstr "Formato de imagen no soportado."
-
-#: ../actions/imsettings.php:167
+#: ../actions/imsettings.php:158
 msgid "Not a valid Jabber ID"
 msgstr "Jabber ID no válido"
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131
 #, fuzzy
 msgid "Not a valid OpenID."
-msgstr "La cuenta OpenID no es válida"
-
-#: ../actions/emailsettings.php:185
-#, fuzzy
-msgid "Not a valid email address"
-msgstr "Correo electrónico no válido"
+msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"La cuenta OpenID no es válida\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/register.php:63
+#: ../actions/profilesettings.php:75 ../actions/register.php:53
 msgid "Not a valid email address."
 msgstr "Correo electrónico no válido"
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
+#: ../actions/profilesettings.php:83 ../actions/register.php:61
 msgid "Not a valid nickname."
 msgstr "Apodo no válido"
 
-#: ../actions/remotesubscribe.php:120
+#: ../actions/remotesubscribe.php:118
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "URL de perfil no válido (servicios incorrectos)."
 
-#: ../actions/remotesubscribe.php:113
+#: ../actions/remotesubscribe.php:111
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "URL de perfil no válido (XRDS no definido)."
 
@@ -1268,27 +843,16 @@ msgstr "No autorizado."
 msgid "Not expecting this response!"
 msgstr "¡Respuesta inesperada!"
 
-#: ../actions/twitapistatuses.php:422
-#, fuzzy
-msgid "Not found"
-msgstr "¡Ninguna petición encontrada!"
-
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:28
-#: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
-#: ../lib/settingsaction.php:27
+#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
+#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
+#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
 msgid "Not logged in."
 msgstr "No conectado."
 
-#: ../lib/subs.php:91
+#: ../actions/unsubscribe.php:43
 msgid "Not subscribed!."
 msgstr "¡No estás suscrito!"
 
-#: ../actions/opensearch.php:35
-#, fuzzy
-msgid "Notice Search"
-msgstr "Buscar"
-
 #: ../actions/showstream.php:82
 #, php-format
 msgid "Notice feed for %s"
@@ -1298,20 +862,15 @@ msgstr "Feed de avisos de %s"
 msgid "Notice has no profile"
 msgstr "Aviso sin perfil"
 
-#: ../actions/showstream.php:316
+#: ../actions/showstream.php:297
 msgid "Notices"
 msgstr "Avisos"
 
-#: ../actions/tag.php:35 ../actions/tag.php:81
-#, fuzzy, php-format
-msgid "Notices tagged with %s"
-msgstr "Feed de avisos de %s"
-
 #: ../actions/password.php:39
 msgid "Old password"
 msgstr "Antigua contraseña"
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314
+#: ../lib/util.php:288
 msgid "OpenID"
 msgstr "Cuenta OpenID"
 
@@ -1354,69 +913,44 @@ msgstr "OpenID eliminado."
 msgid "OpenID settings"
 msgstr "Configuración OpenID"
 
-#: ../actions/invite.php:135
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
 #: ../actions/avatar.php:84
 msgid "Partial upload."
 msgstr "Carga parcial."
 
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
-#: ../actions/register.php:153 ../lib/settingsaction.php:93
+#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
+#: ../actions/register.php:177
 msgid "Password"
 msgstr "Contraseña"
 
-#: ../actions/recoverpassword.php:288
+#: ../actions/recoverpassword.php:249
 msgid "Password and confirmation do not match."
 msgstr "La contraseña y la confirmación no coinciden."
 
-#: ../actions/recoverpassword.php:284
+#: ../actions/recoverpassword.php:245
 msgid "Password must be 6 chars or more."
 msgstr "La contraseña debe tener 6 o más caracteres."
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
 msgid "Password recovery requested"
 msgstr "Recuperación de contraseña solicitada"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: ../actions/password.php:89 ../actions/recoverpassword.php:274
 msgid "Password saved."
 msgstr "Contraseña guardada"
 
-#: ../actions/password.php:61 ../actions/register.php:88
+#: ../actions/password.php:61 ../actions/register.php:65
 msgid "Passwords don't match."
 msgstr "Las contraseñas no coinciden"
 
-#: ../lib/searchaction.php:100
-#, fuzzy
-msgid "People"
-msgstr "Buscador de gente"
-
-#: ../actions/opensearch.php:33
-#, fuzzy
-msgid "People Search"
-msgstr "Buscador de gente"
-
 #: ../actions/peoplesearch.php:33
 msgid "People search"
 msgstr "Buscador de gente"
 
-#: ../lib/stream.php:50
+#: ../lib/stream.php:44
 msgid "Personal"
 msgstr "Personal"
 
-#: ../actions/invite.php:133
-#, fuzzy
-msgid "Personal message"
-msgstr "Personal"
-
-#: ../actions/smssettings.php:69
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-"1-64 letras en minúscula o números, sin signos de puntuación o espacios"
-
-#: ../actions/userauthorization.php:78
+#: ../actions/userauthorization.php:77
 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, "
@@ -1426,34 +960,27 @@ msgstr ""
 "avisos de este usuario. Si no pediste esta suscripción, haz clic en "
 "\"Cancelar\"."
 
-#: ../actions/imsettings.php:73
+#: ../actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Enviar un aviso cuando el estado de mi Jabber/GTalk cambie."
 
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94
+#: ../actions/imsettings.php:68
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163
+#: ../actions/imsettings.php:135
 msgid "Preferences saved."
 msgstr "Preferencias guardadas."
 
-#: ../actions/profilesettings.php:57
-#, fuzzy
-msgid "Preferred language"
-msgstr "Preferencias"
-
-#: ../lib/util.php:328
+#: ../lib/util.php:300
 msgid "Privacy"
 msgstr "Privacidad"
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106
+#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
 msgid "Problem saving notice."
 msgstr "Hubo un problema al guardar el aviso."
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60
+#: ../lib/stream.php:54
 msgid "Profile"
 msgstr "Perfil"
 
@@ -1465,10 +992,14 @@ msgstr "URL del perfil"
 msgid "Profile settings"
 msgstr "Configuración del perfil"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
 msgid "Profile unknown"
 msgstr "Perfil desconocido"
 
+#: ../lib/util.php:276
+msgid "Public"
+msgstr "Público"
+
 #: ../actions/public.php:54
 msgid "Public Stream Feed"
 msgstr "Feed del flujo público"
@@ -1477,25 +1008,11 @@ msgstr "Feed del flujo público"
 msgid "Public timeline"
 msgstr "Línea temporal pública"
 
-#: ../actions/imsettings.php:79
-#, fuzzy
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Dirección actual Jabber/Gtalk confirmada."
-
-#: ../actions/emailsettings.php:94
-#, fuzzy
-msgid "Publish a MicroID for my email address."
-msgstr "Ingresa un apodo o correo electronico"
-
-#: ../actions/tag.php:75 ../actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
-
-#: ../actions/recoverpassword.php:166
+#: ../actions/recoverpassword.php:151
 msgid "Recover"
 msgstr "Recuperar"
 
-#: ../actions/recoverpassword.php:156
+#: ../actions/recoverpassword.php:141
 msgid "Recover password"
 msgstr "Recuperar contraseña"
 
@@ -1503,28 +1020,19 @@ msgstr "Recuperar contraseña"
 msgid "Recovery code for unknown user."
 msgstr "Código de recuperación para usuario desconocido."
 
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: ../actions/register.php:171 ../actions/register.php:195 ../lib/util.php:287
 msgid "Register"
 msgstr "Registrarse"
 
-#: ../actions/register.php:28
-#, fuzzy
-msgid "Registration not allowed."
-msgstr "Apodo prohibido."
-
-#: ../actions/register.php:200
-msgid "Registration successful"
-msgstr ""
-
-#: ../actions/userauthorization.php:120
+#: ../actions/userauthorization.php:119
 msgid "Reject"
 msgstr "Rechazar"
 
-#: ../actions/login.php:103 ../actions/register.php:176
+#: ../actions/login.php:99 ../actions/register.php:183
 msgid "Remember me"
 msgstr "Recordarme"
 
-#: ../actions/updateprofile.php:70
+#: ../actions/updateprofile.php:69
 msgid "Remote profile with no matching profile"
 msgstr "Perfil remoto sin perfil coincidente"
 
@@ -1532,9 +1040,7 @@ msgstr "Perfil remoto sin perfil coincidente"
 msgid "Remote subscribe"
 msgstr "Subscripción remota"
 
-#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
-#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -1550,56 +1056,32 @@ msgstr ""
 "¡Si eliminas tu único OpenID no podrás volver a entrar! Si necesitas "
 "eliminarlo, agrega otro antes."
 
-#: ../lib/stream.php:55
+#: ../lib/stream.php:49
 msgid "Replies"
 msgstr "Respuestas"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
 #, php-format
 msgid "Replies to %s"
 msgstr "Respuestas a %s"
 
-#: ../actions/recoverpassword.php:183
+#: ../actions/recoverpassword.php:168
 msgid "Reset"
 msgstr "Restablecer"
 
-#: ../actions/recoverpassword.php:173
+#: ../actions/recoverpassword.php:158
 msgid "Reset password"
 msgstr "Restablecer contraseña"
 
-#: ../lib/settingsaction.php:99
-msgid "SMS"
-msgstr ""
-
-#: ../actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
-
-#: ../actions/smssettings.php:33
-#, fuzzy
-msgid "SMS Settings"
-msgstr "Configuración de mensajería instantánea"
-
-#: ../lib/mail.php:219
-#, fuzzy
-msgid "SMS confirmation"
-msgstr "Ningún código de confirmación."
-
-#: ../actions/recoverpassword.php:182
+#: ../actions/recoverpassword.php:167 ../actions/register.php:180
 msgid "Same as password above"
 msgstr "Igual a la contraseña de arriba"
 
-#: ../actions/register.php:156
-#, fuzzy
-msgid "Same as password above. Required."
-msgstr "Igual a la contraseña de arriba"
-
-#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
-#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
+#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
 msgid "Save"
 msgstr "Guardar"
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300
+#: ../lib/searchaction.php:73 ../lib/util.php:277
 msgid "Search"
 msgstr "Buscar"
 
@@ -1623,52 +1105,25 @@ msgid ""
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 "Buscar personas en %%site.name%% por nombre, ubicación o intereses. Separa "
-"los términos con espacios; deben tener una longitud mínima de 3 caracteres."
+"los términos con espacios; deben tener una longitud mínima de 3 "
+"caracteres."
 
-#: ../actions/smssettings.php:296
-msgid "Select a carrier"
-msgstr ""
-
-#: ../actions/invite.php:137 ../lib/util.php:1172
+#: ../lib/util.php:982
 msgid "Send"
 msgstr "Enviar"
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
-msgstr ""
-
-#: ../actions/emailsettings.php:88
-#, fuzzy
-msgid "Send me notices of new subscriptions through email."
-msgstr "Enviarme avisos por Jabber/GTalk"
-
-#: ../actions/imsettings.php:70
+#: ../actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Enviarme avisos por Jabber/GTalk"
 
-#: ../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
-#, fuzzy
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr "Enviarme avisos por Jabber/GTalk"
-
-#: ../lib/util.php:304
+#: ../lib/util.php:282
 msgid "Settings"
 msgstr "Configuración"
 
-#: ../actions/profilesettings.php:192
+#: ../actions/profilesettings.php:183
 msgid "Settings saved."
 msgstr "Configuración guardada."
 
-#: ../actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
 #: ../actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr "Alguien ya tiene este OpenID."
@@ -1677,45 +1132,36 @@ msgstr "Alguien ya tiene este OpenID."
 msgid "Something weird happened."
 msgstr "Algo raro pasó."
 
-#: ../scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54
-#, fuzzy
-msgid "Sorry, that is not your incoming email address."
-msgstr "Esa dirección de mensajería instantánea es incorrecta."
-
-#: ../lib/util.php:330
+#: ../lib/util.php:302
 msgid "Source"
 msgstr "Fuente"
 
-#: ../actions/showstream.php:296
+#: ../actions/showstream.php:277
 msgid "Statistics"
 msgstr "Estadísticas"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
 msgid "Stored OpenID not found."
 msgstr "No se ha encontrado el OpenID almacenado."
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197
+#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
+#: ../actions/showstream.php:181
 msgid "Subscribe"
 msgstr "Suscribirse"
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: ../actions/showstream.php:294 ../actions/subscribers.php:27
 msgid "Subscribers"
 msgstr "Suscriptores"
 
-#: ../actions/userauthorization.php:310
+#: ../actions/userauthorization.php:309
 msgid "Subscription authorized"
 msgstr "Suscripción autorizada"
 
-#: ../actions/userauthorization.php:320
+#: ../actions/userauthorization.php:319
 msgid "Subscription rejected"
 msgstr "Suscripción rechazada"
 
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
+#: ../actions/showstream.php:212 ../actions/showstream.php:288
 #: ../actions/subscriptions.php:27
 msgid "Subscriptions"
 msgstr "Suscripciones"
@@ -1724,14 +1170,6 @@ msgstr "Suscripciones"
 msgid "System error uploading file."
 msgstr "Error del sistema al cargar el archivo."
 
-#: ../actions/tag.php:41 ../lib/util.php:301
-msgid "Tags"
-msgstr ""
-
-#: ../lib/searchaction.php:104
-msgid "Text"
-msgstr ""
-
 #: ../actions/noticesearch.php:34
 msgid "Text search"
 msgstr "Búsqueda de texto"
@@ -1748,94 +1186,53 @@ msgstr "Esa dirección ya fue confirmada."
 msgid "That confirmation code is not for you!"
 msgstr "¡Ese código de confirmación no es para ti!"
 
-#: ../actions/emailsettings.php:191
-#, fuzzy
-msgid "That email address already belongs to another user."
-msgstr "El Jabber ID ya pertenece a otro usuario."
-
 #: ../actions/avatar.php:80
 msgid "That file is too big."
 msgstr "Ese archivo es demasiado grande."
 
-#: ../actions/imsettings.php:170
+#: ../actions/imsettings.php:161
 msgid "That is already your Jabber ID."
 msgstr "Ese ya es tu Jabber ID."
 
-#: ../actions/emailsettings.php:188
-#, fuzzy
-msgid "That is already your email address."
-msgstr "Ese ya es tu Jabber ID."
-
-#: ../actions/smssettings.php:188
-#, fuzzy
-msgid "That is already your phone number."
-msgstr "Ese ya es tu Jabber ID."
-
-#: ../actions/imsettings.php:233
+#: ../actions/imsettings.php:224
 msgid "That is not your Jabber ID."
 msgstr "Ese no es tu Jabber ID."
 
-#: ../actions/emailsettings.php:249
-#, fuzzy
-msgid "That is not your email address."
-msgstr "Esa dirección de mensajería instantánea es incorrecta."
-
-#: ../actions/smssettings.php:257
-#, fuzzy
-msgid "That is not your phone number."
-msgstr "Ese no es tu Jabber ID."
-
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
+#: ../actions/imsettings.php:201
 msgid "That is the wrong IM address."
 msgstr "Esa dirección de mensajería instantánea es incorrecta."
 
-#: ../actions/smssettings.php:233
-#, fuzzy
-msgid "That is the wrong confirmation number."
-msgstr "Esa dirección de mensajería instantánea es incorrecta."
-
-#: ../actions/smssettings.php:191
-#, fuzzy
-msgid "That phone number already belongs to another user."
-msgstr "El Jabber ID ya pertenece a otro usuario."
-
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: ../actions/newnotice.php:52
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "Demasiado largo. La longitud máxima es de 140 caracteres. "
 
-#: ../actions/twitapiaccount.php:74
-#, fuzzy
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "Demasiado largo. La longitud máxima es de 140 caracteres. "
-
-#: ../actions/confirmaddress.php:92
+#: ../actions/confirmaddress.php:86
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "La dirección \"%s\" fue confirmada para tu cuenta."
 
-#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274
+#: ../actions/imsettings.php:241
 msgid "The address was removed."
 msgstr "La dirección fue eliminada."
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:311
 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 ""
 "Se ha autorizado la suscripción, pero no se ha enviado un URL de retorno. "
-"Lee de nuevo las instrucciones para saber cómo autorizar la suscripción. Tu "
-"identificador de suscripción es:"
+"Lee de nuevo las instrucciones para saber cómo autorizar la suscripción. "
+"Tu identificador de suscripción es:"
 
-#: ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:321
 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 ""
-"Se ha rechazado la suscripción, pero no se ha enviado un URL de retorno. Lee "
-"de nuevo las instrucciones para saber cómo rechazar la suscripción "
+"Se ha rechazado la suscripción, pero no se ha enviado un URL de retorno. "
+"Lee de nuevo las instrucciones para saber cómo rechazar la suscripción "
 "completamente."
 
 #: ../actions/subscribers.php:35
@@ -1856,15 +1253,11 @@ msgstr "Estas son las personas que %s escucha."
 msgid "These are the people whose notices you listen to."
 msgstr "Estas son las personas que escuchas."
 
-#: ../actions/invite.php:89
-msgid ""
-"These people are already users and you were automatically subscribed to them:"
-msgstr ""
-
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:87
 msgid "This confirmation code is too old. Please start again."
 msgstr ""
-"Este código de confirmación es demasiado viejo. Por favor empieza de nuevo."
+"Este código de confirmación es demasiado viejo. Por favor empieza de "
+"nuevo."
 
 #: ../lib/openid.php:195
 msgid ""
@@ -1885,44 +1278,24 @@ msgstr ""
 "OpenID a una cuenta local. Puedes crear una nueva o conectarte con la tuya, "
 "si la tienes."
 
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-msgid "This method requires a POST or DELETE."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381
-msgid "This method requires a POST."
-msgstr ""
-
-#: ../lib/util.php:164
+#: ../lib/util.php:147
 msgid "This page is not available in a media type you accept"
 msgstr "Esta página no está disponible en un tipo de media que aceptes."
 
-#: ../actions/profilesettings.php:63
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107
-msgid "Timezone not selected."
-msgstr ""
-
 #: ../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."
+"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 ""
 "Para suscribirte, puedes [iniciar una sesión](%%action.login%%), o "
 "[registrar](%%action.register%%) una nueva cuenta. Si ya tienes una en un "
 "[servicio de microblogueo compatible](%%doc.openmublog%%), escribe el URL de "
 "tu perfil debajo."
 
-#: ../actions/twitapifriendships.php:163
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
-
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: ../actions/profilesettings.php:51
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "El URL de tu página personal, blog o perfil en otro sitio"
 
@@ -1930,24 +1303,19 @@ msgstr "El URL de tu página personal, blog o perfil en otro sitio"
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "El URL de tu perfil en otro servicio de microblogueo compatible"
 
-#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
-#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
 msgid "Unexpected form submission."
 msgstr "Envío de formulario inesperado."
 
-#: ../actions/recoverpassword.php:276
+#: ../actions/recoverpassword.php:237
 msgid "Unexpected password reset."
 msgstr "Restablecimiento de contraseña inesperado."
 
-#: ../index.php:57
-msgid "Unknown action"
-msgstr ""
-
 #: ../actions/finishremotesubscribe.php:58
 msgid "Unknown version of OMB protocol."
 msgstr "Versión desconocida del protocolo OMB."
 
-#: ../lib/util.php:269
+#: ../lib/util.php:245
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
@@ -1960,11 +1328,11 @@ msgstr ""
 msgid "Unrecognized address type %s"
 msgstr "Tipo de dirección %s desconocida"
 
-#: ../actions/showstream.php:209
+#: ../actions/showstream.php:193
 msgid "Unsubscribe"
 msgstr "Cancelar suscripción"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
 msgid "Unsupported OMB version"
 msgstr "Versión OMB no soportada"
 
@@ -1972,24 +1340,6 @@ msgstr "Versión OMB no soportada"
 msgid "Unsupported image file format."
 msgstr "Formato de imagen no soportado."
 
-#: ../lib/settingsaction.php:100
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:241
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:341
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
 #: ../actions/avatar.php:68
 msgid "Upload"
 msgstr "Cargar"
@@ -2003,33 +1353,22 @@ msgid ""
 msgstr ""
 "Carga un nuevo \"avatar\" (imagen de usuario) aquí. No puedes editar la "
 "imagen una vez cargada, por lo que antes debes asegurarte que sea más o "
-"menos cuadrada. Además, debe estar bajo la misma licencia del sitio. Usa una "
-"foto que te pertenezca y que quieras compartir."
-
-#: ../lib/settingsaction.php:91
-#, fuzzy
-msgid "Upload a new profile image"
-msgstr "No se pudo guardar la información del nuevo perfil"
-
-#: ../actions/invite.php:114
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
-msgstr ""
+"menos cuadrada. Además, debe estar bajo la misma licencia del sitio. Usa "
+"una foto que te pertenezca y que quieras compartir."
 
-#: ../actions/register.php:159 ../actions/register.php:162
+#: ../actions/profilesettings.php:48 ../actions/register.php:182
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
-"Usado sólo para actualizaciones, anuncios y recuperación de contraseñas"
+"Usado sólo para actualizaciones, anuncios y recuperación de "
+"contraseñas"
 
 #: ../actions/finishremotesubscribe.php:86
 msgid "User being listened to doesn't exist."
 msgstr "El usuario al que quieres seguir no existe."
 
 #: ../actions/all.php:41 ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:47 ../actions/replies.php:41
-#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
-#: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
-#: ../actions/twitapiusers.php:82
+#: ../actions/foaf.php:43 ../actions/replies.php:41
+#: ../actions/showstream.php:44
 msgid "User has no profile."
 msgstr "El usuario no tiene un perfil."
 
@@ -2037,93 +1376,62 @@ msgstr "El usuario no tiene un perfil."
 msgid "User nickname"
 msgstr "Apodo del usuario"
 
-#: ../actions/twitapiusers.php:75
-#, fuzzy
-msgid "User not found."
-msgstr "No se ha encontrado el OpenID almacenado."
-
-#: ../actions/profilesettings.php:63
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../lib/util.php:1159
+#: ../lib/util.php:969
 #, php-format
 msgid "What's up, %s?"
 msgstr "¿Qué tal, %s?"
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: ../actions/profilesettings.php:57
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Dónde estás, por ejemplo \"Ciudad, Estado (o Región), País\""
 
-#: ../actions/updateprofile.php:128
+#: ../actions/updateprofile.php:127
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Tipo de imagen incorrecto para '%s'"
 
-#: ../actions/updateprofile.php:123
+#: ../actions/updateprofile.php:122
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Tamaño de imagen incorrecto para '%s'"
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-msgid "Yes"
-msgstr ""
-
 #: ../actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr "¡Ya tienes este OpenID!"
 
-#: ../actions/deletenotice.php:37
-msgid ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
-msgstr ""
-
 #: ../actions/recoverpassword.php:31
 msgid "You are already logged in!"
 msgstr "¡Ya te has conectado!"
 
-#: ../actions/invite.php:81
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr ""
-
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
 msgstr "Puedes cambiar tu contraseña aquí. ¡Elige una buena!"
 
-#: ../actions/register.php:135
+#: ../actions/register.php:164
 msgid "You can create a new account to start posting notices."
 msgstr "Puedes crear una nueva cuenta y empezar a enviar avisos."
 
-#: ../actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
-"Puedes eliminar un OpenID de tu cuenta haciendo clic en el botón \"Eliminar"
-"\"."
+"Puedes eliminar un OpenID de tu cuenta haciendo clic en el botón "
+"\"Eliminar\"."
 
 #: ../actions/imsettings.php:28
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
 "Puedes enviar y recibir avisos vía [mensajes instantáneos](%%doc.im%%) de "
 "Jabber/GTalk. Configura tu dirección y opciones debajo."
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about you."
+"You can update your personal profile info here so people know more about "
+"you."
 msgstr ""
 "Puedes actualizar la información de tu perfil personal para que la gente "
 "sepa más sobre ti."
@@ -2132,43 +1440,15 @@ msgstr ""
 msgid "You can use the local subscription!"
 msgstr "¡Puedes usar la suscripción local!"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
 msgid "You can't register if you don't agree to the license."
 msgstr "No puedes registrarte si no estás de acuerdo con la licencia."
 
-#: ../actions/updateprofile.php:63
+#: ../actions/updateprofile.php:62
 msgid "You did not send us that profile"
 msgstr "No nos enviaste ese perfil"
 
-#: ../lib/mail.php:147
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
-"Send email to %2$s to post new messages.\n"
-"\n"
-"More email instructions at %3$s.\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:612
-msgid "You may not delete another user's status."
-msgstr ""
-
-#: ../actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr ""
-
-#: ../actions/invite.php:103
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
-
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:134
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Te has identificado. Escribe una nueva contraseña a continuación."
 
@@ -2176,11 +1456,11 @@ msgstr "Te has identificado. Escribe una nueva contraseña a continuación."
 msgid "Your OpenID URL"
 msgstr "El URL de tu OpenID"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:149
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
-"Tu nombre de usuario en este servidor, o la dirección de correo electrónico "
-"registrada."
+"Tu nombre de usuario en este servidor, o la dirección de correo "
+"electrónico registrada."
 
 #: ../actions/openidsettings.php:28
 #, php-format
@@ -2191,61 +1471,57 @@ msgstr ""
 "[OpenID](%%doc.openid%%) te permite ingresar a muchos sitios con la misma "
 "cuenta de usuario. Puedes administrar tus OpenID asociados desde aquí."
 
-#: ../lib/util.php:943
+#: ../lib/util.php:814
 msgid "a few seconds ago"
 msgstr "hace unos segundos"
 
-#: ../lib/util.php:955
+#: ../lib/util.php:826
 #, php-format
 msgid "about %d days ago"
 msgstr "hace %d días"
 
-#: ../lib/util.php:951
+#: ../lib/util.php:822
 #, php-format
 msgid "about %d hours ago"
 msgstr "hace %d horas"
 
-#: ../lib/util.php:947
+#: ../lib/util.php:818
 #, php-format
 msgid "about %d minutes ago"
 msgstr "hace %d minutos"
 
-#: ../lib/util.php:959
+#: ../lib/util.php:830
 #, php-format
 msgid "about %d months ago"
 msgstr "hace %d meses"
 
-#: ../lib/util.php:953
+#: ../lib/util.php:824
 msgid "about a day ago"
 msgstr "hace un día"
 
-#: ../lib/util.php:945
+#: ../lib/util.php:816
 msgid "about a minute ago"
 msgstr "hace un minuto"
 
-#: ../lib/util.php:957
+#: ../lib/util.php:828
 msgid "about a month ago"
 msgstr "hace un mes"
 
-#: ../lib/util.php:961
+#: ../lib/util.php:832
 msgid "about a year ago"
 msgstr "hace un año"
 
-#: ../lib/util.php:949
+#: ../lib/util.php:820
 msgid "about an hour ago"
 msgstr "hace una hora"
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-msgid "delete"
-msgstr ""
-
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117
+#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
+#: ../lib/stream.php:101
 msgid "in reply to..."
 msgstr "en respuesta a..."
 
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124
+#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
+#: ../lib/stream.php:108
 msgid "reply"
 msgstr "responder"
 
@@ -2253,23 +1529,1311 @@ msgstr "responder"
 msgid "same as password above"
 msgstr "repita la contraseña anterior"
 
-#: ../actions/twitapistatuses.php:755
-#, fuzzy
-msgid "unsupported file type"
-msgstr "Formato de imagen no soportado."
-
-#: ../lib/util.php:1309
+#: ../lib/util.php:1127
 msgid "« After"
 msgstr "« Después"
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "No se pudo confirmar el correo electrónico."
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+msgid " from "
+msgstr ""
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
+
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#, php-format
+msgid "%s public timeline"
+msgstr ""
+
+#: ../lib/mail.php:206 lib/mail.php:212
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/register.php:154 actions/register.php:168
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55
+msgid "API method not found!"
+msgstr ""
+
+#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
+#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
+#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
+#: ../actions/twitapidirect_messages.php:49
+#: ../actions/twitapidirect_messages.php:56
+#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
+#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
+#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
+#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
+#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
+#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
+#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
+#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
+#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
+#: actions/twitapistatuses.php:690
+msgid "API method under construction."
+msgstr ""
+
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
+
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for "
+"non-humans)"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
+
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr ""
+
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+msgid "Change email handling"
+msgstr ""
+
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+msgid "Change your profile settings"
+msgstr ""
+
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+msgid "Could not follow user: User not found."
+msgstr ""
+
+#: ../lib/subs.php:54 lib/subs.php:61
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: ../lib/subs.php:46 lib/subs.php:46
+msgid "Could not subscribe."
+msgstr ""
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+msgid "Couldn't update user record."
+msgstr ""
+
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr ""
+
+#: ../classes/Notice.php:72 classes/Notice.php:86
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr ""
+
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr ""
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr ""
+
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: ../actions/tag.php:55 actions/tag.php:55
+#, php-format
+msgid "Feed for tag %s"
+msgstr ""
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr ""
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr ""
+
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+msgid "I want to post notices by email."
+msgstr ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+msgid "IM"
+msgstr ""
+
+#: ../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
+msgid "Incoming email"
+msgstr ""
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+msgid "Incoming email address removed."
+msgstr ""
+
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Language"
+msgstr ""
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+msgid "Language is too long (max 50 chars)."
+msgstr ""
+
+#: ../actions/register.php:166 actions/register.php:180
+msgid "Longer name, preferably your \"real\" name"
+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 ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr ""
+
+#: ../lib/mail.php:144 lib/mail.php:144
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+msgid "New incoming email address added."
+msgstr ""
+
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+msgid "No"
+msgstr ""
+
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr ""
+
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+msgid "No email address."
+msgstr ""
+
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+msgid "No incoming email address."
+msgstr ""
+
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+msgid "No status with that ID found."
+msgstr ""
+
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+msgid "Not a registered user."
+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
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+msgid "Not found"
+msgstr ""
+
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr ""
+
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
+
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr ""
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr ""
+
+#: ../actions/invite.php:133 actions/invite.php:141
+msgid "Personal message"
+msgstr ""
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Preferred language"
+msgstr ""
+
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/register.php:28 actions/register.php:28
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+msgid "Registration successful"
+msgstr ""
+
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/register.php:156 actions/register.php:170
+msgid "Same as password above. Required."
+msgstr ""
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr ""
+
+#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
+#: actions/emailsettings.php:74 actions/smssettings.php:82
+msgid "Send email to this address to post new notices."
+msgstr ""
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../actions/tag.php:60 actions/tag.php:60
+msgid "Showing most popular tags from the last week"
+msgstr ""
+
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317
+msgid "Tags"
+msgstr ""
+
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
+msgid "Text"
+msgstr ""
+
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+msgid "That is not your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+msgid "That is not your phone number."
+msgstr ""
+
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/invite.php:89 actions/invite.php:96
+msgid ""
+"These people are already users and you were automatically subscribed to "
+"them:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511
+msgid "This method requires a POST or 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
+msgid "This method requires a POST."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+msgid "Timezone not selected."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+msgid "Two user ids or screen_names must be supplied."
+msgstr ""
+
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this "
+"service."
+msgstr ""
+
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+msgid "Yes"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+msgid "You are not friends with the specified user."
+msgstr ""
+
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr ""
+
+#: ../actions/invite.php:103 actions/invite.php:110
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
+msgstr ""
+
+#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99
+msgid "delete"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+msgid "unsupported file type"
+msgstr ""
+
+#: actions/deletenotice.php:74 actions/disfavor.php:43
+#: actions/emailsettings.php:127 actions/favor.php:45
+#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
+#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
+#: actions/openidsettings.php:123 actions/profilesettings.php:47
+#: actions/recoverpassword.php:282 actions/register.php:42
+#: actions/remotesubscribe.php:40 actions/smssettings.php:124
+#: actions/subscribe.php:44 actions/twittersettings.php:97
+#: actions/unsubscribe.php:41 actions/userauthorization.php:35
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/disfavor.php:55
+msgid "This notice is not a favorite!"
+msgstr ""
+
+#: actions/disfavor.php:63
+msgid "Could not delete favorite."
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Favor"
+msgstr ""
+
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+
+#: actions/emailsettings.php:95
+msgid "Send me email when someone sends me a private message."
+msgstr ""
+
+#: actions/favor.php:53 actions/twitapifavorites.php:142
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132
+msgid "Could not create favorite."
+msgstr ""
+
+#: actions/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#, php-format
+msgid "%s favorite notices"
+msgstr ""
+
+#: actions/favoritesrss.php:64
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr ""
+
+#: actions/inbox.php:28
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+
+#: actions/invite.php:178
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+msgstr ""
+
+#: actions/login.php:104
+msgid "Automatically login in the future; "
+msgstr ""
+
+#: actions/login.php:122
+msgid "For security reasons, please re-enter your "
+msgstr ""
+
+#: actions/login.php:126
+msgid "Login with your username and password. "
+msgstr ""
+
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+msgid "That's too long. Max message size is 140 chars."
+msgstr ""
+
+#: actions/newmessage.php:65
+msgid "No recipient specified."
+msgstr ""
+
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206
+msgid "You can't send a message to this user."
+msgstr ""
+
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly "
+"instead."
+msgstr ""
+
+#: actions/newmessage.php:108
+msgid "No such user"
+msgstr ""
+
+#: actions/newmessage.php:117
+msgid "New message"
+msgstr ""
+
+#: actions/noticesearch.php:95
+msgid "Notice without matching profile"
+msgstr ""
+
+#: actions/openidsettings.php:28
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr ""
+
+#: actions/openidsettings.php:46
+msgid "If you want to add an OpenID to your account, "
+msgstr ""
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr ""
+
+#: actions/openidsettings.php:87
+msgid "You can remove an OpenID from your account "
+msgstr ""
+
+#: actions/outbox.php:28
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr ""
+
+#: actions/outbox.php:30
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#: actions/outbox.php:53
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+
+#: actions/peoplesearch.php:28
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+msgstr ""
+
+#: actions/profilesettings.php:27
+msgid "You can update your personal profile info here "
+msgstr ""
+
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+msgid "User without matching profile"
+msgstr ""
+
+#: actions/recoverpassword.php:91
+msgid "This confirmation code is too old. "
+msgstr ""
+
+#: actions/recoverpassword.php:141
+msgid "If you've forgotten or lost your"
+msgstr ""
+
+#: actions/recoverpassword.php:154
+msgid "You've been identified. Enter a "
+msgstr ""
+
+#: actions/recoverpassword.php:169
+msgid "Your nickname on this server, "
+msgstr ""
+
+#: actions/recoverpassword.php:271
+msgid "Instructions for recovering your password "
+msgstr ""
+
+#: actions/recoverpassword.php:327
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95
+msgid "Password must be 6 or more characters."
+msgstr ""
+
+#: actions/register.php:216
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
+msgstr ""
+
+#: actions/register.php:227
+msgid "(You should receive a message by email momentarily, with "
+msgstr ""
+
+#: actions/remotesubscribe.php:51
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
+msgstr ""
+
+#: actions/showfavorites.php:61
+#, php-format
+msgid "Feed for favorites of %s"
+msgstr ""
+
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+msgid "Could not retrieve favorite notices."
+msgstr ""
+
+#: actions/showmessage.php:33
+msgid "No such message."
+msgstr ""
+
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
+msgstr ""
+
+#: actions/showmessage.php:61
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr ""
+
+#: actions/showmessage.php:66
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr ""
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr ""
+
+#: actions/smssettings.php:312
+#, php-format
+msgid "Mobile carrier for your phone. "
+msgstr ""
+
+#: actions/twitapidirect_messages.php:76
+#, php-format
+msgid "Direct messages to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:77
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:81
+msgid "Direct Messages You've Sent"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:82
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:128
+msgid "No message text!"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:138
+msgid "Recipient user not found."
+msgstr ""
+
+#: actions/twitapidirect_messages.php:141
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
+#: actions/twitapifavorites.php:92
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr ""
+
+#: actions/twitapifavorites.php:95
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr ""
+
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#, php-format
+msgid "%s added your notice as a favorite"
+msgstr ""
+
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+msgstr ""
+
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+msgstr ""
+
+#: actions/twittersettings.php:41
+msgid "Twitter settings"
+msgstr ""
+
+#: actions/twittersettings.php:48
+msgid "Twitter Account"
+msgstr ""
+
+#: actions/twittersettings.php:56
+msgid "Current verified Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr ""
+
+#: actions/twittersettings.php:65
+msgid "No spaces, please."
+msgstr ""
+
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr ""
+
+#: actions/twittersettings.php:72
+msgid "Automatically send my notices to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:75
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:78
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+
+#: actions/twittersettings.php:128
+msgid "Could not verify your Twitter credentials!"
+msgstr ""
+
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+msgid "Unable to save your Twitter settings!"
+msgstr ""
+
+#: actions/twittersettings.php:174
+msgid "Twitter settings saved."
+msgstr ""
+
+#: actions/twittersettings.php:192
+msgid "That is not your Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+msgid "Couldn't remove Twitter user."
+msgstr ""
+
+#: actions/twittersettings.php:212
+msgid "Twitter account removed."
+msgstr ""
+
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+msgid "Couldn't save Twitter preferences."
+msgstr ""
+
+#: actions/twittersettings.php:245
+msgid "Twitter preferences saved."
+msgstr ""
+
+#: actions/userauthorization.php:84
+msgid "Please check these details to make sure "
+msgstr ""
+
+#: actions/userauthorization.php:324
+msgid "The subscription has been authorized, but no "
+msgstr ""
+
+#: actions/userauthorization.php:334
+msgid "The subscription has been rejected, but no "
+msgstr ""
+
+#: classes/Channel.php:113
+msgid "Command results"
+msgstr ""
+
+#: classes/Channel.php:148
+msgid "Command complete"
+msgstr ""
+
+#: classes/Channel.php:158
+msgid "Command failed"
+msgstr ""
+
+#: classes/Command.php:39
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: classes/Command.php:96
+#, php-format
+msgid "Subscriptions: %1$s\n"
+msgstr ""
+
+#: classes/Command.php:125 classes/Command.php:242
+msgid "User has no last notice"
+msgstr ""
+
+#: classes/Command.php:146
+msgid "Notice marked as fave."
+msgstr ""
+
+#: classes/Command.php:166
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr ""
+
+#: classes/Command.php:169
+#, php-format
+msgid "Fullname: %s"
+msgstr ""
+
+#: classes/Command.php:172
+#, php-format
+msgid "Location: %s"
+msgstr ""
+
+#: classes/Command.php:175
+#, php-format
+msgid "Homepage: %s"
+msgstr ""
+
+#: classes/Command.php:178
+#, php-format
+msgid "About: %s"
+msgstr ""
+
+#: classes/Command.php:200
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
+
+#: classes/Command.php:214
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
+
+#: classes/Command.php:216
+msgid "Error sending direct message."
+msgstr ""
+
+#: classes/Command.php:263
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: classes/Command.php:270
+#, php-format
+msgid "Subscribed to %s"
+msgstr ""
+
+#: classes/Command.php:288
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
+
+#: classes/Command.php:295
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr ""
+
+#: classes/Command.php:310 classes/Command.php:330
+msgid "Command not yet implemented."
+msgstr ""
+
+#: classes/Command.php:313
+msgid "Notification off."
+msgstr ""
+
+#: classes/Command.php:315
+msgid "Can't turn off notification."
+msgstr ""
+
+#: classes/Command.php:333
+msgid "Notification on."
+msgstr ""
+
+#: classes/Command.php:335
+msgid "Can't turn on notification."
+msgstr ""
+
+#: classes/Command.php:344
+msgid "Commands:\n"
+msgstr ""
+
+#: classes/Message.php:53
+msgid "Could not insert message."
+msgstr ""
+
+#: classes/Message.php:63
+msgid "Could not update message with new URI."
+msgstr ""
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr ""
+
+#: lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:249
+#, php-format
+msgid "New private message from %s"
+msgstr ""
 
-#~ msgid "Couldn't create subscription."
-#~ msgstr "No se pudo crear la suscripción."
+#: lib/mail.php:253
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+msgstr ""
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Error al insertar aviso"
+#: lib/mailbox.php:43
+msgid "Only the user can read their own mailboxes."
+msgstr ""
 
-#~ msgid "Public"
-#~ msgstr "Público"
+#: lib/openid.php:195
+msgid "This form should automatically submit itself. "
+msgstr ""
+
+#: lib/personal.php:65
+msgid "Favorites"
+msgstr ""
+
+#: lib/personal.php:66
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
+#: lib/personal.php:66
+msgid "User"
+msgstr ""
+
+#: lib/personal.php:75
+msgid "Inbox"
+msgstr ""
+
+#: lib/personal.php:76
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personal.php:80
+msgid "Outbox"
+msgstr ""
+
+#: lib/personal.php:81
+msgid "Your sent messages"
+msgstr ""
+
+#: lib/settingsaction.php:99
+msgid "Twitter"
+msgstr ""
+
+#: lib/settingsaction.php:100
+msgid "Twitter integration options"
+msgstr ""
+
+#: lib/util.php:1718
+msgid "To"
+msgstr ""
+
+#: scripts/maildaemon.php:45
+msgid "Could not parse message."
+msgstr ""
diff --git a/locale/fr_FR/LC_MESSAGES/laconica.mo b/locale/fr_FR/LC_MESSAGES/laconica.mo
index e466d803a..3f144d677 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 1122828cc..eba0e8a3c 100644
--- a/locale/fr_FR/LC_MESSAGES/laconica.po
+++ b/locale/fr_FR/LC_MESSAGES/laconica.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#
 # French translations for Laconica package
 # Traductions françaises du paquet Laconica.
 # Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER
@@ -7,8 +8,16 @@
 # For translation choices and other informations, please read
 # <http://dev.filyb.info/laconica/wiki/french-translation>
 #
+# #-#-#-#-#  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.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
 "Project-Id-Version: 0.43\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-08-17 11:01-0400\n"
@@ -19,43 +28,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: ../actions/noticesearchrss.php:64
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr " Flux de recherche pour « %s »"
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
-msgid ""
-" except this private data: password, email address, IM address, phone "
-"number."
-msgstr ""
-" à l'exception de données personnelles telles que les mots de passe, "
-"adressesemail, adresses de messagerie instantanée et numéros de "
-"téléphone."
-
-#: ../actions/subscribe.php:84
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s est désormais à l'écoute de vos messages sur %2$s."
-
-#: ../actions/subscribe.php:86
-#, php-format
-msgid ""
-"%1$s is now listening to your notices on %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s.\n"
-msgstr ""
-"%1$s est désormais à l'écoute de vos messages sur %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Salutations distinguées,\n"
-"%4$s.\n"
-
 #: ../actions/shownotice.php:45
 #, php-format
 msgid "%1$s's status on %2$s"
@@ -66,75 +54,10 @@ msgstr "Statut de %1$s sur %2$s"
 msgid "%s Public Stream"
 msgstr "Flux public de %s"
 
-#: ../actions/all.php:47 ../actions/allrss.php:70 ../lib/stream.php:45
-#, php-format
-msgid "%s and friends"
-msgstr "%s et ses connaissances"
-
-#: ../lib/util.php:233
-#, php-format
-msgid ""
-"**%%site.name%%** is a microblogging service brought to you by "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
-msgstr ""
-"**%%site.name%%** est un service de microblog is a microblogging service "
-"quivous est proposé par [%%site.broughtby%%](%%site.broughtbyurl%%). "
-
-#: ../lib/util.php:235
-#, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** est un service de microblog. "
-
-#: ../lib/util.php:250
-msgid ". Contributors should be attributed by full name or nickname."
-msgstr ". Les contributeurs doivent être cités par leur nom ou leur surnom."
-
-#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: ../actions/register.php:176
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces"
-
-#: ../actions/password.php:42 ../actions/register.php:178
-msgid "6 or more characters"
-msgstr "6 caractères ou plus"
-
-#: ../actions/recoverpassword.php:165
-msgid "6 or more characters, and don't forget it!"
-msgstr "6 caractères ou plus, et ne l'oubliez pas !'"
-
-#: ../actions/imsettings.php:188
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
-msgstr ""
-"Un code de confirmation a été envoyé à l'adresse que vous avez ajouté. "
-"Vousdevez approuver %s pour qu'il vous envoie des messages."
-
-#: ../lib/util.php:296
-msgid "About"
-msgstr "À propos"
-
-#: ../actions/userauthorization.php:118
-msgid "Accept"
-msgstr "Accepter"
-
-#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
-msgid "Add"
-msgstr "Ajouter"
-
 #: ../actions/openidsettings.php:43
 msgid "Add OpenID"
 msgstr "Ajouter un OpenID"
 
-#: ../actions/imsettings.php:39
-msgid "Address"
-msgstr "Adresse"
-
-#: ../actions/showstream.php:254
-msgid "All subscriptions"
-msgstr "Toutes les inscriptions"
-
 #: ../actions/publicrss.php:62
 #, php-format
 msgid "All updates for %s"
@@ -145,28 +68,6 @@ msgstr "Toutes les mises à jour pour %s"
 msgid "All updates matching search term \"%s\""
 msgstr "Toutes les mises à jour correspondantes aux termes cherchés « %s »"
 
-#: ../actions/finishopenidlogin.php:29 ../actions/login.php:27
-#: ../actions/openidlogin.php:29 ../actions/register.php:28
-msgid "Already logged in."
-msgstr "Déjà connecté."
-
-#: ../actions/subscribe.php:48
-msgid "Already subscribed!."
-msgstr "Déjà enregistré !"
-
-#: ../actions/userauthorization.php:76
-msgid "Authorize subscription"
-msgstr "Inscription autorisée"
-
-#: ../actions/login.php:100 ../actions/register.php:184
-msgid "Automatically login in the future; not for shared computers!"
-msgstr ""
-"Se reconnecter automatiquement ; ne pas utiliser sur un ordinateurpartagé "
-
-#: ../actions/avatar.php:32
-msgid "Avatar"
-msgstr "Avatar"
-
 #: ../actions/avatar.php:113
 msgid "Avatar updated."
 msgstr "Avatar mis à jour."
@@ -181,39 +82,10 @@ msgstr ""
 "compteJabber/GTalk pour recevoir un message avec les instructions "
 "suivantes.(Avez-vous ajouté %s à votre liste de contacts ?)"
 
-#: ../lib/util.php:1136
-msgid "Before »"
-msgstr "Avant »"
-
-#: ../actions/profilesettings.php:52
-msgid "Bio"
-msgstr "Bio"
-
-#: ../actions/profilesettings.php:93 ../actions/updateprofile.php:102
-msgid "Bio is too long (max 140 chars)."
-msgstr "La bio est trop longue (140 caractères max)."
-
-#: ../actions/updateprofile.php:118
-#, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr "Impossible de lire l'URL de l'avatar '%s'"
-
-#: ../actions/password.php:85 ../actions/recoverpassword.php:261
-msgid "Can't save new password."
-msgstr "Impossible d'enregistrer le nouveau mot de passe."
-
-#: ../actions/imsettings.php:59
-msgid "Cancel"
-msgstr "Annuler"
-
 #: ../lib/openid.php:121
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Impossible d'instancier l'objet client pour OpenID"
 
-#: ../actions/imsettings.php:154
-msgid "Cannot normalize that Jabber ID"
-msgstr "Impossible de normaliser cet identifiant Jabber"
-
 #: ../actions/password.php:45
 msgid "Change"
 msgstr "Changer"
@@ -222,19 +94,6 @@ msgstr "Changer"
 msgid "Change password"
 msgstr "Changer de mot de passe"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:166
-#: ../actions/register.php:179
-msgid "Confirm"
-msgstr "Confirmer"
-
-#: ../actions/confirmaddress.php:84
-msgid "Confirm Address"
-msgstr "Confirmer l'adresse"
-
-#: ../actions/imsettings.php:213
-msgid "Confirmation cancelled."
-msgstr "Confirmation annulée."
-
 #: ../actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr "Code de confirmation non trouvé."
@@ -247,10 +106,6 @@ msgstr "Connecter"
 msgid "Connect existing account"
 msgstr "Connecté à un compte existant"
 
-#: ../lib/util.php:304
-msgid "Contact"
-msgstr "Contact"
-
 #: ../lib/openid.php:178
 #, php-format
 msgid "Could not create OpenID form: %s"
@@ -261,14 +116,6 @@ msgstr "Impossible de créer le formulaire OpenID : %s"
 msgid "Could not redirect to server: %s"
 msgstr "Impossible de rediriger vers le serveur : %s"
 
-#: ../actions/updateprofile.php:161
-msgid "Could not save avatar info"
-msgstr "Impossible d'enregistrer les informations de l'avatar"
-
-#: ../actions/updateprofile.php:154
-msgid "Could not save new profile info"
-msgstr "Impossible d'enregistrer les informations du nouveau profil"
-
 #: ../actions/profilesettings.php:146
 msgid "Couldn't confirm email."
 msgstr "Impossible de confirmer l'email"
@@ -281,35 +128,14 @@ msgstr "Impossible de convertir les jetons de requête en jetons d'accès"
 msgid "Couldn't create subscription."
 msgstr "Impossible de créer l'inscription."
 
-#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
-msgid "Couldn't delete email confirmation."
-msgstr "Impossible de supprimer la confirmation d'email."
-
-#: ../actions/unsubscribe.php:56
-msgid "Couldn't delete subscription."
-msgstr "Impossible de supprimer l'inscription."
-
 #: ../actions/remotesubscribe.php:125
 msgid "Couldn't get a request token."
 msgstr "Impossible d'obtenir le jeton de requête."
 
-#: ../actions/imsettings.php:178
-msgid "Couldn't insert confirmation code."
-msgstr "Impossible d'insérer le code de confirmation."
-
 #: ../actions/finishremotesubscribe.php:180
 msgid "Couldn't insert new subscription."
 msgstr "Impossible d'insérer une nouvelle inscription."
 
-#: ../actions/profilesettings.php:175
-msgid "Couldn't save profile."
-msgstr "Impossible d'enregistrer le profil"
-
-#: ../actions/confirmaddress.php:70 ../actions/imsettings.php:129
-#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
-msgid "Couldn't update user."
-msgstr "Impossible de mettre à jour l'utilisateur."
-
 #: ../actions/finishopenidlogin.php:84
 msgid "Create"
 msgstr "Créer"
@@ -330,47 +156,10 @@ msgstr "Création d'un nouveau compte pour un OpenID qui a déjà un utilisateur
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Adresse Jabber/GTalk actuellement confirmée."
 
-#: ../actions/showstream.php:337
-msgid "Currently"
-msgstr "Actuellement"
-
-#: ../lib/util.php:893
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Erreur de base de donnée en insérant la réponse : %s"
-
-#: ../actions/profilesettings.php:54
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "Décrivez-vous et vous intérêts en 140 caractères"
-
-#: ../actions/register.php:181
-msgid "Email"
-msgstr "Email"
-
 #: ../actions/profilesettings.php:46
 msgid "Email address"
 msgstr "Adresse email"
 
-#: ../actions/profilesettings.php:102 ../actions/register.php:63
-msgid "Email address already exists."
-msgstr "L'adresse email existe déjà."
-
-#: ../lib/mail.php:82
-msgid "Email address confirmation"
-msgstr "Confirmation de l'adresse email"
-
-#: ../actions/recoverpassword.php:176
-msgid "Enter a nickname or email address."
-msgstr "Entrez un surnom ou une adresse email."
-
-#: ../actions/userauthorization.php:136
-msgid "Error authorizing token"
-msgstr "Erreur d'autorisation de jeton"
-
-#: ../actions/finishopenidlogin.php:282
-msgid "Error connecting user to OpenID."
-msgstr "Erreur de connexion d'utilisateur par OpenID."
-
 #: ../actions/finishaddopenid.php:78
 msgid "Error connecting user."
 msgstr "Erreur de connexion d'utilisateur."
@@ -391,18 +180,6 @@ msgstr "Erreur lors de l'insertion d'un message"
 msgid "Error inserting remote profile"
 msgstr "Erreur lors de l'insertion d'un profil distant"
 
-#: ../actions/recoverpassword.php:201
-msgid "Error saving address confirmation."
-msgstr "Erreur lors de l'enregistrement de la confirmation de l'adresse."
-
-#: ../actions/userauthorization.php:139
-msgid "Error saving remote profile"
-msgstr "Erreur lors de l'enregistrement d'un profil distant"
-
-#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
-msgid "Error saving the profile."
-msgstr "Erreur lors de l'enregistrement du profil."
-
 #: ../lib/openid.php:237
 msgid "Error saving the user."
 msgstr "Erreur lors de l'enregistrement de l'utilisateur."
@@ -411,11 +188,6 @@ msgstr "Erreur lors de l'enregistrement de l'utilisateur."
 msgid "Error saving user; invalid."
 msgstr "Erreur lors de l'enregistrement de l'utilisateur ; invalide."
 
-#: ../actions/login.php:43 ../actions/login.php:69
-#: ../actions/recoverpassword.php:268 ../actions/register.php:73
-msgid "Error setting user."
-msgstr "Erreur lors de la mise en place de l'utilisateur."
-
 #: ../actions/finishaddopenid.php:83
 msgid "Error updating profile"
 msgstr "Erreur lors de la mise à jour du profil"
@@ -424,60 +196,14 @@ msgstr "Erreur lors de la mise à jour du profil"
 msgid "Error updating remote profile"
 msgstr "Erreur lors de la mise à jour du profil distant"
 
-#: ../actions/recoverpassword.php:79
-msgid "Error with confirmation code."
-msgstr "Erreur avec le code de confirmation."
-
 #: ../actions/finishopenidlogin.php:89
 msgid "Existing nickname"
 msgstr "Surnom existant"
 
-#: ../lib/util.php:298
-msgid "FAQ"
-msgstr "FAQ"
-
 #: ../actions/avatar.php:115
 msgid "Failed updating avatar."
 msgstr "La mise à jour de l'avatar a échoué."
 
-#: ../actions/all.php:61 ../actions/allrss.php:74
-#, php-format
-msgid "Feed for friends of %s"
-msgstr "Fil des connaissances de %s"
-
-#: ../actions/replies.php:61 ../actions/repliesrss.php:80
-#, php-format
-msgid "Feed for replies to %s"
-msgstr "Fil des réponses à %s"
-
-#: ../actions/profilesettings.php:44
-msgid "Full name"
-msgstr "Nom complet"
-
-#: ../actions/profilesettings.php:90 ../actions/updateprofile.php:92
-msgid "Full name is too long (max 255 chars)."
-msgstr "Le nom est trop long (255 caractères max)."
-
-#: ../lib/util.php:279
-msgid "Help"
-msgstr "Aise"
-
-#: ../lib/util.php:274
-msgid "Home"
-msgstr "Accueil"
-
-#: ../actions/profilesettings.php:49
-msgid "Homepage"
-msgstr "Page personnelle"
-
-#: ../actions/profilesettings.php:87
-msgid "Homepage is not a valid URL."
-msgstr "La page personnelle n'est pas un URL valide."
-
-#: ../actions/imsettings.php:61
-msgid "IM Address"
-msgstr "Adresse de messagerie instantanée"
-
 #: ../actions/imsettings.php:33
 msgid "IM Settings"
 msgstr "Paramètres de messagerie instantanée"
@@ -498,45 +224,10 @@ msgstr ""
 "Si vous voulez ajouter un OpenID à votre compte, entrez-le dans le champ "
 "ci-dessous et cliquez sur « Ajouter »."
 
-#: ../actions/recoverpassword.php:122
-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 ""
-"Si vous avez oublié ou perdu votre mot de passe, vous pouvez en recevoir "
-"unnouveau à l'adresse email que vous avez définie dans votre compte."
-
 #: ../actions/password.php:69
 msgid "Incorrect old password"
 msgstr "Ancien mot de passe incorrect"
 
-#: ../actions/login.php:63
-msgid "Incorrect username or password."
-msgstr "Nom d'utilisateur ou mot de passe."
-
-#: ../actions/recoverpassword.php:226
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
-msgstr ""
-"Les instructions pour récupérer votre mot de passe ont été envoyées à "
-"l'adresse email définie dans votre compte."
-
-#: ../actions/updateprofile.php:113
-#, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "URL d'avatar invalide : '%s'"
-
-#: ../actions/updateprofile.php:97
-#, php-format
-msgid "Invalid homepage '%s'"
-msgstr "Page personnelle invalide '%s'"
-
-#: ../actions/updateprofile.php:81
-#, php-format
-msgid "Invalid license URL '%s'"
-msgstr "URL de licence invalide '%s'"
-
 #: ../actions/postnotice.php:61
 msgid "Invalid notice content"
 msgstr "Contenu du message invalide"
@@ -549,11 +240,6 @@ msgstr "URI du message invalide"
 msgid "Invalid notice url"
 msgstr "URL du message invalide"
 
-#: ../actions/updateprofile.php:86
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "URL du profil invalide '%s'."
-
 #: ../actions/remotesubscribe.php:96
 msgid "Invalid profile URL (bad format)"
 msgstr "URL du profil invalide (mauvais format)"
@@ -566,11 +252,6 @@ msgstr "URL du profil retourné par le serveur invalide."
 msgid "Invalid size."
 msgstr "Taille invalide."
 
-#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
-#: ../actions/register.php:84
-msgid "Invalid username or password."
-msgstr "Nom d'utilisateur ou mot de passe invalide."
-
 #: ../lib/util.php:237
 #, php-format
 msgid ""
@@ -582,103 +263,20 @@ msgstr ""
 "%s, disponible sous la licence [GNU Affero General Public License] "
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:164
-msgid "Jabber ID already belongs to another user."
-msgstr "Cet identifiant Jabber appartient déjà à un autre utilisateur."
-
-#: ../actions/imsettings.php:63
-#, 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 ""
-"Adresse Jabber ou GTalk, comme « NomDUtilisateur@example.org ». Tout "
-"d'abord,ajoutez %s à votre liste de contact dans votre client de messagerie "
-"instantanée ou dans GTalk."
-
-#: ../actions/profilesettings.php:55
-msgid "Location"
-msgstr "Localisation"
-
-#: ../actions/profilesettings.php:96 ../actions/updateprofile.php:107
-msgid "Location is too long (max 255 chars)."
-msgstr "La localisation est trop longue (255 caractères maximum)."
-
-#: ../actions/login.php:93 ../actions/login.php:102
-#: ../actions/openidlogin.php:68 ../lib/util.php:286
-msgid "Login"
-msgstr "Se connecter"
-
 #: ../actions/openidlogin.php:44
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Se connecter avec un compte [OpenID](%%doc.openid%%)."
 
-#: ../actions/login.php:112
-#, 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 ""
-"Connectez-vous avec votre nom d'utilisateur et votre mot de passe. Vous "
-"n'avezpas encore de nom d'utilisateur ? [Créez un nouveau "
-"compte](%%action.register%%), ou essayez [OpenID](%%action.openidlogin%%). "
-
-#: ../lib/util.php:284
-msgid "Logout"
-msgstr "Se déconnecter"
-
-#: ../actions/login.php:106
-msgid "Lost or forgotten password?"
-msgstr "Mot de passe perdu ou oublié ?"
-
-#: ../actions/showstream.php:281
-msgid "Member since"
-msgstr "Membre depuis"
-
 #: ../actions/userrss.php:70
 #, php-format
 msgid "Microblog by %s"
 msgstr "Microblog par %s"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
-msgid "My text and files are available under "
-msgstr "Mes textes et fichiers sont disponibles sous "
-
 #: ../actions/finishopenidlogin.php:71
 msgid "New nickname"
 msgstr "Nouveau surnom"
 
-#: ../actions/newnotice.php:100
-msgid "New notice"
-msgstr "Nouveau message"
-
-#: ../actions/password.php:41 ../actions/recoverpassword.php:164
-msgid "New password"
-msgstr "Nouveau mot de passe"
-
-#: ../actions/recoverpassword.php:275
-msgid "New password successfully saved. You are now logged in."
-msgstr "Nouveau mot de passe enregistré. Vous êtes à présent connecté."
-
-#: ../actions/login.php:97 ../actions/profilesettings.php:41
-#: ../actions/register.php:175
-msgid "Nickname"
-msgstr "Surnom"
-
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:99
-#: ../actions/register.php:59
-msgid "Nickname already in use. Try another one."
-msgstr "Surnom déjà utilisé. Essayez-en un autre."
-
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:80
-#: ../actions/register.php:57 ../actions/updateprofile.php:76
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-"Le surnom doit n'avoir que des lettres minuscules ou des nombres, etpas "
-"d'espaces."
-
 #: ../actions/finishopenidlogin.php:170
 msgid "Nickname not allowed."
 msgstr "Surnom non-autorisé."
@@ -687,30 +285,10 @@ msgstr "Surnom non-autorisé."
 msgid "Nickname of the user you want to follow"
 msgstr "Surnom de l'utilisateur à surveiller"
 
-#: ../actions/recoverpassword.php:147
-msgid "Nickname or email"
-msgstr "Surnom ou email"
-
-#: ../actions/imsettings.php:147
-msgid "No Jabber ID."
-msgstr "Pas d'identifiant Jabber."
-
-#: ../actions/userauthorization.php:128
-msgid "No authorization request!"
-msgstr "Pas de requête d'autorisation !"
-
 #: ../actions/confirmaddress.php:33
 msgid "No confirmation code."
 msgstr "Pas de code de confirmation."
 
-#: ../actions/newnotice.php:49
-msgid "No content!"
-msgstr "Pas de contenu !"
-
-#: ../actions/userbyid.php:27
-msgid "No id."
-msgstr "Pas d'identifiant."
-
 #: ../actions/finishremotesubscribe.php:65
 msgid "No nickname provided by remote server."
 msgstr "Pas de surnom proposé par le serveur distant."
@@ -719,22 +297,10 @@ msgstr "Pas de surnom proposé par le serveur distant."
 msgid "No nickname."
 msgstr "Pas de surnom."
 
-#: ../actions/imsettings.php:197
-msgid "No pending confirmation to cancel."
-msgstr "Pas de confirmation en attente à annuler."
-
 #: ../actions/finishremotesubscribe.php:72
 msgid "No profile URL returned by server."
 msgstr "Pas d'URL de profil retourné par le serveur."
 
-#: ../actions/recoverpassword.php:189
-msgid "No registered email address for that user."
-msgstr "Pas d'adresse email définie pour cet utilisateur."
-
-#: ../actions/userauthorization.php:48
-msgid "No request found!"
-msgstr "Pas de requête trouvée !"
-
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 msgid "No results"
 msgstr "Pas de résultats"
@@ -751,10 +317,6 @@ msgstr "Il n'y a pas cet OpenID."
 msgid "No such document."
 msgstr "Il n'y a pas ce document.'"
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
-msgid "No such notice."
-msgstr "Il n'y a pas ce message."
-
 #: ../actions/recoverpassword.php:56
 msgid "No such recovery code."
 msgstr "Il n'y a pas ce code de récupération."
@@ -763,40 +325,14 @@ msgstr "Il n'y a pas ce code de récupération."
 msgid "No such subscription"
 msgstr "Il n'y a pas cette inscription'"
 
-#: ../actions/all.php:34 ../actions/allrss.php:35
-#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:36
-#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
-#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:95 ../actions/subscribe.php:43
-#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
-#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
-msgid "No such user."
-msgstr "Il n'y a pas cet utilisateur.'"
-
-#: ../lib/gallery.php:76
-msgid "Nobody to show!"
-msgstr "Personne à montrer !"
-
 #: ../actions/recoverpassword.php:60
 msgid "Not a recovery code."
 msgstr "Pas de code de récupération."
 
-#: ../actions/imsettings.php:158
-msgid "Not a valid Jabber ID"
-msgstr "Ce n'est pas un identifiant Jabber valide"
-
 #: ../lib/openid.php:131
 msgid "Not a valid OpenID."
 msgstr "Ce n'est pas un OpenID valide."
 
-#: ../actions/profilesettings.php:75 ../actions/register.php:53
-msgid "Not a valid email address."
-msgstr "Ce n'est pas une adresse email valide."
-
-#: ../actions/profilesettings.php:83 ../actions/register.php:61
-msgid "Not a valid nickname."
-msgstr "Ce n'est pas un surnom valide."
-
 #: ../actions/remotesubscribe.php:118
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "Ce n'est pas un URL de profil valide (services incorrects)."
@@ -821,16 +357,6 @@ msgstr "Non autorisé."
 msgid "Not expecting this response!"
 msgstr "Cette réponse n'était pas attendue !"
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
-#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
-msgid "Not logged in."
-msgstr "Non connecté."
-
-#: ../actions/unsubscribe.php:43
-msgid "Not subscribed!."
-msgstr "Non inscrit !"
-
 #: ../actions/showstream.php:82
 #, php-format
 msgid "Notice feed for %s"
@@ -840,18 +366,10 @@ msgstr "Fil des messages de %s"
 msgid "Notice has no profile"
 msgstr "Le message n'a pas de profil"
 
-#: ../actions/showstream.php:297
-msgid "Notices"
-msgstr "Messages"
-
 #: ../actions/password.php:39
 msgid "Old password"
 msgstr "Ancien mot de passe"
 
-#: ../lib/util.php:288
-msgid "OpenID"
-msgstr "OpenID"
-
 #: ../actions/finishopenidlogin.php:61
 msgid "OpenID Account Setup"
 msgstr "Mise en place du compte OpenID"
@@ -895,73 +413,10 @@ msgstr "Paramètres OpenID"
 msgid "Partial upload."
 msgstr "Transfert partiel."
 
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
-#: ../actions/register.php:177
-msgid "Password"
-msgstr "Mot de passe"
-
-#: ../actions/recoverpassword.php:249
-msgid "Password and confirmation do not match."
-msgstr "Le mot de passe et sa confirmation ne correspondent pas."
-
-#: ../actions/recoverpassword.php:245
-msgid "Password must be 6 chars or more."
-msgstr "Le mot de passe doit être de 6 caractères ou plus."
-
-#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
-msgid "Password recovery requested"
-msgstr "Récupération de mot de passe demandée"
-
-#: ../actions/password.php:89 ../actions/recoverpassword.php:274
-msgid "Password saved."
-msgstr "Mot de passe enregistré."
-
-#: ../actions/password.php:61 ../actions/register.php:65
-msgid "Passwords don't match."
-msgstr "Les mots de passe ne correspondent pas."
-
 #: ../actions/peoplesearch.php:33
 msgid "People search"
 msgstr "Rechercher des personnes"
 
-#: ../lib/stream.php:44
-msgid "Personal"
-msgstr "Personnel"
-
-#: ../actions/userauthorization.php:77
-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 \"Cancel\"."
-msgstr ""
-"Veuillez vérifier ces détails pour être sûr que vous voulez vous "
-"inscrire auxmessages de cet utilisateur. Si vous n'avez pas demandé à vous "
-"inscrire aumessages de quelqu'un, cliquez sur « Annuler »."
-
-#: ../actions/imsettings.php:74
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "Envoyer un message quand mon statut Jabber/GTalk change."
-
-#: ../actions/imsettings.php:68
-msgid "Preferences"
-msgstr "Préférences"
-
-#: ../actions/imsettings.php:135
-msgid "Preferences saved."
-msgstr "Préférences enregistrées."
-
-#: ../lib/util.php:300
-msgid "Privacy"
-msgstr "Vie privée"
-
-#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
-msgid "Problem saving notice."
-msgstr "Problème d'enregistrement du message."
-
-#: ../lib/stream.php:54
-msgid "Profile"
-msgstr "Profil"
-
 #: ../actions/remotesubscribe.php:73
 msgid "Profile URL"
 msgstr "URL du profil"
@@ -970,10 +425,6 @@ msgstr "URL du profil"
 msgid "Profile settings"
 msgstr "Paramètres du profil"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
-msgid "Profile unknown"
-msgstr "Profil inconnu"
-
 #: ../lib/util.php:276
 msgid "Public"
 msgstr "Public"
@@ -986,42 +437,14 @@ msgstr "Fil du flux public"
 msgid "Public timeline"
 msgstr "Évolution publique"
 
-#: ../actions/recoverpassword.php:151
-msgid "Recover"
-msgstr "Récupérer"
-
-#: ../actions/recoverpassword.php:141
-msgid "Recover password"
-msgstr "Récupérer le mot de passe"
-
 #: ../actions/recoverpassword.php:67
 msgid "Recovery code for unknown user."
 msgstr "Code de récupération d'un utilisateur inconnu."
 
-#: ../actions/register.php:171 ../actions/register.php:195 ../lib/util.php:287
-msgid "Register"
-msgstr "Créer un compte"
-
-#: ../actions/userauthorization.php:119
-msgid "Reject"
-msgstr "Rejeter"
-
-#: ../actions/login.php:99 ../actions/register.php:183
-msgid "Remember me"
-msgstr "Se souvenir de moi"
-
-#: ../actions/updateprofile.php:69
-msgid "Remote profile with no matching profile"
-msgstr "Profil distant sans profil correspondant"
-
 #: ../actions/remotesubscribe.php:65
 msgid "Remote subscribe"
 msgstr "Inscription distante"
 
-#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
-msgid "Remove"
-msgstr "Enlever"
-
 #: ../actions/openidsettings.php:68
 msgid "Remove OpenID"
 msgstr "Enlever l'OpenID"
@@ -1034,35 +457,6 @@ msgstr ""
 "Enlever votre seul OpenID vous empêcherai de vous connecter ! Si vous avez "
 "besoin de l'enlever, ajoutez un autre OpenID d'abord."
 
-#: ../lib/stream.php:49
-msgid "Replies"
-msgstr "Réponses"
-
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
-#, php-format
-msgid "Replies to %s"
-msgstr "Réponses à %s"
-
-#: ../actions/recoverpassword.php:168
-msgid "Reset"
-msgstr "Reset"
-
-#: ../actions/recoverpassword.php:158
-msgid "Reset password"
-msgstr "Reset du mot de passe"
-
-#: ../actions/recoverpassword.php:167 ../actions/register.php:180
-msgid "Same as password above"
-msgstr "Identique au mot de passe ci-dessus"
-
-#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
-msgid "Save"
-msgstr "Enregistrer"
-
-#: ../lib/searchaction.php:73 ../lib/util.php:277
-msgid "Search"
-msgstr "Recherche"
-
 #: ../actions/noticesearch.php:80
 msgid "Search Stream Feed"
 msgstr "Fil du flux de recherche"
@@ -1087,22 +481,6 @@ msgstr ""
 "intérêt. Séparez les termes de la recherches par des espaces ; ils "
 "doivent être de 3 caractères ou plus."
 
-#: ../lib/util.php:982
-msgid "Send"
-msgstr "Envoi"
-
-#: ../actions/imsettings.php:71
-msgid "Send me notices through Jabber/GTalk."
-msgstr "M'envoyer des messages par Jabber/GTalk."
-
-#: ../lib/util.php:282
-msgid "Settings"
-msgstr "Paramètres"
-
-#: ../actions/profilesettings.php:183
-msgid "Settings saved."
-msgstr "Paramètres enregistrés."
-
 #: ../actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr "Quelqu'un d'autre a déjà cet OpenID."
@@ -1111,40 +489,6 @@ msgstr "Quelqu'un d'autre a déjà cet OpenID."
 msgid "Something weird happened."
 msgstr "Quelque chose de bizarre est arrivé."
 
-#: ../lib/util.php:302
-msgid "Source"
-msgstr "Source"
-
-#: ../actions/showstream.php:277
-msgid "Statistics"
-msgstr "Statistiques"
-
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
-msgid "Stored OpenID not found."
-msgstr "L'OpenID enregistré n'a pas été trouvé."
-
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
-#: ../actions/showstream.php:181
-msgid "Subscribe"
-msgstr "S'inscrire"
-
-#: ../actions/showstream.php:294 ../actions/subscribers.php:27
-msgid "Subscribers"
-msgstr "Inscrits"
-
-#: ../actions/userauthorization.php:309
-msgid "Subscription authorized"
-msgstr "Inscription autorisée"
-
-#: ../actions/userauthorization.php:319
-msgid "Subscription rejected"
-msgstr "Inscription rejetée"
-
-#: ../actions/showstream.php:212 ../actions/showstream.php:288
-#: ../actions/subscriptions.php:27
-msgid "Subscriptions"
-msgstr "Inscriptions"
-
 #: ../actions/avatar.php:87
 msgid "System error uploading file."
 msgstr "Erreur système en transférant le fichier."
@@ -1169,51 +513,6 @@ msgstr "Ce code de confirmation n'est pas pour vous !"
 msgid "That file is too big."
 msgstr "Ce fichier est trop gros."
 
-#: ../actions/imsettings.php:161
-msgid "That is already your Jabber ID."
-msgstr "C'est déjà votre identifiant Jabber."
-
-#: ../actions/imsettings.php:224
-msgid "That is not your Jabber ID."
-msgstr "Ce n'est pas votre identifiant Jabber."
-
-#: ../actions/imsettings.php:201
-msgid "That is the wrong IM address."
-msgstr "C'est la mauvaise adresse de messagerie instantanée."
-
-#: ../actions/newnotice.php:52
-msgid "That's too long. Max notice size is 140 chars."
-msgstr "C'est trop long. La taille maximale est de 140 caractères."
-
-#: ../actions/confirmaddress.php:86
-#, php-format
-msgid "The address \"%s\" has been confirmed for your account."
-msgstr "L'adresse « %s » a été confirmée pour votre compte."
-
-#: ../actions/imsettings.php:241
-msgid "The address was removed."
-msgstr "L'adresse a été enlevée."
-
-#: ../actions/userauthorization.php:311
-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 ""
-"L'inscription a été autorisée, mais aucune URL de rappel n'a été "
-"transmis. Vérifiez les instructions du site pour les détails à propos de "
-"l'autorisation des inscriptions. Votre jeton d'inscription est :"
-
-#: ../actions/userauthorization.php:321
-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 ""
-"L'inscription a été rejetée, mais aucun URL de rappel n'a été transmis. "
-"Vérifiez les instructions du site sur les détails pour rejeter totalement "
-"l'inscription."
-
 #: ../actions/subscribers.php:35
 #, php-format
 msgid "These are the people who listen to %s's notices."
@@ -1232,10 +531,6 @@ msgstr "Ce sont les personnes dont les messages sont suivis par %s."
 msgid "These are the people whose notices you listen to."
 msgstr "Ce sont les personnes dont vous suivez les messages."
 
-#: ../actions/recoverpassword.php:87
-msgid "This confirmation code is too old. Please start again."
-msgstr "Ce code de confirmation est trop ancien. Veuillez réessayer."
-
 #: ../lib/openid.php:195
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
@@ -1256,12 +551,6 @@ msgstr ""
 "connecter votre OpenID à un compte local. Vous pouvez soit créer un "
 "nouveau compte, soit vous connectez avec un compte existant, si vous en avez "
 
-#: ../lib/util.php:147
-msgid "This page is not available in a media type you accept"
-msgstr ""
-"Cette page n'est pas disponible dans un type de média que vous "
-"acceptez"
-
 #: ../actions/remotesubscribe.php:43
 #, php-format
 msgid ""
@@ -1275,47 +564,19 @@ msgstr ""
 "[site de microblog compatible](%%doc.openmublog%%), entrez l'URL de votre "
 "profil ci-dessous."
 
-#: ../actions/profilesettings.php:51
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL de votre page personnelle, blog, ou profil sur un autre site"
-
 #: ../actions/remotesubscribe.php:74
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL de votre profil sur un autre service de microblog compatible"
 
-#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
-msgid "Unexpected form submission."
-msgstr "Soumission de formulaire non-attendue."
-
-#: ../actions/recoverpassword.php:237
-msgid "Unexpected password reset."
-msgstr "Reset de mot de passe non-attendu."
-
 #: ../actions/finishremotesubscribe.php:58
 msgid "Unknown version of OMB protocol."
 msgstr "Version inconnue du protocole OMB"
 
-#: ../lib/util.php:245
-msgid ""
-"Unless otherwise specified, contents of this site are copyright by the "
-"contributors and available under the "
-msgstr ""
-"Sauf mention contraire, les droits d'auteur du contenu de ce site "
-"appartiennent aux contributeurs, et ce contenu est disponible sous la "
-
 #: ../actions/confirmaddress.php:48
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "Type d'adresse non reconnu : %s"
 
-#: ../actions/showstream.php:193
-msgid "Unsubscribe"
-msgstr "Se désinscrire"
-
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
-msgid "Unsupported OMB version"
-msgstr "Version OMB non-supportée"
-
 #: ../actions/avatar.php:105
 msgid "Unsupported image file format."
 msgstr "Format de fichier d'image non-supporté."
@@ -1336,45 +597,14 @@ msgstr ""
 "moins carrée. Elle doit aussi être soumise à la licence du site. Utilisez "
 "une image qui vous appartient et que vous voulez partager."
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:182
-msgid "Used only for updates, announcements, and password recovery"
-msgstr ""
-"Utilisé seulement pour les mises à jour, annonces et récupération de mot "
-"de passe"
-
 #: ../actions/finishremotesubscribe.php:86
 msgid "User being listened to doesn't exist."
 msgstr "L'utilisateur à suivre n'existe pas."
 
-#: ../actions/all.php:41 ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:43 ../actions/replies.php:41
-#: ../actions/showstream.php:44
-msgid "User has no profile."
-msgstr "L'utilisateur n'a pas de profil."
-
 #: ../actions/remotesubscribe.php:71
 msgid "User nickname"
 msgstr "Surnom de l'utilisateur"
 
-#: ../lib/util.php:969
-#, php-format
-msgid "What's up, %s?"
-msgstr "Quoi de neuf, %s ?"
-
-#: ../actions/profilesettings.php:57
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "D'où venez-vous, par exemple « Ville, État (ou Région), Pays »"
-
-#: ../actions/updateprofile.php:127
-#, php-format
-msgid "Wrong image type for '%s'"
-msgstr "Mauvais type d'image pour '%s'"
-
-#: ../actions/updateprofile.php:122
-#, php-format
-msgid "Wrong size image at '%s'"
-msgstr "Mauvaise taille d'image pour '%s'"
-
 #: ../actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr "Vous avez déjà cet OpenID !"
@@ -1387,10 +617,6 @@ msgstr "Vous êtes déjà connecté !"
 msgid "You can change your password here. Choose a good one!"
 msgstr "Vous pouvez changer ici votre mot de passe. Choisissez-en un bon !"
 
-#: ../actions/register.php:164
-msgid "You can create a new account to start posting notices."
-msgstr "Vous pouvez créer un compte pour commencer à envoyer des messages."
-
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
@@ -1421,28 +647,10 @@ msgstr ""
 msgid "You can use the local subscription!"
 msgstr "Vous pouvez utiliser l'inscription locale !"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
-msgid "You can't register if you don't agree to the license."
-msgstr "Vous ne pouvez pas vous enregistrer si vous n'acceptez pas la licence."
-
-#: ../actions/updateprofile.php:62
-msgid "You did not send us that profile"
-msgstr "Vous ne nous avez pas envoyé ce profil"
-
-#: ../actions/recoverpassword.php:134
-msgid "You've been identified. Enter a  new password below. "
-msgstr "Vous avez été identifié. Entrez un nouveau mot de passe ci-dessous. "
-
 #: ../actions/openidlogin.php:67
 msgid "Your OpenID URL"
 msgstr "Votre URL OpenID"
 
-#: ../actions/recoverpassword.php:149
-msgid "Your nickname on this server, or your registered email address."
-msgstr ""
-"Votre surnom sur ce serveur, ou votre adresse email définie dans votre "
-"compte."
-
 #: ../actions/openidsettings.php:28
 #, php-format
 msgid ""
@@ -1452,715 +660,1320 @@ msgstr ""
 "[OpenID](%%doc.openid%%) vous permet de vous connecter à différents sites "
 "avec le même compte utilisateur. Gérez vos OpenID associés d'ici."
 
-#: ../lib/util.php:814
-msgid "a few seconds ago"
-msgstr "il y a quelques secondes"
+#: ../actions/password.php:44
+msgid "same as password above"
+msgstr "identique au mot de passe ci-dessus"
 
-#: ../lib/util.php:826
+#: ../actions/showstream.php:400 ../lib/stream.php:105 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+msgid " from "
+msgstr ""
+
+#: ../actions/twitapistatuses.php:470 ../actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:412
 #, php-format
-msgid "about %d days ago"
-msgstr "il y a environ %d jours"
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
 
-#: ../lib/util.php:822
+#: ../actions/twitapistatuses.php:474 ../actions/twitapistatuses.php:482
+#: actions/twitapistatuses.php:415
 #, php-format
-msgid "about %d hours ago"
-msgstr "il y a environ %d heures"
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
 
-#: ../lib/util.php:818
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
 #, php-format
-msgid "about %d minutes ago"
-msgstr "il y a environ %d minutes"
+#, fuzzy
+msgid "%s public timeline"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Évolution publique\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../lib/util.php:830
+#: ../lib/mail.php:202 ../lib/mail.php:206 lib/mail.php:212
 #, php-format
-msgid "about %d months ago"
-msgstr "il y a environ %d mois"
+#, fuzzy
+msgid "%s status"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Statut de %1$s sur %2$s\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../lib/util.php:824
-msgid "about a day ago"
-msgstr "il y a environ un jour"
+#: ../actions/twitapistatuses.php:335 ../actions/twitapistatuses.php:338
+#: actions/twitapistatuses.php:265
+#, php-format
+#, fuzzy
+msgid "%s timeline"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Évolution publique\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../lib/util.php:816
-msgid "about a minute ago"
-msgstr "il y a environ une minute"
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
 
-#: ../lib/util.php:828
-msgid "about a month ago"
-msgstr "il y a environ un mois"
+#: ../actions/register.php:199 ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
 
-#: ../lib/util.php:832
-msgid "about a year ago"
-msgstr "il y a environ une année"
+#: ../actions/register.php:143 ../actions/register.php:152
+#: actions/register.php:166
+#, fuzzy
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../lib/util.php:820
-msgid "about an hour ago"
-msgstr "il y a environ une heure"
+#: ../actions/register.php:145 ../actions/register.php:154
+#: actions/register.php:168
+#, fuzzy
+msgid "6 or more characters. Required."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"6 caractères ou plus\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
-#: ../lib/stream.php:101
-msgid "in reply to..."
-msgstr "en réponse à..."
+#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Un code de confirmation a été envoyé à l'adresse que vous avez ajouté. "
+"Vousdevez approuver %s pour qu'il vous envoie des messages.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
-#: ../lib/stream.php:108
-msgid "reply"
-msgstr "répondre"
+#: ../actions/smssettings.php:216 actions/smssettings.php:224
+#, fuzzy
+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 ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Un code de confirmation a été envoyé à l'adresse que vous avez ajouté. "
+"Vousdevez approuver %s pour qu'il vous envoie des messages.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/password.php:44
-msgid "same as password above"
-msgstr "identique au mot de passe ci-dessus"
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#, fuzzy
+msgid "Add or remove OpenIDs"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Enlever l'OpenID\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../lib/util.php:1127
-msgid "« After"
-msgstr "« Après"
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:177
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
 msgid ""
-" except this private data: password, email address, IM address, phone "
-"number."
+"Automatically subscribe to whoever subscribes to me (best for "
+"non-humans)"
 msgstr ""
-" à l'exception de données personnelles telles que les mots de passe, "
-"adressesemail, adresses de messagerie instantanée et numéros de "
-"téléphone."
 
-#: ../actions/showstream.php:400 ../lib/stream.php:105
-msgid " from "
+#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#, fuzzy
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"En attente d'une confirmation pour cette adresse. Vérifiez votre "
+"compteJabber/GTalk pour recevoir un message avec les instructions "
+"suivantes.(Avez-vous ajouté %s à votre liste de contacts ?)\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/twitapistatuses.php:470
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
-#: ../lib/mail.php:120
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s est désormais à l'écoute de vos messages sur %2$s."
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+#, fuzzy
+msgid "Can't delete this notice."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Impossible de supprimer la confirmation d'email.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#, fuzzy
+msgid "Cannot normalize that email address"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Impossible de normaliser cet identifiant Jabber\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+msgid "Change email handling"
+msgstr ""
+
+#: ../lib/settingsaction.php:94
+#, fuzzy
+msgid "Change your password"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Changer de mot de passe\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../lib/mail.php:122
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#, fuzzy
+msgid "Change your profile settings"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Paramètres du profil\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+#, fuzzy
+msgid "Confirmation code"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Pas de code de confirmation.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/register.php:188 ../actions/register.php:202
 #, php-format
 msgid ""
-"%1$s is now listening to your notices on %2$s.\n"
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to...\n"
 "\n"
-"\t%3$s\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"
-"Faithfully yours,\n"
-"%4$s.\n"
+"Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
-"%1$s est désormais à l'écoute de vos messages sur %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Salutations distinguées,\n"
-"%4$s.\n"
 
-#: ../actions/twitapistatuses.php:474
+#: ../actions/twitapifriendships.php:48 ../actions/twitapifriendships.php:53
+#: actions/twitapifriendships.php:53
+msgid "Could not follow user: User not found."
+msgstr ""
+
+#: ../actions/subscribe.php:62 ../lib/subs.php:54 lib/subs.php:61
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: ../actions/subscribe.php:54 ../lib/subs.php:46 lib/subs.php:46
+#, fuzzy
+msgid "Could not subscribe."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Non inscrit !\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+#, fuzzy
+msgid "Could not update user with confirmed email address."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Adresse Jabber/GTalk actuellement confirmée.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+#, fuzzy
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Impossible de mettre à jour l'utilisateur.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+#, fuzzy
+msgid "Couldn't update user record."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Impossible de mettre à jour l'utilisateur.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+#, fuzzy
+msgid "Current confirmed email address."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Adresse Jabber/GTalk actuellement confirmée.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../classes/Notice.php:72 classes/Notice.php:86
 #, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
+#, fuzzy
+msgid "DB error inserting hashtag: %s"
 msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Erreur de base de donnée en insérant la réponse : %s\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/all.php:47 ../actions/allrss.php:60
-#: ../actions/twitapistatuses.php:235 ../lib/stream.php:51
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+#, fuzzy
+msgid "Delete notice"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Nouveau message\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+#, fuzzy
+msgid "Email Address"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Adresse email\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+#, fuzzy
+msgid "Email Settings"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Paramètres\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: ../actions/tag.php:55 actions/tag.php:55
 #, php-format
-msgid "%s and friends"
-msgstr "%s et ses connaissances"
+#, fuzzy
+msgid "Feed for tag %s"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Fil des réponses à %s\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr ""
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr ""
+
+#: ../actions/login.php:122
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr ""
+
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+msgid "I want to post notices by email."
+msgstr ""
 
-#: ../actions/twitapistatuses.php:49
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+msgid "IM"
+msgstr ""
+
+#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
+msgid "Incoming email"
+msgstr ""
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#, fuzzy
+msgid "Incoming email address removed."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"L'adresse a été enlevée.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../lib/util.php:260 ../lib/util.php:261 lib/util.php:277
 #, php-format
 #, fuzzy
-msgid "%s public timeline"
-msgstr "Évolution publique"
+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 ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Il utilise le logiciel de microblog [Laconica](http://laconi.ca/), version "
+"%s, disponible sous la licence [GNU Affero General Public License] "
+"(http://www.fsf.org/licensing/licenses/agpl-3.0.html).\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Language"
+msgstr ""
 
-#: ../lib/mail.php:202
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#, fuzzy
+msgid "Language is too long (max 50 chars)."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"La localisation est trop longue (255 caractères maximum).\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/register.php:152 ../actions/register.php:166
+#: actions/register.php:180
+msgid "Longer name, preferably your \"real\" name"
+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 ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr ""
+
+#: ../lib/mail.php:140 ../lib/mail.php:144 lib/mail.php:144
 #, php-format
 #, fuzzy
-msgid "%s status"
-msgstr "Statut de %1$s sur %2$s"
+msgid "New email address for posting to %s"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Pas d'adresse email définie pour cet utilisateur.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#, fuzzy
+msgid "New incoming email address added."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Ce n'est pas une adresse email valide.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/twitapistatuses.php:335
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+msgid "No"
+msgstr ""
+
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+#, fuzzy
+msgid "No code entered"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Pas de contenu !\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#, fuzzy
+msgid "No email address."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Adresse email\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#, fuzzy
+msgid "No incoming email address."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Ce n'est pas une adresse email valide.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+#, fuzzy
+msgid "No phone number."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Il n'y a pas cet utilisateur.'\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+#, fuzzy
+msgid "No user with that email address or username."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Pas d'adresse email définie pour cet utilisateur.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+#, fuzzy
+msgid "Not a registered user."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Pas de code de récupération.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#, fuzzy
+msgid "Not a valid email address"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Ce n'est pas une adresse email valide.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+#, fuzzy
+msgid "Notice Search"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Recherche\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
 #, php-format
 #, fuzzy
-msgid "%s timeline"
-msgstr "Évolution publique"
+msgid "Notices tagged with %s"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Fil des messages de %s\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+#, fuzzy
+msgid "People"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Rechercher des personnes\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+#, fuzzy
+msgid "People Search"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Rechercher des personnes\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+#, fuzzy
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#, fuzzy
+msgid "Preferred language"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Préférences\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+#, fuzzy
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Adresse Jabber/GTalk actuellement confirmée.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#, fuzzy
+msgid "Publish a MicroID for my email address."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Entrez un surnom ou une adresse email.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/register.php:28 actions/register.php:28
+#, fuzzy
+msgid "Registration not allowed."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Surnom non-autorisé.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/register.php:186 ../actions/register.php:200
+#: actions/register.php:214
+msgid "Registration successful"
+msgstr ""
+
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+#, fuzzy
+msgid "SMS Settings"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Paramètres de messagerie instantanée\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../lib/mail.php:215 ../lib/mail.php:219 lib/mail.php:225
+#, fuzzy
+msgid "SMS confirmation"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Pas de code de confirmation.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/register.php:147 ../actions/register.php:156
+#: actions/register.php:170
+#, fuzzy
+msgid "Same as password above. Required."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Identique au mot de passe ci-dessus\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr ""
+
+#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
+#: actions/emailsettings.php:74 actions/smssettings.php:82
+msgid "Send email to this address to post new notices."
+msgstr ""
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+#, fuzzy
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"M'envoyer des messages par Jabber/GTalk.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../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
+#, fuzzy
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"M'envoyer des messages par Jabber/GTalk.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/twitapistatuses.php:52
+#: ../actions/tag.php:60 actions/tag.php:60
+msgid "Showing most popular tags from the last week"
+msgstr ""
+
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+#, fuzzy
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"C'est la mauvaise adresse de messagerie instantanée.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/tag.php:41 ../lib/util.php:300 ../lib/util.php:301
+#: actions/tag.php:41 lib/util.php:317
+msgid "Tags"
+msgstr ""
+
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
+msgid "Text"
+msgstr ""
+
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#, fuzzy
+msgid "That email address already belongs to another user."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Cet identifiant Jabber appartient déjà à un autre utilisateur.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#, fuzzy
+msgid "That is already your email address."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"C'est déjà votre identifiant Jabber.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+#, fuzzy
+msgid "That is already your phone number."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"C'est déjà votre identifiant Jabber.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#, fuzzy
+msgid "That is not your email address."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"C'est la mauvaise adresse de messagerie instantanée.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+#, fuzzy
+msgid "That is not your phone number."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Ce n'est pas votre identifiant Jabber.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+#, fuzzy
+msgid "That is the wrong confirmation number."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"C'est la mauvaise adresse de messagerie instantanée.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+#, fuzzy
+msgid "That phone number already belongs to another user."
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Cet identifiant Jabber appartient déjà à un autre utilisateur.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+msgid "Timezone not selected."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:150 ../actions/twitapifriendships.php:163
+#: actions/twitapifriendships.php:167
+msgid "Two user ids or screen_names must be supplied."
+msgstr ""
+
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
+#: ../lib/twitterapi.php:248 ../lib/twitterapi.php:269
+#, fuzzy
+msgid "Unsupported type"
+msgstr "Version OMB non-supportée"
+
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:238 ../actions/twitapistatuses.php:241
+#: actions/twitapistatuses.php:158
 #, php-format
-msgid "%s updates from everyone!"
+msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
-#: ../actions/register.php:199
+#: ../actions/twitapistatuses.php:338 ../actions/twitapistatuses.php:341
+#: actions/twitapistatuses.php:268
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: ../lib/settingsaction.php:91
+#, fuzzy
+msgid "Upload a new profile image"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Impossible d'enregistrer les informations du nouveau profil\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+msgid "Yes"
+msgstr ""
+
+#: ../actions/deletenotice.php:37 actions/deletenotice.php:37
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
+"You are about to permanently delete a notice.  Once this is done, it cannot "
+"be undone."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:115 ../actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:128
+msgid "You are not friends with the specified user."
+msgstr ""
+
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: ../lib/util.php:256
+#: ../lib/mail.php:143 ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/showstream.php:423 ../lib/stream.php:128 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99
+msgid "delete"
+msgstr ""
+
+#: ../lib/twitterapi.php:354
+#, fuzzy
+msgid "not a supported data format"
+msgstr "Format de fichier d'image non-supporté."
+
+#: ../actions/twitapistatuses.php:692 ../actions/twitapistatuses.php:755
+#: actions/twitapistatuses.php:678
+#, fuzzy
+msgid "unsupported file type"
+msgstr ""
+"#-#-#-#-#  laconica-no-duplicates.po (0.43)  #-#-#-#-#\n"
+"Format de fichier d'image non-supporté.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: actions/finishopenidlogin.php:88 actions/register.php:205
+msgid ""
+" except this private data: password, email address, IM address, phone "
+"number."
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126
+#, php-format
+msgid "%1$s is now listening to your notices on %2$s."
+msgstr ""
+
+#: ../lib/mail.php:126
+#, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s.\n"
+msgstr ""
+
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/all.php:47 ../actions/allrss.php:60
+#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51 actions/all.php:47
+#: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
+#, php-format
+msgid "%s and friends"
+msgstr ""
+
+#: ../lib/util.php:257 lib/util.php:273
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by "
 "[%%site.broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
-"**%%site.name%%** est un service de microblog is a microblogging service "
-"quivous est proposé par [%%site.broughtby%%](%%site.broughtbyurl%%). "
 
-#: ../lib/util.php:258
+#: ../lib/util.php:259 lib/util.php:275
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** est un service de microblog. "
+msgstr ""
 
-#: ../lib/util.php:273
+#: ../lib/util.php:274 lib/util.php:290
 msgid ". Contributors should be attributed by full name or nickname."
-msgstr ". Les contributeurs doivent être cités par leur nom ou leur surnom."
+msgstr ""
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces"
-
-#: ../actions/register.php:143
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces"
+msgstr ""
 
-#: ../actions/password.php:42
+#: ../actions/password.php:42 actions/profilesettings.php:181
 msgid "6 or more characters"
-msgstr "6 caractères ou plus"
+msgstr ""
 
-#: ../actions/recoverpassword.php:180
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
 msgid "6 or more characters, and don't forget it!"
-msgstr "6 caractères ou plus, et ne l'oubliez pas !'"
-
-#: ../actions/register.php:145
-#, fuzzy
-msgid "6 or more characters. Required."
-msgstr "6 caractères ou plus"
+msgstr ""
 
-#: ../actions/imsettings.php:197
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve "
 "%s for sending messages to you."
 msgstr ""
-"Un code de confirmation a été envoyé à l'adresse que vous avez ajouté. "
-"Vousdevez approuver %s pour qu'il vous envoie des messages."
 
-#: ../actions/emailsettings.php:213
-#, fuzzy
-msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
-msgstr ""
-"Un code de confirmation a été envoyé à l'adresse que vous avez ajouté. "
-"Vousdevez approuver %s pour qu'il vous envoie des messages."
-
-#: ../actions/smssettings.php:216
-#, fuzzy
-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é à l'adresse que vous avez ajouté. "
-"Vousdevez approuver %s pour qu'il vous envoie des messages."
-
-#: ../lib/util.php:321
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55
+msgid "API method not found!"
+msgstr ""
+
+#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
+#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
+#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
+#: ../actions/twitapidirect_messages.php:49
+#: ../actions/twitapidirect_messages.php:56
+#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
+#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
+#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
+#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
+#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
+#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
+#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
+#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
+#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
+#: actions/twitapistatuses.php:690
+msgid "API method under construction."
+msgstr ""
+
+#: ../lib/util.php:324 lib/util.php:340
 msgid "About"
-msgstr "À propos"
+msgstr ""
 
-#: ../actions/userauthorization.php:119
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
 msgid "Accept"
-msgstr "Accepter"
+msgstr ""
 
 #: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
 #: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: actions/emailsettings.php:63 actions/imsettings.php:64
+#: actions/openidsettings.php:58 actions/smssettings.php:71
+#: actions/twittersettings.php:85
 msgid "Add"
-msgstr "Ajouter"
-
-#: ../lib/settingsaction.php:97
-#, fuzzy
-msgid "Add or remove OpenIDs"
-msgstr "Enlever l'OpenID"
+msgstr ""
 
 #: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
 msgid "Address"
-msgstr "Adresse"
+msgstr ""
+
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
 
-#: ../actions/showstream.php:273
+#: ../actions/showstream.php:273 actions/showstream.php:288
 msgid "All subscriptions"
-msgstr "Toutes les inscriptions"
+msgstr ""
 
 #: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
 #: ../actions/openidlogin.php:29 ../actions/register.php:30
+#: actions/finishopenidlogin.php:29 actions/login.php:31
+#: actions/openidlogin.php:29 actions/register.php:30
 msgid "Already logged in."
-msgstr "Déjà connecté."
+msgstr ""
 
-#: ../actions/subscribe.php:49
+#: ../lib/subs.php:42 lib/subs.php:42
 msgid "Already subscribed!."
-msgstr "Déjà enregistré !"
-
-#: ../actions/deletenotice.php:54
-msgid "Are you sure you want to delete this notice?"
 msgstr ""
 
-#: ../actions/userauthorization.php:77
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 msgid "Authorize subscription"
-msgstr "Inscription autorisée"
-
-#: ../actions/login.php:104 ../actions/register.php:164
-msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
-"Se reconnecter automatiquement ; ne pas utiliser sur un ordinateurpartagé "
 
-#: ../actions/profilesettings.php:65
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192
+msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: actions/profilesettings.php:34
 msgid "Avatar"
-msgstr "Avatar"
-
-#: ../actions/emailsettings.php:54
-#, fuzzy
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-msgstr ""
-"En attente d'une confirmation pour cette adresse. Vérifiez votre "
-"compteJabber/GTalk pour recevoir un message avec les instructions "
-"suivantes.(Avez-vous ajouté %s à votre liste de contacts ?)"
-
-#: ../actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
-#: ../lib/util.php:1301
+#: ../lib/util.php:1318 lib/util.php:1452
 msgid "Before »"
-msgstr "Avant »"
+msgstr ""
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:156
+#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: actions/profilesettings.php:82 actions/register.php:184
 msgid "Bio"
-msgstr "Bio"
+msgstr ""
 
-#: ../actions/profilesettings.php:101 ../actions/register.php:78
-#: ../actions/updateprofile.php:103
+#: ../actions/profilesettings.php:101 ../actions/register.php:82
+#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
+#: actions/register.php:89 actions/updateprofile.php:104
 msgid "Bio is too long (max 140 chars)."
-msgstr "La bio est trop longue (140 caractères max)."
-
-#: ../lib/deleteaction.php:41
-#, fuzzy
-msgid "Can't delete this notice."
-msgstr "Impossible de supprimer la confirmation d'email."
+msgstr ""
 
-#: ../actions/updateprofile.php:119
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #, php-format
 msgid "Can't read avatar URL '%s'"
-msgstr "Impossible de lire l'URL de l'avatar '%s'"
+msgstr ""
 
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
+#: actions/profilesettings.php:404 actions/recoverpassword.php:313
 msgid "Can't save new password."
-msgstr "Impossible d'enregistrer le nouveau mot de passe."
+msgstr ""
 
 #: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62
+#: ../actions/smssettings.php:62 actions/emailsettings.php:58
+#: actions/imsettings.php:59 actions/smssettings.php:62
 msgid "Cancel"
-msgstr "Annuler"
+msgstr ""
 
-#: ../actions/imsettings.php:163
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
 msgid "Cannot normalize that Jabber ID"
-msgstr "Impossible de normaliser cet identifiant Jabber"
-
-#: ../actions/emailsettings.php:181
-#, fuzzy
-msgid "Cannot normalize that email address"
-msgstr "Impossible de normaliser cet identifiant Jabber"
-
-#: ../lib/settingsaction.php:88
-msgid "Change email handling"
 msgstr ""
 
-#: ../lib/settingsaction.php:94
-#, fuzzy
-msgid "Change your password"
-msgstr "Changer de mot de passe"
-
-#: ../lib/settingsaction.php:85
-#, fuzzy
-msgid "Change your profile settings"
-msgstr "Paramètres du profil"
-
 #: ../actions/password.php:43 ../actions/recoverpassword.php:181
-#: ../actions/register.php:146 ../actions/smssettings.php:65
+#: ../actions/register.php:155 ../actions/smssettings.php:65
+#: actions/profilesettings.php:182 actions/recoverpassword.php:187
+#: actions/register.php:169 actions/smssettings.php:65
 msgid "Confirm"
-msgstr "Confirmer"
+msgstr ""
 
-#: ../actions/confirmaddress.php:86
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
 msgid "Confirm Address"
-msgstr "Confirmer l'adresse"
+msgstr ""
 
 #: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245
+#: ../actions/smssettings.php:245 actions/emailsettings.php:256
+#: actions/imsettings.php:230 actions/smssettings.php:253
 msgid "Confirmation cancelled."
-msgstr "Confirmation annulée."
-
-#: ../actions/smssettings.php:63
-#, fuzzy
-msgid "Confirmation code"
-msgstr "Pas de code de confirmation."
-
-#: ../actions/register.php:188
-#, php-format
-msgid ""
-"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."
 msgstr ""
 
-#: ../lib/util.php:329
+#: ../lib/util.php:332 lib/util.php:348
 msgid "Contact"
-msgstr "Contact"
+msgstr ""
 
-#: ../actions/twitapifriendships.php:48
-msgid "Could not follow user: User not found."
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#, php-format
+msgid "Could not follow user: %s is already on your list."
 msgstr ""
 
-#: ../actions/updateprofile.php:162
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
 msgid "Could not save avatar info"
-msgstr "Impossible d'enregistrer les informations de l'avatar"
+msgstr ""
 
-#: ../actions/updateprofile.php:155
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
 msgid "Could not save new profile info"
-msgstr "Impossible d'enregistrer les informations du nouveau profil"
-
-#: ../actions/subscribe.php:62
-msgid "Could not subscribe other to you."
 msgstr ""
 
-#: ../actions/subscribe.php:54
-#, fuzzy
-msgid "Could not subscribe."
-msgstr "Non inscrit !"
-
-#: ../actions/recoverpassword.php:102
-#, fuzzy
-msgid "Could not update user with confirmed email address."
-msgstr "Adresse Jabber/GTalk actuellement confirmée."
-
-#: ../actions/confirmaddress.php:80 ../actions/emailsettings.php:234
+#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
 #: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#: actions/confirmaddress.php:84 actions/emailsettings.php:252
+#: actions/imsettings.php:226 actions/smssettings.php:249
 msgid "Couldn't delete email confirmation."
-msgstr "Impossible de supprimer la confirmation d'email."
+msgstr ""
 
-#: ../actions/unsubscribe.php:57
+#: ../lib/subs.php:103 lib/subs.php:116
 msgid "Couldn't delete subscription."
-msgstr "Impossible de supprimer l'inscription."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+msgid "Couldn't find any statuses."
+msgstr ""
 
 #: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206
+#: ../actions/smssettings.php:206 actions/emailsettings.php:223
+#: actions/imsettings.php:195 actions/smssettings.php:214
 msgid "Couldn't insert confirmation code."
-msgstr "Impossible d'insérer le code de confirmation."
+msgstr ""
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:92
+#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 msgid "Couldn't save profile."
-msgstr "Impossible d'enregistrer le profil"
-
-#: ../actions/profilesettings.php:161
-#, fuzzy
-msgid "Couldn't update user for autosubscribe."
-msgstr "Impossible de mettre à jour l'utilisateur."
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#, fuzzy
-msgid "Couldn't update user record."
-msgstr "Impossible de mettre à jour l'utilisateur."
+msgstr ""
 
 #: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
 #: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
 #: ../actions/imsettings.php:243 ../actions/profilesettings.php:141
 #: ../actions/smssettings.php:157 ../actions/smssettings.php:269
+#: actions/confirmaddress.php:72 actions/emailsettings.php:174
+#: actions/emailsettings.php:277 actions/imsettings.php:146
+#: actions/imsettings.php:251 actions/profilesettings.php:256
+#: actions/smssettings.php:165 actions/smssettings.php:277
 msgid "Couldn't update user."
-msgstr "Impossible de mettre à jour l'utilisateur."
-
-#: ../actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
-#: ../actions/emailsettings.php:44
-#, fuzzy
-msgid "Current confirmed email address."
-msgstr "Adresse Jabber/GTalk actuellement confirmée."
-
-#: ../actions/showstream.php:356
+#: ../actions/showstream.php:356 actions/showstream.php:367
 msgid "Currently"
-msgstr "Actuellement"
-
-#: ../classes/Notice.php:72
-#, php-format
-#, fuzzy
-msgid "DB error inserting hashtag: %s"
-msgstr "Erreur de base de donnée en insérant la réponse : %s"
+msgstr ""
 
-#: ../lib/util.php:1044
+#: ../lib/util.php:1061 lib/util.php:1110
 #, php-format
 msgid "DB error inserting reply: %s"
-msgstr "Erreur de base de donnée en insérant la réponse : %s"
-
-#: ../actions/deletenotice.php:41
-#, fuzzy
-msgid "Delete notice"
-msgstr "Nouveau message"
+msgstr ""
 
-#: ../actions/profilesettings.php:51 ../actions/register.php:158
+#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: actions/profilesettings.php:84 actions/register.php:186
 msgid "Describe yourself and your interests in 140 chars"
-msgstr "Décrivez-vous et vous intérêts en 140 caractères"
+msgstr ""
 
-#: ../actions/register.php:148 ../lib/settingsaction.php:87
+#: ../actions/register.php:158 ../actions/register.php:161
+#: ../lib/settingsaction.php:87 actions/register.php:172
+#: actions/register.php:175 lib/settingsaction.php:87
 msgid "Email"
-msgstr "Email"
-
-#: ../actions/emailsettings.php:59
-#, fuzzy
-msgid "Email Address"
-msgstr "Adresse email"
-
-#: ../actions/emailsettings.php:32
-#, fuzzy
-msgid "Email Settings"
-msgstr "Paramètres"
+msgstr ""
 
-#: ../actions/register.php:69
+#: ../actions/register.php:73 actions/register.php:80
 msgid "Email address already exists."
-msgstr "L'adresse email existe déjà."
+msgstr ""
 
-#: ../lib/mail.php:90
+#: ../lib/mail.php:90 lib/mail.php:90
 msgid "Email address confirmation"
-msgstr "Confirmation de l'adresse email"
+msgstr ""
 
-#: ../actions/emailsettings.php:61
-msgid "Email address, like \"UserName@example.org\""
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
 msgstr ""
 
-#: ../actions/recoverpassword.php:191
+#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 msgid "Enter a nickname or email address."
-msgstr "Entrez un surnom ou une adresse email."
-
-#: ../actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
 msgstr ""
 
-#: ../actions/userauthorization.php:137
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 msgid "Error authorizing token"
-msgstr "Erreur d'autorisation de jeton"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:253
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
 msgid "Error connecting user to OpenID."
-msgstr "Erreur de connexion d'utilisateur par OpenID."
+msgstr ""
 
-#: ../actions/recoverpassword.php:240
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
 msgid "Error saving address confirmation."
-msgstr "Erreur lors de l'enregistrement de la confirmation de l'adresse."
+msgstr ""
 
-#: ../actions/userauthorization.php:140
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
 msgid "Error saving remote profile"
-msgstr "Erreur lors de l'enregistrement d'un profil distant"
+msgstr ""
 
-#: ../lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226
 msgid "Error saving the profile."
-msgstr "Erreur lors de l'enregistrement du profil."
+msgstr ""
 
 #: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:94
+#: ../actions/recoverpassword.php:307 ../actions/register.php:98
+#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
+#: actions/register.php:108
 msgid "Error setting user."
-msgstr "Erreur lors de la mise en place de l'utilisateur."
+msgstr ""
 
-#: ../actions/recoverpassword.php:80
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
 msgid "Error with confirmation code."
-msgstr "Erreur avec le code de confirmation."
+msgstr ""
 
-#: ../lib/util.php:323
+#: ../lib/util.php:326 lib/util.php:342
 msgid "FAQ"
-msgstr "FAQ"
+msgstr ""
 
-#: ../actions/all.php:61 ../actions/allrss.php:64
+#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
+#: actions/allrss.php:64
 #, php-format
 msgid "Feed for friends of %s"
-msgstr "Fil des connaissances de %s"
+msgstr ""
 
 #: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: actions/replies.php:65 actions/repliesrss.php:66
 #, php-format
 msgid "Feed for replies to %s"
-msgstr "Fil des réponses à %s"
-
-#: ../actions/tag.php:55
-#, php-format
-#, fuzzy
-msgid "Feed for tag %s"
-msgstr "Fil des réponses à %s"
-
-#: ../lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/login.php:122
-msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
 msgstr ""
 
-#: ../actions/profilesettings.php:44 ../actions/register.php:150
+#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: actions/profilesettings.php:77 actions/register.php:178
 msgid "Full name"
-msgstr "Nom complet"
+msgstr ""
 
-#: ../actions/profilesettings.php:98 ../actions/register.php:75
-#: ../actions/updateprofile.php:93
+#: ../actions/profilesettings.php:98 ../actions/register.php:79
+#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
+#: actions/register.php:86 actions/updateprofile.php:94
 msgid "Full name is too long (max 255 chars)."
-msgstr "Le nom est trop long (255 caractères max)."
+msgstr ""
 
-#: ../lib/util.php:319
+#: ../lib/util.php:322 lib/util.php:338
 msgid "Help"
-msgstr "Aise"
+msgstr "Aide"
 
-#: ../lib/util.php:297
+#: ../lib/util.php:298 lib/util.php:314
 msgid "Home"
-msgstr "Accueil"
+msgstr ""
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:153
+#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: actions/profilesettings.php:79 actions/register.php:181
 msgid "Homepage"
-msgstr "Page personnelle"
-
-#: ../actions/profilesettings.php:95 ../actions/register.php:72
-msgid "Homepage is not a valid URL."
-msgstr "La page personnelle n'est pas un URL valide."
-
-#: ../actions/emailsettings.php:91
-msgid "I want to post notices by email."
 msgstr ""
 
-#: ../lib/settingsaction.php:102
-msgid "IM"
+#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: actions/profilesettings.php:210 actions/register.php:83
+msgid "Homepage is not a valid URL."
 msgstr ""
 
-#: ../actions/imsettings.php:60
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
 msgid "IM Address"
-msgstr "Adresse de messagerie instantanée"
+msgstr ""
 
 #: ../actions/recoverpassword.php:137
 msgid ""
-"If you've forgotten or lost your password, you can get a new one sent  the "
+"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 vous avez oublié ou perdu votre mot de passe, vous pouvez en recevoir "
-"unnouveau à l'adresse email que vous avez définie dans votre compte."
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283
-#, fuzzy
-msgid "Incoming email address removed."
-msgstr "L'adresse a été enlevée."
-
-#: ../actions/login.php:67
+#: ../actions/login.php:67 actions/login.php:67
 msgid "Incorrect username or password."
-msgstr "Nom d'utilisateur ou mot de passe."
+msgstr ""
 
 #: ../actions/recoverpassword.php:265
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
-"Les instructions pour récupérer votre mot de passe ont été envoyées à "
-"l'adresse email définie dans votre compte."
 
-#: ../actions/updateprofile.php:114
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
 #, php-format
 msgid "Invalid avatar URL '%s'"
-msgstr "URL d'avatar invalide : '%s'"
+msgstr ""
+
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
 
-#: ../actions/updateprofile.php:98
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #, php-format
 msgid "Invalid homepage '%s'"
-msgstr "Page personnelle invalide '%s'"
+msgstr ""
 
-#: ../actions/updateprofile.php:82
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
 #, php-format
 msgid "Invalid license URL '%s'"
-msgstr "URL de licence invalide '%s'"
+msgstr ""
 
-#: ../actions/updateprofile.php:87
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid profile URL '%s'."
-msgstr "URL du profil invalide '%s'."
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:89
-#: ../actions/register.php:107
+#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
+#: ../actions/register.php:111 actions/finishopenidlogin.php:241
+#: actions/register.php:103 actions/register.php:121
 msgid "Invalid username or password."
-msgstr "Nom d'utilisateur ou mot de passe invalide."
+msgstr ""
 
-#: ../lib/util.php:260
-#, php-format
-#, fuzzy
-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)."
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322
+msgid "Invite"
 msgstr ""
-"Il utilise le logiciel de microblog [Laconica](http://laconi.ca/), version "
-"%s, disponible sous la licence [GNU Affero General Public License] "
-"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:173
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
 msgid "Jabber ID already belongs to another user."
-msgstr "Cet identifiant Jabber appartient déjà à un autre utilisateur."
+msgstr ""
 
-#: ../actions/imsettings.php:62
+#: ../actions/imsettings.php:62 actions/imsettings.php:63
 #, 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 ""
-"Adresse Jabber ou GTalk, comme « NomDUtilisateur@example.org ». Tout "
-"d'abord,ajoutez %s à votre liste de contact dans votre client de messagerie "
-"instantanée ou dans GTalk."
-
-#: ../actions/profilesettings.php:57
-msgid "Language"
-msgstr ""
-
-#: ../actions/profilesettings.php:113
-#, fuzzy
-msgid "Language is too long (max 50 chars)."
-msgstr "La localisation est trop longue (255 caractères maximum)."
 
-#: ../actions/profilesettings.php:52 ../actions/register.php:159
+#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: actions/profilesettings.php:85 actions/register.php:187
 msgid "Location"
-msgstr "Localisation"
+msgstr ""
 
-#: ../actions/profilesettings.php:104 ../actions/register.php:81
-#: ../actions/updateprofile.php:108
+#: ../actions/profilesettings.php:104 ../actions/register.php:85
+#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
+#: actions/register.php:92 actions/updateprofile.php:109
 msgid "Location is too long (max 255 chars)."
-msgstr "La localisation est trop longue (255 caractères maximum)."
+msgstr ""
 
 #: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:307
+#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
+#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
 msgid "Login"
-msgstr "Se connecter"
+msgstr ""
 
 #: ../actions/login.php:126
 #, php-format
@@ -2169,270 +1982,217 @@ msgid ""
 "[Register](%%action.register%%) a new account, or try "
 "[OpenID](%%action.openidlogin%%). "
 msgstr ""
-"Connectez-vous avec votre nom d'utilisateur et votre mot de passe. Vous "
-"n'avezpas encore de nom d'utilisateur ? [Créez un nouveau "
-"compte](%%action.register%%), ou essayez [OpenID](%%action.openidlogin%%). "
 
-#: ../lib/util.php:305
+#: ../lib/util.php:308 lib/util.php:324
 msgid "Logout"
-msgstr "Se déconnecter"
-
-#: ../actions/register.php:152
-msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
-#: ../actions/login.php:110
+#: ../actions/login.php:110 actions/login.php:110
 msgid "Lost or forgotten password?"
-msgstr "Mot de passe perdu ou oublié ?"
-
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
-#: ../actions/showstream.php:300
+#: ../actions/showstream.php:300 actions/showstream.php:315
 msgid "Member since"
-msgstr "Membre depuis"
-
-#: ../actions/smssettings.php:304
-#, php-format
-msgid ""
-"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
-"email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:174
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
 msgid "My text and files are available under "
-msgstr "Mes textes et fichiers sont disponibles sous "
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-msgid "New"
 msgstr ""
 
-#: ../lib/mail.php:140
-#, php-format
-#, fuzzy
-msgid "New email address for posting to %s"
-msgstr "Pas d'adresse email définie pour cet utilisateur."
-
-#: ../actions/emailsettings.php:297
-#, fuzzy
-msgid "New incoming email address added."
-msgstr "Ce n'est pas une adresse email valide."
-
-#: ../actions/newnotice.php:85
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
 msgid "New notice"
-msgstr "Nouveau message"
+msgstr ""
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
+#: actions/profilesettings.php:180 actions/recoverpassword.php:185
 msgid "New password"
-msgstr "Nouveau mot de passe"
+msgstr ""
 
 #: ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
-msgstr "Nouveau mot de passe enregistré. Vous êtes à présent connecté."
+msgstr ""
 
 #: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:142
+#: ../actions/register.php:151 actions/login.php:101
+#: actions/profilesettings.php:74 actions/register.php:165
 msgid "Nickname"
-msgstr "Surnom"
+msgstr ""
 
 #: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:65
+#: ../actions/register.php:69 actions/finishopenidlogin.php:181
+#: actions/profilesettings.php:225 actions/register.php:76
 msgid "Nickname already in use. Try another one."
-msgstr "Surnom déjà utilisé. Essayez-en un autre."
+msgstr ""
 
 #: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:63 ../actions/updateprofile.php:77
+#: ../actions/register.php:67 ../actions/updateprofile.php:77
+#: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
+#: actions/register.php:74 actions/updateprofile.php:78
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
-"Le surnom doit n'avoir que des lettres minuscules ou des nombres, etpas "
-"d'espaces."
 
-#: ../actions/recoverpassword.php:162
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
 msgid "Nickname or email"
-msgstr "Surnom ou email"
-
-#: ../actions/deletenotice.php:59
-msgid "No"
 msgstr ""
 
-#: ../actions/imsettings.php:156
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
 msgid "No Jabber ID."
-msgstr "Pas d'identifiant Jabber."
+msgstr ""
 
-#: ../actions/userauthorization.php:129
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
 msgid "No authorization request!"
-msgstr "Pas de requête d'autorisation !"
-
-#: ../actions/smssettings.php:181
-msgid "No carrier selected."
 msgstr ""
 
-#: ../actions/smssettings.php:316
-#, fuzzy
-msgid "No code entered"
-msgstr "Pas de contenu !"
-
-#: ../actions/newnotice.php:44
+#: ../actions/newnotice.php:44 actions/newmessage.php:53
+#: actions/newnotice.php:44 classes/Command.php:197
 msgid "No content!"
-msgstr "Pas de contenu !"
-
-#: ../actions/emailsettings.php:174
-#, fuzzy
-msgid "No email address."
-msgstr "Adresse email"
+msgstr ""
 
-#: ../actions/userbyid.php:32
+#: ../actions/userbyid.php:32 actions/userbyid.php:32
 msgid "No id."
-msgstr "Pas d'identifiant."
-
-#: ../actions/emailsettings.php:271
-#, fuzzy
-msgid "No incoming email address."
-msgstr "Ce n'est pas une adresse email valide."
+msgstr ""
 
 #: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229
+#: ../actions/smssettings.php:229 actions/emailsettings.php:240
+#: actions/imsettings.php:214 actions/smssettings.php:237
 msgid "No pending confirmation to cancel."
-msgstr "Pas de confirmation en attente à annuler."
-
-#: ../actions/smssettings.php:176
-#, fuzzy
-msgid "No phone number."
-msgstr "Il n'y a pas cet utilisateur.'"
+msgstr ""
 
-#: ../actions/recoverpassword.php:226
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
 msgid "No registered email address for that user."
-msgstr "Pas d'adresse email définie pour cet utilisateur."
+msgstr ""
 
-#: ../actions/userauthorization.php:49
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
 msgid "No request found!"
-msgstr "Pas de requête trouvée !"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+msgid "No status with that ID found."
+msgstr ""
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30
+#: ../lib/deleteaction.php:30 actions/shownotice.php:32
+#: actions/shownotice.php:83 lib/deleteaction.php:30
 msgid "No such notice."
-msgstr "Il n'y a pas ce message."
+msgstr ""
 
 #: ../actions/all.php:34 ../actions/allrss.php:35
 #: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
 #: ../actions/remotesubscribe.php:84 ../actions/remotesubscribe.php:91
 #: ../actions/replies.php:57 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:110 ../actions/subscribe.php:44
-#: ../actions/unsubscribe.php:39 ../actions/userbyid.php:36
+#: ../actions/showstream.php:110 ../actions/userbyid.php:36
 #: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
+#: ../lib/subs.php:33 ../lib/subs.php:82 actions/all.php:34
+#: actions/allrss.php:35 actions/avatarbynickname.php:43
+#: actions/favoritesrss.php:35 actions/foaf.php:40 actions/ical.php:31
+#: actions/remotesubscribe.php:93 actions/remotesubscribe.php:100
+#: actions/replies.php:57 actions/repliesrss.php:35
+#: actions/showfavorites.php:34 actions/showstream.php:110
+#: actions/userbyid.php:36 actions/userrss.php:35 actions/xrds.php:35
+#: classes/Command.php:120 classes/Command.php:162 classes/Command.php:203
+#: classes/Command.php:237 lib/gallery.php:62 lib/mailbox.php:36
+#: lib/subs.php:33 lib/subs.php:95
 msgid "No such user."
-msgstr "Il n'y a pas cet utilisateur.'"
-
-#: ../actions/recoverpassword.php:211
-#, fuzzy
-msgid "No user with that email address or username."
-msgstr "Pas d'adresse email définie pour cet utilisateur."
+msgstr ""
 
-#: ../lib/gallery.php:80
+#: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
-msgstr "Personne à montrer !"
+msgstr ""
 
-#: ../scripts/maildaemon.php:50
-#, fuzzy
-msgid "Not a registered user."
-msgstr "Pas de code de récupération."
+#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
+#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
+#: lib/twitterapi.php:502
+msgid "Not a supported data format."
+msgstr ""
 
-#: ../actions/imsettings.php:167
+#: ../actions/imsettings.php:167 actions/imsettings.php:175
 msgid "Not a valid Jabber ID"
-msgstr "Ce n'est pas un identifiant Jabber valide"
-
-#: ../actions/emailsettings.php:185
-#, fuzzy
-msgid "Not a valid email address"
-msgstr "Ce n'est pas une adresse email valide."
+msgstr ""
 
-#: ../actions/register.php:59
+#: ../actions/register.php:63 actions/register.php:70
 msgid "Not a valid email address."
-msgstr "Ce n'est pas une adresse email valide."
+msgstr ""
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:67
+#: ../actions/profilesettings.php:91 ../actions/register.php:71
+#: actions/profilesettings.php:206 actions/register.php:78
 msgid "Not a valid nickname."
-msgstr "Ce n'est pas un surnom valide."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+msgid "Not found"
+msgstr ""
 
 #: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
 #: ../actions/newnotice.php:29 ../actions/subscribe.php:28
 #: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
-#: ../lib/settingsaction.php:27
+#: ../lib/settingsaction.php:27 actions/disfavor.php:29 actions/favor.php:30
+#: actions/finishaddopenid.php:29 actions/logout.php:33
+#: actions/newmessage.php:28 actions/newnotice.php:29 actions/subscribe.php:28
+#: actions/unsubscribe.php:25 lib/deleteaction.php:38
+#: lib/settingsaction.php:27
 msgid "Not logged in."
-msgstr "Non connecté."
+msgstr ""
 
-#: ../actions/unsubscribe.php:44
+#: ../lib/subs.php:91 lib/subs.php:104
 msgid "Not subscribed!."
-msgstr "Non inscrit !"
-
-#: ../actions/opensearch.php:35
-#, fuzzy
-msgid "Notice Search"
-msgstr "Recherche"
+msgstr ""
 
-#: ../actions/showstream.php:316
+#: ../actions/showstream.php:316 actions/showstream.php:331
 msgid "Notices"
-msgstr "Messages"
-
-#: ../actions/tag.php:35 ../actions/tag.php:81
-#, php-format
-#, fuzzy
-msgid "Notices tagged with %s"
-msgstr "Fil des messages de %s"
+msgstr ""
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:311
+#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
+#: lib/util.php:330
 msgid "OpenID"
-msgstr "OpenID"
+msgstr ""
+
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
 
 #: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
-#: ../actions/register.php:144 ../lib/settingsaction.php:93
+#: ../actions/register.php:153 ../lib/settingsaction.php:93
+#: actions/finishopenidlogin.php:96 actions/login.php:102
+#: actions/register.php:167
 msgid "Password"
-msgstr "Mot de passe"
+msgstr ""
 
-#: ../actions/recoverpassword.php:288
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
 msgid "Password and confirmation do not match."
-msgstr "Le mot de passe et sa confirmation ne correspondent pas."
+msgstr ""
 
-#: ../actions/recoverpassword.php:284
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
 msgid "Password must be 6 chars or more."
-msgstr "Le mot de passe doit être de 6 caractères ou plus."
+msgstr ""
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 msgid "Password recovery requested"
-msgstr "Récupération de mot de passe demandée"
+msgstr ""
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: actions/profilesettings.php:408 actions/recoverpassword.php:326
 msgid "Password saved."
-msgstr "Mot de passe enregistré."
+msgstr ""
 
-#: ../actions/password.php:61 ../actions/register.php:84
+#: ../actions/password.php:61 ../actions/register.php:88
+#: actions/profilesettings.php:380 actions/register.php:98
 msgid "Passwords don't match."
-msgstr "Les mots de passe ne correspondent pas."
-
-#: ../lib/searchaction.php:100
-#, fuzzy
-msgid "People"
-msgstr "Rechercher des personnes"
-
-#: ../actions/opensearch.php:33
-#, fuzzy
-msgid "People Search"
-msgstr "Rechercher des personnes"
+msgstr ""
 
-#: ../lib/stream.php:50
+#: ../lib/stream.php:50 lib/personal.php:50
 msgid "Personal"
-msgstr "Personnel"
+msgstr ""
 
-#: ../actions/smssettings.php:69
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces"
+#: ../actions/invite.php:133 actions/invite.php:141
+msgid "Personal message"
+msgstr ""
 
 #: ../actions/userauthorization.php:78
 msgid ""
@@ -2440,306 +2200,201 @@ msgid ""
 "user's notices. If you didn't just ask to subscribe to someone's notices, "
 "click \"Cancel\"."
 msgstr ""
-"Veuillez vérifier ces détails pour être sûr que vous voulez vous "
-"inscrire auxmessages de cet utilisateur. Si vous n'avez pas demandé à vous "
-"inscrire aumessages de quelqu'un, cliquez sur « Annuler »."
 
-#: ../actions/imsettings.php:73
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "Envoyer un message quand mon statut Jabber/GTalk change."
+msgstr ""
 
 #: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94
+#: ../actions/smssettings.php:94 actions/emailsettings.php:86
+#: actions/imsettings.php:68 actions/smssettings.php:94
+#: actions/twittersettings.php:70
 msgid "Preferences"
-msgstr "Préférences"
+msgstr ""
 
 #: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163
+#: ../actions/smssettings.php:163 actions/emailsettings.php:180
+#: actions/imsettings.php:152 actions/smssettings.php:171
 msgid "Preferences saved."
-msgstr "Préférences enregistrées."
-
-#: ../actions/profilesettings.php:57
-#, fuzzy
-msgid "Preferred language"
-msgstr "Préférences"
+msgstr ""
 
-#: ../lib/util.php:325
+#: ../lib/util.php:328 lib/util.php:344
 msgid "Privacy"
-msgstr "Vie privée"
+msgstr ""
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:102
+#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
+#: classes/Notice.php:119
 msgid "Problem saving notice."
-msgstr "Problème d'enregistrement du message."
+msgstr ""
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60
+#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
+#: lib/settingsaction.php:84
 msgid "Profile"
-msgstr "Profil"
+msgstr ""
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: actions/postnotice.php:52 actions/updateprofile.php:53
 msgid "Profile unknown"
-msgstr "Profil inconnu"
-
-#: ../actions/imsettings.php:79
-#, fuzzy
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Adresse Jabber/GTalk actuellement confirmée."
-
-#: ../actions/emailsettings.php:94
-#, fuzzy
-msgid "Publish a MicroID for my email address."
-msgstr "Entrez un surnom ou une adresse email."
-
-#: ../actions/tag.php:75 ../actions/tag.php:76
-msgid "Recent Tags"
 msgstr ""
 
-#: ../actions/recoverpassword.php:166
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
 msgid "Recover"
-msgstr "Récupérer"
+msgstr ""
 
-#: ../actions/recoverpassword.php:156
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
 msgid "Recover password"
-msgstr "Récupérer le mot de passe"
+msgstr ""
 
-#: ../actions/register.php:138 ../actions/register.php:179 ../lib/util.php:309
+#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: actions/register.php:152 actions/register.php:207 lib/util.php:328
 msgid "Register"
-msgstr "Créer un compte"
-
-#: ../actions/register.php:28
-#, fuzzy
-msgid "Registration not allowed."
-msgstr "Surnom non-autorisé."
-
-#: ../actions/register.php:186
-msgid "Registration successful"
 msgstr ""
 
-#: ../actions/userauthorization.php:120
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
 msgid "Reject"
-msgstr "Rejeter"
+msgstr ""
 
-#: ../actions/login.php:103 ../actions/register.php:162
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190
 msgid "Remember me"
-msgstr "Se souvenir de moi"
+msgstr ""
 
-#: ../actions/updateprofile.php:70
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
 msgid "Remote profile with no matching profile"
-msgstr "Profil distant sans profil correspondant"
+msgstr ""
 
 #: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
 #: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59
 msgid "Remove"
-msgstr "Enlever"
+msgstr ""
 
-#: ../lib/stream.php:55
+#: ../lib/stream.php:55 lib/personal.php:55
 msgid "Replies"
-msgstr "Réponses"
+msgstr ""
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #, php-format
 msgid "Replies to %s"
-msgstr "Réponses à %s"
+msgstr ""
 
-#: ../actions/recoverpassword.php:183
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
 msgid "Reset"
-msgstr "Reset"
-
-#: ../actions/recoverpassword.php:173
-msgid "Reset password"
-msgstr "Reset du mot de passe"
-
-#: ../lib/settingsaction.php:99
-msgid "SMS"
 msgstr ""
 
-#: ../actions/smssettings.php:67
-msgid "SMS Phone number"
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
+msgid "Reset password"
 msgstr ""
 
-#: ../actions/smssettings.php:33
-#, fuzzy
-msgid "SMS Settings"
-msgstr "Paramètres de messagerie instantanée"
-
-#: ../lib/mail.php:215
-#, fuzzy
-msgid "SMS confirmation"
-msgstr "Pas de code de confirmation."
-
-#: ../actions/recoverpassword.php:182
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
 msgid "Same as password above"
-msgstr "Identique au mot de passe ci-dessus"
-
-#: ../actions/register.php:147
-#, fuzzy
-msgid "Same as password above. Required."
-msgstr "Identique au mot de passe ci-dessus"
+msgstr ""
 
 #: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
 #: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
+#: actions/emailsettings.php:104 actions/imsettings.php:82
+#: actions/profilesettings.php:101 actions/smssettings.php:100
+#: actions/twittersettings.php:83
 msgid "Save"
-msgstr "Enregistrer"
+msgstr ""
 
-#: ../lib/searchaction.php:84 ../lib/util.php:299
+#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
+#: lib/util.php:316
 msgid "Search"
-msgstr "Recherche"
-
-#: ../actions/smssettings.php:296
-msgid "Select a carrier"
 msgstr ""
 
-#: ../lib/util.php:1155
+#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
+#: lib/util.php:1306 lib/util.php:1731
 msgid "Send"
-msgstr "Envoi"
-
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
 msgstr ""
 
-#: ../actions/emailsettings.php:88
-#, fuzzy
-msgid "Send me notices of new subscriptions through email."
-msgstr "M'envoyer des messages par Jabber/GTalk."
-
-#: ../actions/imsettings.php:70
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
-msgstr "M'envoyer des messages par Jabber/GTalk."
-
-#: ../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
-#, fuzzy
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr "M'envoyer des messages par Jabber/GTalk."
-
-#: ../lib/util.php:303
+#: ../lib/util.php:304 lib/util.php:320
 msgid "Settings"
-msgstr "Paramètres"
-
-#: ../actions/profilesettings.php:192
-msgid "Settings saved."
-msgstr "Paramètres enregistrés."
-
-#: ../actions/tag.php:60
-msgid "Showing most popular tags from the last week"
 msgstr ""
 
-#: ../scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+msgid "Settings saved."
 msgstr ""
 
-#: ../scripts/maildaemon.php:54
-#, fuzzy
-msgid "Sorry, that is not your incoming email address."
-msgstr "C'est la mauvaise adresse de messagerie instantanée."
-
-#: ../lib/util.php:327
+#: ../lib/util.php:330 lib/util.php:346
 msgid "Source"
-msgstr "Source"
+msgstr ""
 
-#: ../actions/showstream.php:296
+#: ../actions/showstream.php:296 actions/showstream.php:311
 msgid "Statistics"
-msgstr "Statistiques"
+msgstr ""
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 msgid "Stored OpenID not found."
-msgstr "L'OpenID enregistré n'a pas été trouvé."
+msgstr ""
 
 #: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197
+#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
+#: actions/showstream.php:197 actions/showstream.php:206
 msgid "Subscribe"
-msgstr "S'inscrire"
+msgstr ""
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: actions/showstream.php:328 actions/subscribers.php:27
 msgid "Subscribers"
-msgstr "Inscrits"
+msgstr ""
 
-#: ../actions/userauthorization.php:310
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
 msgid "Subscription authorized"
-msgstr "Inscription autorisée"
+msgstr ""
 
-#: ../actions/userauthorization.php:320
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
 msgid "Subscription rejected"
-msgstr "Inscription rejetée"
+msgstr ""
 
 #: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27
+#: ../actions/subscriptions.php:27 actions/showstream.php:240
+#: actions/showstream.php:322 actions/subscriptions.php:27
 msgid "Subscriptions"
-msgstr "Inscriptions"
-
-#: ../actions/tag.php:41 ../lib/util.php:300
-msgid "Tags"
 msgstr ""
 
-#: ../lib/searchaction.php:104
-msgid "Text"
-msgstr ""
-
-#: ../actions/emailsettings.php:191
-#, fuzzy
-msgid "That email address already belongs to another user."
-msgstr "Cet identifiant Jabber appartient déjà à un autre utilisateur."
-
-#: ../actions/imsettings.php:170
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
 msgid "That is already your Jabber ID."
-msgstr "C'est déjà votre identifiant Jabber."
-
-#: ../actions/emailsettings.php:188
-#, fuzzy
-msgid "That is already your email address."
-msgstr "C'est déjà votre identifiant Jabber."
-
-#: ../actions/smssettings.php:188
-#, fuzzy
-msgid "That is already your phone number."
-msgstr "C'est déjà votre identifiant Jabber."
+msgstr ""
 
-#: ../actions/imsettings.php:233
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
 msgid "That is not your Jabber ID."
-msgstr "Ce n'est pas votre identifiant Jabber."
-
-#: ../actions/emailsettings.php:249
-#, fuzzy
-msgid "That is not your email address."
-msgstr "C'est la mauvaise adresse de messagerie instantanée."
-
-#: ../actions/smssettings.php:257
-#, fuzzy
-msgid "That is not your phone number."
-msgstr "Ce n'est pas votre identifiant Jabber."
+msgstr ""
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
+#: actions/emailsettings.php:244 actions/imsettings.php:218
 msgid "That is the wrong IM address."
-msgstr "C'est la mauvaise adresse de messagerie instantanée."
-
-#: ../actions/smssettings.php:233
-#, fuzzy
-msgid "That is the wrong confirmation number."
-msgstr "C'est la mauvaise adresse de messagerie instantanée."
-
-#: ../actions/smssettings.php:191
-#, fuzzy
-msgid "That phone number already belongs to another user."
-msgstr "Cet identifiant Jabber appartient déjà à un autre utilisateur."
+msgstr ""
 
-#: ../actions/newnotice.php:47
+#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: actions/newnotice.php:49 actions/twitapistatuses.php:330
 msgid "That's too long. Max notice size is 140 chars."
-msgstr "C'est trop long. La taille maximale est de 140 caractères."
+msgstr ""
 
-#: ../actions/confirmaddress.php:88
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
-msgstr "L'adresse « %s » a été confirmée pour votre compte."
+msgstr ""
 
 #: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274
+#: ../actions/smssettings.php:274 actions/emailsettings.php:282
+#: actions/imsettings.php:258 actions/smssettings.php:282
 msgid "The address was removed."
-msgstr "L'adresse a été enlevée."
+msgstr ""
 
 #: ../actions/userauthorization.php:312
 msgid ""
@@ -2747,9 +2402,6 @@ msgid ""
 "with the site's instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
-"L'inscription a été autorisée, mais aucune URL de rappel n'a été "
-"transmis. Vérifiez les instructions du site pour les détails à propos de "
-"l'autorisation des inscriptions. Votre jeton d'inscription est :"
 
 #: ../actions/userauthorization.php:322
 msgid ""
@@ -2757,252 +2409,799 @@ msgid ""
 "with the site's instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
-"L'inscription a été rejetée, mais aucun URL de rappel n'a été transmis. "
-"Vérifiez les instructions du site sur les détails pour rejeter totalement "
-"l'inscription."
+
+#: ../actions/invite.php:89 actions/invite.php:96
+msgid ""
+"These people are already users and you were automatically subscribed to "
+"them:"
+msgstr ""
 
 #: ../actions/recoverpassword.php:88
 msgid "This confirmation code is too old. Please start again."
-msgstr "Ce code de confirmation est trop ancien. Veuillez réessayer."
-
-#: ../lib/util.php:163
-msgid "This page is not available in a media type you accept"
 msgstr ""
-"Cette page n'est pas disponible dans un type de média que vous "
-"acceptez"
 
-#: ../actions/profilesettings.php:63
-msgid "Timezone"
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511
+msgid "This method requires a POST or DELETE."
 msgstr ""
 
-#: ../actions/profilesettings.php:107
-msgid "Timezone not selected."
+#: ../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
+msgid "This method requires a POST."
 msgstr ""
 
-#: ../actions/twitapifriendships.php:150
-msgid "Two user ids or screen_names must be supplied."
+#: ../lib/util.php:164 lib/util.php:246
+msgid "This page is not available in a media type you accept"
 msgstr ""
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:155
+#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: actions/profilesettings.php:81 actions/register.php:183
 msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL de votre page personnelle, blog, ou profil sur un autre site"
+msgstr ""
 
 #: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
 #: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: actions/emailsettings.php:144 actions/imsettings.php:118
+#: actions/recoverpassword.php:39 actions/smssettings.php:143
+#: actions/twittersettings.php:108
 msgid "Unexpected form submission."
-msgstr "Soumission de formulaire non-attendue."
+msgstr ""
 
-#: ../actions/recoverpassword.php:276
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
 msgid "Unexpected password reset."
-msgstr "Reset de mot de passe non-attendu."
-
-#: ../index.php:57
-msgid "Unknown action"
 msgstr ""
 
-#: ../lib/util.php:268
+#: ../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 ""
-"Sauf mention contraire, les droits d'auteur du contenu de ce site "
-"appartiennent aux contributeurs, et ce contenu est disponible sous la "
 
-#: ../actions/showstream.php:209
+#: ../actions/showstream.php:209 actions/showstream.php:219
 msgid "Unsubscribe"
-msgstr "Se désinscrire"
+msgstr ""
 
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: actions/postnotice.php:45 actions/updateprofile.php:46
 msgid "Unsupported OMB version"
-msgstr "Version OMB non-supportée"
-
-#: ../lib/twitterapi.php:248 ../lib/twitterapi.php:269
-#, fuzzy
-msgid "Unsupported type"
-msgstr "Version OMB non-supportée"
-
-#: ../lib/settingsaction.php:100
-msgid "Updates by SMS"
 msgstr ""
 
-#: ../lib/settingsaction.php:103
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:238
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:338
-#, php-format
-msgid "Updates from %1$s on %2$s!"
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this "
+"service."
 msgstr ""
 
-#: ../lib/settingsaction.php:91
-#, fuzzy
-msgid "Upload a new profile image"
-msgstr "Impossible d'enregistrer les informations du nouveau profil"
-
-#: ../actions/register.php:149
+#: ../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 ""
-"Utilisé seulement pour les mises à jour, annonces et récupération de mot "
-"de passe"
 
 #: ../actions/all.php:41 ../actions/avatarbynickname.php:48
 #: ../actions/foaf.php:47 ../actions/replies.php:41
-#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:78
-#: ../actions/twitapistatuses.php:316 ../actions/twitapistatuses.php:622
-#: ../actions/twitapiusers.php:82
+#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
+#: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
+#: ../actions/twitapiusers.php:82 actions/all.php:41
+#: actions/avatarbynickname.php:48 actions/foaf.php:47 actions/replies.php:41
+#: actions/showfavorites.php:41 actions/showstream.php:44
+#: actions/twitapiaccount.php:80 actions/twitapifavorites.php:68
+#: actions/twitapistatuses.php:235 actions/twitapistatuses.php:609
+#: actions/twitapiusers.php:87 lib/mailbox.php:50
 msgid "User has no profile."
-msgstr "L'utilisateur n'a pas de profil."
+msgstr ""
 
-#: ../actions/profilesettings.php:63
-msgid "What timezone are you normally in?"
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
 msgstr ""
 
-#: ../lib/util.php:1142
+#: ../lib/util.php:1159 lib/util.php:1293
 #, php-format
 msgid "What's up, %s?"
-msgstr "Quoi de neuf, %s ?"
+msgstr ""
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:161
+#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: actions/profilesettings.php:87 actions/register.php:189
 msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "D'où venez-vous, par exemple « Ville, État (ou Région), Pays »"
+msgstr ""
 
-#: ../actions/updateprofile.php:128
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong image type for '%s'"
-msgstr "Mauvais type d'image pour '%s'"
+msgstr ""
 
-#: ../actions/updateprofile.php:123
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
 #, php-format
 msgid "Wrong size image at '%s'"
-msgstr "Mauvaise taille d'image pour '%s'"
-
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-msgid "Yes"
 msgstr ""
 
-#: ../actions/deletenotice.php:37
-msgid ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:115
-msgid "You are not friends with the specified user."
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
 msgstr ""
 
-#: ../actions/register.php:131
+#: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
-msgstr "Vous pouvez créer un compte pour commencer à envoyer des messages."
-
-#: ../actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:57
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: actions/finishopenidlogin.php:38 actions/register.php:68
 msgid "You can't register if you don't agree to the license."
-msgstr "Vous ne pouvez pas vous enregistrer si vous n'acceptez pas la licence."
+msgstr ""
 
-#: ../actions/updateprofile.php:63
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
 msgid "You did not send us that profile"
-msgstr "Vous ne nous avez pas envoyé ce profil"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+msgid "You may not delete another user's status."
+msgstr ""
 
-#: ../lib/mail.php:143
+#: ../actions/invite.php:31 actions/invite.php:31
 #, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr ""
+
+#: ../actions/invite.php:103 actions/invite.php:110
 msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
-"Send email to %2$s to post new messages.\n"
-"\n"
-"More email instructions at %3$s.\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s"
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
 msgstr ""
 
 #: ../actions/recoverpassword.php:149
 msgid "You've been identified. Enter a  new password below. "
-msgstr "Vous avez été identifié. Entrez un nouveau mot de passe ci-dessous. "
+msgstr ""
 
 #: ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
-"Votre surnom sur ce serveur, ou votre adresse email définie dans votre "
-"compte."
 
-#: ../lib/util.php:930
+#: ../lib/util.php:943 lib/util.php:992
 msgid "a few seconds ago"
-msgstr "il y a quelques secondes"
+msgstr ""
 
-#: ../lib/util.php:942
+#: ../lib/util.php:955 lib/util.php:1004
 #, php-format
 msgid "about %d days ago"
-msgstr "il y a environ %d jours"
+msgstr ""
 
-#: ../lib/util.php:938
+#: ../lib/util.php:951 lib/util.php:1000
 #, php-format
 msgid "about %d hours ago"
-msgstr "il y a environ %d heures"
+msgstr ""
 
-#: ../lib/util.php:934
+#: ../lib/util.php:947 lib/util.php:996
 #, php-format
 msgid "about %d minutes ago"
-msgstr "il y a environ %d minutes"
+msgstr ""
 
-#: ../lib/util.php:946
+#: ../lib/util.php:959 lib/util.php:1008
 #, php-format
 msgid "about %d months ago"
-msgstr "il y a environ %d mois"
+msgstr ""
 
-#: ../lib/util.php:940
+#: ../lib/util.php:953 lib/util.php:1002
 msgid "about a day ago"
-msgstr "il y a environ un jour"
+msgstr ""
 
-#: ../lib/util.php:932
+#: ../lib/util.php:945 lib/util.php:994
 msgid "about a minute ago"
-msgstr "il y a environ une minute"
+msgstr ""
 
-#: ../lib/util.php:944
+#: ../lib/util.php:957 lib/util.php:1006
 msgid "about a month ago"
-msgstr "il y a environ un mois"
+msgstr ""
 
-#: ../lib/util.php:948
+#: ../lib/util.php:961 lib/util.php:1010
 msgid "about a year ago"
-msgstr "il y a environ une année"
+msgstr ""
 
-#: ../lib/util.php:936
+#: ../lib/util.php:949 lib/util.php:998
 msgid "about an hour ago"
-msgstr "il y a environ une heure"
-
-#: ../actions/showstream.php:423 ../lib/stream.php:128
-msgid "delete"
 msgstr ""
 
 #: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:113
+#: ../lib/stream.php:117 actions/noticesearch.php:136
+#: actions/showstream.php:426 lib/stream.php:84
 msgid "in reply to..."
-msgstr "en réponse à..."
-
-#: ../lib/twitterapi.php:354
-#, fuzzy
-msgid "not a supported data format"
-msgstr "Format de fichier d'image non-supporté."
+msgstr ""
 
 #: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:120
+#: ../lib/stream.php:124 actions/noticesearch.php:143
+#: actions/showstream.php:433 lib/stream.php:91
 msgid "reply"
-msgstr "répondre"
-
-#: ../actions/twitapistatuses.php:692
-#, fuzzy
-msgid "unsupported file type"
-msgstr "Format de fichier d'image non-supporté."
+msgstr ""
 
-#: ../lib/util.php:1292
+#: ../lib/util.php:1309 lib/util.php:1443
 msgid "« After"
-msgstr "« Après"
+msgstr ""
+
+#: actions/deletenotice.php:74 actions/disfavor.php:43
+#: actions/emailsettings.php:127 actions/favor.php:45
+#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
+#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
+#: actions/openidsettings.php:123 actions/profilesettings.php:47
+#: actions/recoverpassword.php:282 actions/register.php:42
+#: actions/remotesubscribe.php:40 actions/smssettings.php:124
+#: actions/subscribe.php:44 actions/twittersettings.php:97
+#: actions/unsubscribe.php:41 actions/userauthorization.php:35
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/disfavor.php:55
+msgid "This notice is not a favorite!"
+msgstr ""
+
+#: actions/disfavor.php:63
+msgid "Could not delete favorite."
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Favor"
+msgstr ""
+
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+
+#: actions/emailsettings.php:95
+msgid "Send me email when someone sends me a private message."
+msgstr ""
+
+#: actions/favor.php:53 actions/twitapifavorites.php:142
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132
+msgid "Could not create favorite."
+msgstr ""
+
+#: actions/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#, php-format
+msgid "%s favorite notices"
+msgstr ""
+
+#: actions/favoritesrss.php:64
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr ""
+
+#: actions/inbox.php:28
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+
+#: actions/invite.php:178
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+msgstr ""
+
+#: actions/login.php:104
+msgid "Automatically login in the future; "
+msgstr ""
+
+#: actions/login.php:122
+msgid "For security reasons, please re-enter your "
+msgstr ""
+
+#: actions/login.php:126
+msgid "Login with your username and password. "
+msgstr ""
+
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+msgid "That's too long. Max message size is 140 chars."
+msgstr ""
+
+#: actions/newmessage.php:65
+msgid "No recipient specified."
+msgstr ""
+
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206
+msgid "You can't send a message to this user."
+msgstr ""
+
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly "
+"instead."
+msgstr ""
+
+#: actions/newmessage.php:108
+msgid "No such user"
+msgstr ""
+
+#: actions/newmessage.php:117
+msgid "New message"
+msgstr ""
+
+#: actions/noticesearch.php:95
+msgid "Notice without matching profile"
+msgstr ""
+
+#: actions/openidsettings.php:28
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr ""
+
+#: actions/openidsettings.php:46
+msgid "If you want to add an OpenID to your account, "
+msgstr ""
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr ""
+
+#: actions/openidsettings.php:87
+msgid "You can remove an OpenID from your account "
+msgstr ""
+
+#: actions/outbox.php:28
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr ""
+
+#: actions/outbox.php:30
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#: actions/outbox.php:53
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+
+#: actions/peoplesearch.php:28
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+msgstr ""
+
+#: actions/profilesettings.php:27
+msgid "You can update your personal profile info here "
+msgstr ""
+
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+msgid "User without matching profile"
+msgstr ""
+
+#: actions/recoverpassword.php:91
+msgid "This confirmation code is too old. "
+msgstr ""
+
+#: actions/recoverpassword.php:141
+msgid "If you've forgotten or lost your"
+msgstr ""
+
+#: actions/recoverpassword.php:154
+msgid "You've been identified. Enter a "
+msgstr ""
+
+#: actions/recoverpassword.php:169
+msgid "Your nickname on this server, "
+msgstr ""
+
+#: actions/recoverpassword.php:271
+msgid "Instructions for recovering your password "
+msgstr ""
+
+#: actions/recoverpassword.php:327
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95
+msgid "Password must be 6 or more characters."
+msgstr ""
+
+#: actions/register.php:216
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
+msgstr ""
+
+#: actions/register.php:227
+msgid "(You should receive a message by email momentarily, with "
+msgstr ""
+
+#: actions/remotesubscribe.php:51
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
+msgstr ""
+
+#: actions/showfavorites.php:61
+#, php-format
+msgid "Feed for favorites of %s"
+msgstr ""
+
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+msgid "Could not retrieve favorite notices."
+msgstr ""
+
+#: actions/showmessage.php:33
+msgid "No such message."
+msgstr ""
+
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
+msgstr ""
+
+#: actions/showmessage.php:61
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr ""
+
+#: actions/showmessage.php:66
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr ""
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr ""
+
+#: actions/smssettings.php:312
+#, php-format
+msgid "Mobile carrier for your phone. "
+msgstr ""
+
+#: actions/twitapidirect_messages.php:76
+#, php-format
+msgid "Direct messages to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:77
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:81
+msgid "Direct Messages You've Sent"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:82
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:128
+msgid "No message text!"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:138
+msgid "Recipient user not found."
+msgstr ""
+
+#: actions/twitapidirect_messages.php:141
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
+#: actions/twitapifavorites.php:92
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr ""
+
+#: actions/twitapifavorites.php:95
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr ""
+
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#, php-format
+msgid "%s added your notice as a favorite"
+msgstr ""
+
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+msgstr ""
+
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+msgstr ""
+
+#: actions/twittersettings.php:41
+msgid "Twitter settings"
+msgstr ""
+
+#: actions/twittersettings.php:48
+msgid "Twitter Account"
+msgstr ""
+
+#: actions/twittersettings.php:56
+msgid "Current verified Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr ""
+
+#: actions/twittersettings.php:65
+msgid "No spaces, please."
+msgstr ""
+
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr ""
+
+#: actions/twittersettings.php:72
+msgid "Automatically send my notices to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:75
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:78
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+
+#: actions/twittersettings.php:128
+msgid "Could not verify your Twitter credentials!"
+msgstr ""
+
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+msgid "Unable to save your Twitter settings!"
+msgstr ""
+
+#: actions/twittersettings.php:174
+msgid "Twitter settings saved."
+msgstr ""
+
+#: actions/twittersettings.php:192
+msgid "That is not your Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+msgid "Couldn't remove Twitter user."
+msgstr ""
+
+#: actions/twittersettings.php:212
+msgid "Twitter account removed."
+msgstr ""
+
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+msgid "Couldn't save Twitter preferences."
+msgstr ""
+
+#: actions/twittersettings.php:245
+msgid "Twitter preferences saved."
+msgstr ""
+
+#: actions/userauthorization.php:84
+msgid "Please check these details to make sure "
+msgstr ""
+
+#: actions/userauthorization.php:324
+msgid "The subscription has been authorized, but no "
+msgstr ""
+
+#: actions/userauthorization.php:334
+msgid "The subscription has been rejected, but no "
+msgstr ""
+
+#: classes/Channel.php:113
+msgid "Command results"
+msgstr ""
+
+#: classes/Channel.php:148
+msgid "Command complete"
+msgstr ""
+
+#: classes/Channel.php:158
+msgid "Command failed"
+msgstr ""
+
+#: classes/Command.php:39
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: classes/Command.php:96
+#, php-format
+msgid "Subscriptions: %1$s\n"
+msgstr ""
+
+#: classes/Command.php:125 classes/Command.php:242
+msgid "User has no last notice"
+msgstr ""
+
+#: classes/Command.php:146
+msgid "Notice marked as fave."
+msgstr ""
+
+#: classes/Command.php:166
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr ""
+
+#: classes/Command.php:169
+#, php-format
+msgid "Fullname: %s"
+msgstr ""
+
+#: classes/Command.php:172
+#, php-format
+msgid "Location: %s"
+msgstr ""
+
+#: classes/Command.php:175
+#, php-format
+msgid "Homepage: %s"
+msgstr ""
+
+#: classes/Command.php:178
+#, php-format
+msgid "About: %s"
+msgstr ""
+
+#: classes/Command.php:200
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
+
+#: classes/Command.php:214
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
+
+#: classes/Command.php:216
+msgid "Error sending direct message."
+msgstr ""
+
+#: classes/Command.php:263
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: classes/Command.php:270
+#, php-format
+msgid "Subscribed to %s"
+msgstr ""
+
+#: classes/Command.php:288
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
+
+#: classes/Command.php:295
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr ""
+
+#: classes/Command.php:310 classes/Command.php:330
+msgid "Command not yet implemented."
+msgstr ""
+
+#: classes/Command.php:313
+msgid "Notification off."
+msgstr ""
+
+#: classes/Command.php:315
+msgid "Can't turn off notification."
+msgstr ""
+
+#: classes/Command.php:333
+msgid "Notification on."
+msgstr ""
+
+#: classes/Command.php:335
+msgid "Can't turn on notification."
+msgstr ""
+
+#: classes/Command.php:344
+msgid "Commands:\n"
+msgstr ""
+
+#: classes/Message.php:53
+msgid "Could not insert message."
+msgstr ""
+
+#: classes/Message.php:63
+msgid "Could not update message with new URI."
+msgstr ""
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr ""
+
+#: lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:249
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:253
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+msgstr ""
+
+#: lib/mailbox.php:43
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/openid.php:195
+msgid "This form should automatically submit itself. "
+msgstr ""
+
+#: lib/personal.php:65
+msgid "Favorites"
+msgstr ""
+
+#: lib/personal.php:66
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
+#: lib/personal.php:66
+msgid "User"
+msgstr ""
+
+#: lib/personal.php:75
+msgid "Inbox"
+msgstr ""
+
+#: lib/personal.php:76
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personal.php:80
+msgid "Outbox"
+msgstr ""
+
+#: lib/personal.php:81
+msgid "Your sent messages"
+msgstr ""
+
+#: lib/settingsaction.php:99
+msgid "Twitter"
+msgstr ""
+
+#: lib/settingsaction.php:100
+msgid "Twitter integration options"
+msgstr ""
+
+#: lib/util.php:1718
+msgid "To"
+msgstr ""
+
+#: scripts/maildaemon.php:45
+msgid "Could not parse message."
+msgstr ""
diff --git a/locale/he_IL/LC_MESSAGES/laconica.po b/locale/he_IL/LC_MESSAGES/laconica.po
index 59a449b67..b30da8437 100644
--- a/locale/he_IL/LC_MESSAGES/laconica.po
+++ b/locale/he_IL/LC_MESSAGES/laconica.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#
 # Hebrew translation for Laconica
 # תרגו� לעברית של ל�קוניה
 # Copyright (C) 2008 COPYRIGHT HOLDER
@@ -6,9 +7,16 @@
 # קובץ זה מופץ תחת רשיון זהה לזה של החבילה ל�קוניקה
 # Hezy Amiel חזי עמי�ל <open@hezyamiel.com>, 2008.
 #
+# #-#-#-#-#  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.
+#
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-07-14 21:07+1200\n"
@@ -18,6 +26,16 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: ../actions/noticesearchrss.php:64
 #, php-format
@@ -25,6 +43,8 @@ msgid " Search Stream for \"%s\""
 msgstr "חיפוש ברצף �חרי \"%s\""
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
+#: ../actions/register.php:191 actions/finishopenidlogin.php:88
+#: actions/register.php:205
 msgid ""
 " except this private data: password, email address, IM address, phone "
 "number."
@@ -262,7 +282,7 @@ msgstr "שמירת מידע הפרופיל החדש נכשלה"
 
 #: ../actions/profilesettings.php:146
 msgid "Couldn't confirm email."
-msgstr "נכשל �ישור הדו�"ל."
+msgstr "ל� ניתן ל�שר �ת הדו�"ל."
 
 #: ../actions/finishremotesubscribe.php:99
 msgid "Couldn't convert request tokens to access tokens."
@@ -273,6 +293,10 @@ msgid "Couldn't create subscription."
 msgstr "יצירת המנוי נכשלה."
 
 #: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
+#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
+#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#: actions/confirmaddress.php:84 actions/emailsettings.php:252
+#: actions/imsettings.php:226 actions/smssettings.php:249
 msgid "Couldn't delete email confirmation."
 msgstr "מחיקת �ישור הדו�"ל נכשלה."
 
@@ -334,7 +358,9 @@ msgstr "שגי�ת מסד נתוני� בהכנסת התגובה: %s"
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "ת�ר �ת עצמך ו�ת נוש�י העניין שלך ב-140 �ותיות"
 
-#: ../actions/register.php:181
+#: ../actions/register.php:181 ../actions/register.php:158
+#: ../actions/register.php:161 ../lib/settingsaction.php:87
+#: actions/register.php:172 actions/register.php:175 lib/settingsaction.php:87
 msgid "Email"
 msgstr "דו�"ל"
 
@@ -343,14 +369,16 @@ msgid "Email address"
 msgstr "כתובת דו�"ל"
 
 #: ../actions/profilesettings.php:102 ../actions/register.php:63
+#: ../actions/register.php:73 actions/register.php:80
 msgid "Email address already exists."
 msgstr "כתובת דו�"ל זו כבר קיימת."
 
-#: ../lib/mail.php:82
+#: ../lib/mail.php:82 ../lib/mail.php:90 lib/mail.php:90
 msgid "Email address confirmation"
 msgstr "�ישור כתובת הדו�"ל"
 
-#: ../actions/recoverpassword.php:176
+#: ../actions/recoverpassword.php:176 ../actions/recoverpassword.php:191
+#: actions/recoverpassword.php:197
 msgid "Enter a nickname or email address."
 msgstr "הכנס כינוי �ו כתובת דו�"ל."
 
@@ -511,7 +539,7 @@ msgstr "הסיסמה הישנה ל� נכונה"
 msgid "Incorrect username or password."
 msgstr "ש� משתמש �ו סיסמה ל� נכוני�."
 
-#: ../actions/recoverpassword.php:226
+#: ../actions/recoverpassword.php:226 ../actions/recoverpassword.php:265
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -678,7 +706,8 @@ msgstr "כינוי זה �סור."
 msgid "Nickname of the user you want to follow"
 msgstr "כינויו של המשתמש �חריו �תה רוצה לעקוב"
 
-#: ../actions/recoverpassword.php:147
+#: ../actions/recoverpassword.php:147 ../actions/recoverpassword.php:162
+#: actions/recoverpassword.php:167
 msgid "Nickname or email"
 msgstr "כינוי �ו דו�"ל"
 
@@ -718,9 +747,10 @@ msgstr "�ין �ישור ממתין שניתן לבטל."
 msgid "No profile URL returned by server."
 msgstr "השרת ל� החזיר כתובת פרופיל"
 
-#: ../actions/recoverpassword.php:189
+#: ../actions/recoverpassword.php:189 ../actions/recoverpassword.php:226
+#: actions/recoverpassword.php:232
 msgid "No registered email address for that user."
-msgstr "למשתמש זה �ין דו�"ל רשו�."
+msgstr "�ין דו�"ל רשו� עבור משתמש זה."
 
 #: ../actions/userauthorization.php:48
 msgid "No request found!"
@@ -781,6 +811,7 @@ msgid "Not a valid OpenID."
 msgstr "ל� עומד בכללי� ל-OpenID."
 
 #: ../actions/profilesettings.php:75 ../actions/register.php:53
+#: ../actions/register.php:63 actions/register.php:70
 msgid "Not a valid email address."
 msgstr "כתובת דו�"ל ל� חוקית."
 
@@ -1226,9 +1257,7 @@ msgstr "קוד �ישור זה ישן מידי. �נ� התחל מחדש."
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
-msgstr ""
-"טופס �מור לשלוח �ת עצמו �וטומטית. �� ל�, "
-"לחץ על הכפתור "שלח" כדי לעבור לספק ה-OpenID שלך."
+msgstr "טופס �מור לשלוח �ת עצמו �וטומטית. �� ל�, "
 
 #: ../actions/finishopenidlogin.php:56
 #, php-format
@@ -1281,8 +1310,7 @@ msgstr "גירסה ל� מוכרת של פרוטוקול OMB"
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
-msgstr ""
-"�� ל� פורט �חרת, כל הזכויות על התוכן של �תר "
+msgstr "�� ל� פורט �חרת, כל הזכויות על התוכן של �תר "
 
 #: ../actions/confirmaddress.php:48
 #, php-format
@@ -1410,7 +1438,7 @@ msgstr "זוהית. הכנס סיסמה חדשה למטה."
 msgid "Your OpenID URL"
 msgstr "כתובת ה-OpenID שלך"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:149 ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
 msgstr "כינויך על שרת זה, �ו כתובת הדו�"ל הרשומה שלך."
 
@@ -1484,3 +1512,1308 @@ msgstr "זהה לסיסמה למעלה"
 #: ../lib/util.php:1127
 msgid "« After"
 msgstr "<< �חרי"
+
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+msgid " from "
+msgstr ""
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
+
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#, php-format
+msgid "%s public timeline"
+msgstr ""
+
+#: ../lib/mail.php:206 lib/mail.php:212
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/register.php:154 actions/register.php:168
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55
+msgid "API method not found!"
+msgstr ""
+
+#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
+#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
+#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
+#: ../actions/twitapidirect_messages.php:49
+#: ../actions/twitapidirect_messages.php:56
+#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
+#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
+#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
+#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
+#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
+#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
+#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
+#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
+#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
+#: actions/twitapistatuses.php:690
+msgid "API method under construction."
+msgstr ""
+
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
+
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for "
+"non-humans)"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
+
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr ""
+
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+msgid "Change email handling"
+msgstr ""
+
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+msgid "Change your profile settings"
+msgstr ""
+
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+msgid "Could not follow user: User not found."
+msgstr ""
+
+#: ../lib/subs.php:54 lib/subs.php:61
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: ../lib/subs.php:46 lib/subs.php:46
+msgid "Could not subscribe."
+msgstr ""
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+msgid "Couldn't update user record."
+msgstr ""
+
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr ""
+
+#: ../classes/Notice.php:72 classes/Notice.php:86
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr ""
+
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr ""
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr ""
+
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: ../actions/tag.php:55 actions/tag.php:55
+#, php-format
+msgid "Feed for tag %s"
+msgstr ""
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr ""
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr ""
+
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+msgid "I want to post notices by email."
+msgstr ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+msgid "IM"
+msgstr ""
+
+#: ../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
+msgid "Incoming email"
+msgstr ""
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+msgid "Incoming email address removed."
+msgstr ""
+
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Language"
+msgstr "שפה"
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+msgid "Language is too long (max 50 chars)."
+msgstr ""
+
+#: ../actions/register.php:166 actions/register.php:180
+msgid "Longer name, preferably your \"real\" name"
+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 ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr "חדש"
+
+#: ../lib/mail.php:144 lib/mail.php:144
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+msgid "New incoming email address added."
+msgstr ""
+
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+msgid "No"
+msgstr "ל�"
+
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr ""
+
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+msgid "No email address."
+msgstr ""
+
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+msgid "No incoming email address."
+msgstr ""
+
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+msgid "No status with that ID found."
+msgstr ""
+
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+msgid "Not a registered user."
+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
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+msgid "Not found"
+msgstr "ל� נמצ�"
+
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr ""
+
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
+
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr "�נשי�"
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr "חיפוש �נשי�"
+
+#: ../actions/invite.php:133 actions/invite.php:141
+msgid "Personal message"
+msgstr ""
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Preferred language"
+msgstr ""
+
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/register.php:28 actions/register.php:28
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+msgid "Registration successful"
+msgstr ""
+
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+msgid "SMS"
+msgstr "סמס"
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/register.php:156 actions/register.php:170
+msgid "Same as password above. Required."
+msgstr ""
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr ""
+
+#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
+#: actions/emailsettings.php:74 actions/smssettings.php:82
+msgid "Send email to this address to post new notices."
+msgstr ""
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../actions/tag.php:60 actions/tag.php:60
+msgid "Showing most popular tags from the last week"
+msgstr ""
+
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317
+msgid "Tags"
+msgstr ""
+
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
+msgid "Text"
+msgstr "טקסט"
+
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+msgid "That is not your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+msgid "That is not your phone number."
+msgstr ""
+
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/invite.php:89 actions/invite.php:96
+msgid ""
+"These people are already users and you were automatically subscribed to "
+"them:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511
+msgid "This method requires a POST or 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
+msgid "This method requires a POST."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+msgid "Timezone not selected."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+msgid "Two user ids or screen_names must be supplied."
+msgstr ""
+
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this "
+"service."
+msgstr ""
+
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+msgid "Yes"
+msgstr "כן"
+
+#: ../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 ""
+
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+msgid "You are not friends with the specified user."
+msgstr ""
+
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr ""
+
+#: ../actions/invite.php:103 actions/invite.php:110
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
+msgstr ""
+
+#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99
+msgid "delete"
+msgstr "מחק"
+
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+msgid "unsupported file type"
+msgstr ""
+
+#: actions/deletenotice.php:74 actions/disfavor.php:43
+#: actions/emailsettings.php:127 actions/favor.php:45
+#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
+#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
+#: actions/openidsettings.php:123 actions/profilesettings.php:47
+#: actions/recoverpassword.php:282 actions/register.php:42
+#: actions/remotesubscribe.php:40 actions/smssettings.php:124
+#: actions/subscribe.php:44 actions/twittersettings.php:97
+#: actions/unsubscribe.php:41 actions/userauthorization.php:35
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/disfavor.php:55
+msgid "This notice is not a favorite!"
+msgstr ""
+
+#: actions/disfavor.php:63
+msgid "Could not delete favorite."
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Favor"
+msgstr ""
+
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+
+#: actions/emailsettings.php:95
+msgid "Send me email when someone sends me a private message."
+msgstr ""
+
+#: actions/favor.php:53 actions/twitapifavorites.php:142
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132
+msgid "Could not create favorite."
+msgstr ""
+
+#: actions/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#, php-format
+msgid "%s favorite notices"
+msgstr ""
+
+#: actions/favoritesrss.php:64
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr ""
+
+#: actions/inbox.php:28
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+
+#: actions/invite.php:178
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+msgstr ""
+
+#: actions/login.php:104
+msgid "Automatically login in the future; "
+msgstr ""
+
+#: actions/login.php:122
+msgid "For security reasons, please re-enter your "
+msgstr ""
+
+#: actions/login.php:126
+msgid "Login with your username and password. "
+msgstr ""
+
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+msgid "That's too long. Max message size is 140 chars."
+msgstr ""
+
+#: actions/newmessage.php:65
+msgid "No recipient specified."
+msgstr ""
+
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206
+msgid "You can't send a message to this user."
+msgstr ""
+
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly "
+"instead."
+msgstr ""
+
+#: actions/newmessage.php:108
+msgid "No such user"
+msgstr ""
+
+#: actions/newmessage.php:117
+msgid "New message"
+msgstr "הודעה חדשה"
+
+#: actions/noticesearch.php:95
+msgid "Notice without matching profile"
+msgstr ""
+
+#: actions/openidsettings.php:28
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr ""
+
+#: actions/openidsettings.php:46
+msgid "If you want to add an OpenID to your account, "
+msgstr ""
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr ""
+
+#: actions/openidsettings.php:87
+msgid "You can remove an OpenID from your account "
+msgstr ""
+
+#: actions/outbox.php:28
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr ""
+
+#: actions/outbox.php:30
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#: actions/outbox.php:53
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+
+#: actions/peoplesearch.php:28
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+msgstr ""
+
+#: actions/profilesettings.php:27
+msgid "You can update your personal profile info here "
+msgstr ""
+
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+msgid "User without matching profile"
+msgstr ""
+
+#: actions/recoverpassword.php:91
+msgid "This confirmation code is too old. "
+msgstr ""
+
+#: actions/recoverpassword.php:141
+msgid "If you've forgotten or lost your"
+msgstr ""
+
+#: actions/recoverpassword.php:154
+msgid "You've been identified. Enter a "
+msgstr ""
+
+#: actions/recoverpassword.php:169
+msgid "Your nickname on this server, "
+msgstr ""
+
+#: actions/recoverpassword.php:271
+msgid "Instructions for recovering your password "
+msgstr ""
+
+#: actions/recoverpassword.php:327
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95
+msgid "Password must be 6 or more characters."
+msgstr ""
+
+#: actions/register.php:216
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
+msgstr ""
+
+#: actions/register.php:227
+msgid "(You should receive a message by email momentarily, with "
+msgstr ""
+
+#: actions/remotesubscribe.php:51
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
+msgstr ""
+
+#: actions/showfavorites.php:61
+#, php-format
+msgid "Feed for favorites of %s"
+msgstr ""
+
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+msgid "Could not retrieve favorite notices."
+msgstr ""
+
+#: actions/showmessage.php:33
+msgid "No such message."
+msgstr ""
+
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
+msgstr ""
+
+#: actions/showmessage.php:61
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr ""
+
+#: actions/showmessage.php:66
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr ""
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr ""
+
+#: actions/smssettings.php:312
+#, php-format
+msgid "Mobile carrier for your phone. "
+msgstr ""
+
+#: actions/twitapidirect_messages.php:76
+#, php-format
+msgid "Direct messages to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:77
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:81
+msgid "Direct Messages You've Sent"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:82
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:128
+msgid "No message text!"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:138
+msgid "Recipient user not found."
+msgstr ""
+
+#: actions/twitapidirect_messages.php:141
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
+#: actions/twitapifavorites.php:92
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr ""
+
+#: actions/twitapifavorites.php:95
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr ""
+
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#, php-format
+msgid "%s added your notice as a favorite"
+msgstr ""
+
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+msgstr ""
+
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+msgstr ""
+
+#: actions/twittersettings.php:41
+msgid "Twitter settings"
+msgstr ""
+
+#: actions/twittersettings.php:48
+msgid "Twitter Account"
+msgstr ""
+
+#: actions/twittersettings.php:56
+msgid "Current verified Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr ""
+
+#: actions/twittersettings.php:65
+msgid "No spaces, please."
+msgstr ""
+
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr ""
+
+#: actions/twittersettings.php:72
+msgid "Automatically send my notices to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:75
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:78
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+
+#: actions/twittersettings.php:128
+msgid "Could not verify your Twitter credentials!"
+msgstr ""
+
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+msgid "Unable to save your Twitter settings!"
+msgstr ""
+
+#: actions/twittersettings.php:174
+msgid "Twitter settings saved."
+msgstr ""
+
+#: actions/twittersettings.php:192
+msgid "That is not your Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+msgid "Couldn't remove Twitter user."
+msgstr ""
+
+#: actions/twittersettings.php:212
+msgid "Twitter account removed."
+msgstr ""
+
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+msgid "Couldn't save Twitter preferences."
+msgstr ""
+
+#: actions/twittersettings.php:245
+msgid "Twitter preferences saved."
+msgstr ""
+
+#: actions/userauthorization.php:84
+msgid "Please check these details to make sure "
+msgstr ""
+
+#: actions/userauthorization.php:324
+msgid "The subscription has been authorized, but no "
+msgstr ""
+
+#: actions/userauthorization.php:334
+msgid "The subscription has been rejected, but no "
+msgstr ""
+
+#: classes/Channel.php:113
+msgid "Command results"
+msgstr ""
+
+#: classes/Channel.php:148
+msgid "Command complete"
+msgstr ""
+
+#: classes/Channel.php:158
+msgid "Command failed"
+msgstr ""
+
+#: classes/Command.php:39
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: classes/Command.php:96
+#, php-format
+msgid "Subscriptions: %1$s\n"
+msgstr ""
+
+#: classes/Command.php:125 classes/Command.php:242
+msgid "User has no last notice"
+msgstr ""
+
+#: classes/Command.php:146
+msgid "Notice marked as fave."
+msgstr ""
+
+#: classes/Command.php:166
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr ""
+
+#: classes/Command.php:169
+#, php-format
+msgid "Fullname: %s"
+msgstr ""
+
+#: classes/Command.php:172
+#, php-format
+msgid "Location: %s"
+msgstr ""
+
+#: classes/Command.php:175
+#, php-format
+msgid "Homepage: %s"
+msgstr ""
+
+#: classes/Command.php:178
+#, php-format
+msgid "About: %s"
+msgstr "�ודות: %s"
+
+#: classes/Command.php:200
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
+
+#: classes/Command.php:214
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
+
+#: classes/Command.php:216
+msgid "Error sending direct message."
+msgstr ""
+
+#: classes/Command.php:263
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: classes/Command.php:270
+#, php-format
+msgid "Subscribed to %s"
+msgstr ""
+
+#: classes/Command.php:288
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
+
+#: classes/Command.php:295
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr ""
+
+#: classes/Command.php:310 classes/Command.php:330
+msgid "Command not yet implemented."
+msgstr ""
+
+#: classes/Command.php:313
+msgid "Notification off."
+msgstr ""
+
+#: classes/Command.php:315
+msgid "Can't turn off notification."
+msgstr ""
+
+#: classes/Command.php:333
+msgid "Notification on."
+msgstr ""
+
+#: classes/Command.php:335
+msgid "Can't turn on notification."
+msgstr ""
+
+#: classes/Command.php:344
+msgid "Commands:\n"
+msgstr ""
+
+#: classes/Message.php:53
+msgid "Could not insert message."
+msgstr ""
+
+#: classes/Message.php:63
+msgid "Could not update message with new URI."
+msgstr ""
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr ""
+
+#: lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:249
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:253
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+msgstr ""
+
+#: lib/mailbox.php:43
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/openid.php:195
+msgid "This form should automatically submit itself. "
+msgstr ""
+
+#: lib/personal.php:65
+msgid "Favorites"
+msgstr "מועדפי�"
+
+#: lib/personal.php:66
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
+#: lib/personal.php:66
+msgid "User"
+msgstr "מתשמש"
+
+#: lib/personal.php:75
+msgid "Inbox"
+msgstr ""
+
+#: lib/personal.php:76
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personal.php:80
+msgid "Outbox"
+msgstr ""
+
+#: lib/personal.php:81
+msgid "Your sent messages"
+msgstr ""
+
+#: lib/settingsaction.php:99
+msgid "Twitter"
+msgstr ""
+
+#: lib/settingsaction.php:100
+msgid "Twitter integration options"
+msgstr ""
+
+#: lib/util.php:1718
+msgid "To"
+msgstr "�ל"
+
+#: scripts/maildaemon.php:45
+msgid "Could not parse message."
+msgstr ""
diff --git a/locale/it_IT/LC_MESSAGES/laconica.mo b/locale/it_IT/LC_MESSAGES/laconica.mo
index b85df2bf1..e32264533 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 c55507940..83d13b13e 100644
--- a/locale/it_IT/LC_MESSAGES/laconica.po
+++ b/locale/it_IT/LC_MESSAGES/laconica.po
@@ -1,17 +1,17 @@
-# 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.
+# Italian translation of laconica
+# Copyright (C) 2008 THE laconica'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the laconica package.
+# Milo Casagrande <milo@ubuntu.com>, 2008
+#
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: laconica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-27 14:57-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2008-07-14 21:07+1200\n"
+"PO-Revision-Date: 2008-12-24 17:46+0100\n"
+"Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
+"Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,66 +19,22 @@ msgstr ""
 #: ../actions/noticesearchrss.php:64
 #, php-format
 msgid " Search Stream for \"%s\""
-msgstr "Cerca il Flusso per \"%s\""
+msgstr "Ricerca \"%s\" nel flusso"
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
 msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr ""
-"ad eccezione di questi dati personali: password, indirizzo email, indirizzo "
-"IM, numero di telefono."
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-msgid " from "
-msgstr ""
-
-#: ../actions/twitapistatuses.php:478
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/invite.php:168
-#, fuzzy, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s adesso sta seguendo i tuoi annunci su %2$s."
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
+" except this private data: password, email address, IM address, phone "
+"number."
 msgstr ""
+"a eccezione di questi dati personali: password, indirizzo email, indirizzo "
+"messaggistica istantanea, numero di telefono."
 
-#: ../lib/mail.php:124
+#: ../actions/subscribe.php:84
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s adesso sta seguendo i tuoi annunci su %2$s."
+msgstr "%1$s sta ora seguendo i tuoi messaggi su %2$s."
 
-#: ../lib/mail.php:126
+#: ../actions/subscribe.php:86
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -88,161 +44,85 @@ msgid ""
 "Faithfully yours,\n"
 "%4$s.\n"
 msgstr ""
-"%1$s adesso sta seguendo i tuoi annunci su %2$s.\n"
+"%1$s sta ora seguendo i tuoi messaggi su %2$s.\n"
 "\n"
-"\t%3$sDistinti saluti,\n"
+"\t%3$s\n"
+"\n"
+"Cordiali saluti,\n"
 "%4$s.\n"
 
-#: ../actions/twitapistatuses.php:482
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-
 #: ../actions/shownotice.php:45
 #, php-format
 msgid "%1$s's status on %2$s"
-msgstr "Stato di %1$s's su %2$s"
+msgstr "Stato di %1$s su %2$s"
 
-#: ../actions/invite.php:84 ../actions/invite.php:92
+#  Solo una prova, se non sta bene si ripristina la versione vecchia, giusto per avere l'interfaccia il più tradotta possibile
+#: ../actions/publicrss.php:60 ../actions/publicrss.php:62
+#: actions/publicrss.php:48
 #, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/publicrss.php:62
-#, fuzzy, php-format
 msgid "%s Public Stream"
-msgstr "%s Flusso Pubblico"
+msgstr "Attività pubblica di %s"
 
-#: ../actions/all.php:47 ../actions/allrss.php:60
-#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51
+#: ../actions/all.php:47 ../actions/allrss.php:70 ../lib/stream.php:45
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amici"
 
-#: ../actions/twitapistatuses.php:49
-#, fuzzy, php-format
-msgid "%s public timeline"
-msgstr "Timeline pubblica"
-
-#: ../lib/mail.php:206
-#, fuzzy, php-format
-msgid "%s status"
-msgstr "Stato di %1$s's su %2$s"
-
-#: ../actions/twitapistatuses.php:338
-#, fuzzy, php-format
-msgid "%s timeline"
-msgstr "Timeline pubblica"
-
-#: ../actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:213
-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:233
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** is a microblogging service brought to you by "
+"[%%site.broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
-"**%%site.name%%** è un servizio di microblogging offertovi da [%%site."
-"broughtby%%](%%site.broughtbyurl%%)."
+"**%%site.name%%** è un servizio di micro-blog offerto da "
+"[%%site.broughtby%%](%%site.broughtbyurl%%)."
 
-#: ../lib/util.php:259
+#: ../lib/util.php:235
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** è un servizio di microblogging."
+msgstr "**%%site.name%%** è un servizio di micro-blog."
 
-#: ../lib/util.php:274
+#: ../lib/util.php:250
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ""
-". I contributori devono essere indicati col nome completo o con lo username."
+". I collaboratori devono essere indicati col loro nome completo o "
+"soprannome."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
+#: ../actions/register.php:176
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 lettere o numeri, senza spazi o simboli di punteggiatura"
-
-#: ../actions/register.php:152
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64 lettere o numeri, senza spazi o simboli di punteggiatura"
+msgstr ""
+"1-64 lettere minuscole o numeri, senza spazi o simboli di "
+"punteggiatura"
 
-#: ../actions/password.php:42
+#: ../actions/password.php:42 ../actions/register.php:178
 msgid "6 or more characters"
 msgstr "6 o più caratteri"
 
-#: ../actions/recoverpassword.php:180
+#  messa al femminile... dovrebbe essere la password
+#: ../actions/recoverpassword.php:165
 msgid "6 or more characters, and don't forget it!"
-msgstr "6 o più caratteri, e non dimenticarli!"
-
-#: ../actions/register.php:154
-#, fuzzy
-msgid "6 or more characters. Required."
-msgstr "6 o più caratteri"
+msgstr "6 o più caratteri, e non dimenticarla!"
 
-#: ../actions/imsettings.php:197
+#: ../actions/imsettings.php:188
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
-msgstr ""
-"Un codice di conferma è stato inviato all'indirizzo IM che hai aggiunto. "
-"Devi accettare che %s ti invii messaggi."
-
-#: ../actions/emailsettings.php:213
-#, fuzzy
-msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
+"A confirmation code was sent to the IM address you added. You must approve "
+"%s for sending messages to you."
 msgstr ""
-"Un codice di conferma è stato inviato all'indirizzo IM che hai aggiunto. "
-"Devi accettare che %s ti invii messaggi."
+"Un codice di conferma è stato inviato all'indirizzo di messaggistica "
+"istantanea che hai aggiunto. Devi approvare %s affinché ti invii "
+"messaggi."
 
-#: ../actions/smssettings.php:216
-#, fuzzy
-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 codice di conferma è stato inviato all'indirizzo IM che hai aggiunto. "
-"Devi accettare che %s ti invii messaggi."
-
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122
-msgid "API method not found!"
-msgstr ""
-
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-msgid "API method under construction."
-msgstr ""
-
-#: ../lib/util.php:324
-#, fuzzy
+#: ../lib/util.php:296 ../lib/util.php:324 lib/util.php:340
 msgid "About"
-msgstr "About"
+msgstr "Informazioni"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/userauthorization.php:118
 msgid "Accept"
 msgstr "Accetta"
 
-#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
-#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
 msgid "Add"
 msgstr "Aggiungi"
 
@@ -250,25 +130,15 @@ msgstr "Aggiungi"
 msgid "Add OpenID"
 msgstr "Aggiungi OpenID"
 
-#: ../lib/settingsaction.php:97
-#, fuzzy
-msgid "Add or remove OpenIDs"
-msgstr "Rimuovi OpenID"
-
-#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39
+#: ../actions/imsettings.php:39
 msgid "Address"
 msgstr "Indirizzo"
 
-#: ../actions/invite.php:131
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../actions/showstream.php:273
+#: ../actions/showstream.php:254
 msgid "All subscriptions"
-msgstr "Tutte le sottoscrizioni"
+msgstr "Tutti gli abbonamenti"
 
-#: ../actions/publicrss.php:64
+#: ../actions/publicrss.php:62
 #, php-format
 msgid "All updates for %s"
 msgstr "Tutti gli aggiornamenti di %s"
@@ -278,39 +148,30 @@ msgstr "Tutti gli aggiornamenti di %s"
 msgid "All updates matching search term \"%s\""
 msgstr "Tutti gli aggiornamenti corrispondenti al termine di ricerca \"%s\""
 
-#: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
-#: ../actions/openidlogin.php:29 ../actions/register.php:30
+#: ../actions/finishopenidlogin.php:29 ../actions/login.php:27
+#: ../actions/openidlogin.php:29 ../actions/register.php:28
 msgid "Already logged in."
-msgstr "Login già effettuato."
+msgstr "Accesso già effettuato."
 
-#: ../lib/subs.php:42
+#: ../actions/subscribe.php:48
 msgid "Already subscribed!."
-msgstr "Già sottoscritto!"
+msgstr "Già abbonato!"
 
-#: ../actions/deletenotice.php:54
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/userauthorization.php:77
+#: ../actions/userauthorization.php:76
 msgid "Authorize subscription"
-msgstr "Autorizza sottoscrizione"
+msgstr "Autorizza abbonamento"
 
-#: ../actions/login.php:104 ../actions/register.php:178
+#: ../actions/login.php:100 ../actions/register.php:184
 msgid "Automatically login in the future; not for shared computers!"
-msgstr "Login automatico in futuro; non per computer condivisi!"
+msgstr "Accedi automaticamente in futuro; non per computer condivisi!"
 
-#: ../actions/profilesettings.php:65
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr ""
-
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: ../actions/avatar.php:32
 msgid "Avatar"
-msgstr "Avatar"
+msgstr "Immagine"
 
 #: ../actions/avatar.php:113
 msgid "Avatar updated."
-msgstr "Avatar aggiornato."
+msgstr "Immagine aggiornata."
 
 #: ../actions/imsettings.php:55
 #, php-format
@@ -318,240 +179,142 @@ 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 ""
-"In attesa di conferma per questo indirizzo. Controlla il tuo account Jabber/"
-"GTalk per un messaggio con ulteriori istruzioni. (Hai aggiunto %s alla tua "
-"lista di contatti?)"
-
-#: ../actions/emailsettings.php:54
-#, fuzzy
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-msgstr ""
-"In attesa di conferma per questo indirizzo. Controlla il tuo account Jabber/"
-"GTalk per un messaggio con ulteriori istruzioni. (Hai aggiunto %s alla tua "
-"lista di contatti?)"
-
-#: ../actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
+"In attesa di conferma per questo indirizzo. Controlla il tuo account "
+"Jabber/GTalk per un messaggio con ulteriori istruzioni (hai aggiunto %s al "
+"tuo elenco contatti?)."
 
-#: ../lib/util.php:1318
+#: ../lib/util.php:1136
 msgid "Before »"
-msgstr "Precedente »"
+msgstr "Precedenti »"
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: ../actions/profilesettings.php:52
 msgid "Bio"
 msgstr "Biografia"
 
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103
+#: ../actions/profilesettings.php:93 ../actions/updateprofile.php:102
 msgid "Bio is too long (max 140 chars)."
 msgstr "La biografia è troppo lunga (max 140 caratteri)."
 
-#: ../lib/deleteaction.php:41
-#, fuzzy
-msgid "Can't delete this notice."
-msgstr "Impossibile cancellare l'email di conferma."
-
-#: ../actions/updateprofile.php:119
-#, fuzzy, php-format
+#: ../actions/updateprofile.php:118 ../actions/updateprofile.php:119
+#: actions/updateprofile.php:120
+#, php-format
 msgid "Can't read avatar URL '%s'"
-msgstr "Non posso leggere l'URL '%s' del avatar"
+msgstr "Impossibile leggere l'URL \"%s\" dell'immagine"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
+#: ../actions/password.php:85 ../actions/recoverpassword.php:261
 msgid "Can't save new password."
-msgstr "Non posso salvare la nuova password."
+msgstr "Impossibile salvare la nuova password."
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62
+#: ../actions/imsettings.php:59
 msgid "Cancel"
-msgstr "Cancella"
+msgstr "Annulla"
 
 #: ../lib/openid.php:121
 msgid "Cannot instantiate OpenID consumer object."
-msgstr "Impossibile istanziare l'oggetto OpenID."
+msgstr "Impossibile creare l'oggetto OpenID consumer."
 
-#: ../actions/imsettings.php:163
+#: ../actions/imsettings.php:154
 msgid "Cannot normalize that Jabber ID"
-msgstr "Non si può normalizzare quel Jabber ID"
-
-#: ../actions/emailsettings.php:181
-#, fuzzy
-msgid "Cannot normalize that email address"
-msgstr "Non si può normalizzare quel Jabber ID"
+msgstr "Impossibile normalizzare quell'ID Jabber"
 
 #: ../actions/password.php:45
 msgid "Change"
-msgstr "Cambia"
-
-#: ../lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
+msgstr "Modifica"
 
 #: ../actions/password.php:32
 msgid "Change password"
-msgstr "Cambia password"
-
-#: ../lib/settingsaction.php:94
-#, fuzzy
-msgid "Change your password"
-msgstr "Cambia password"
-
-#: ../lib/settingsaction.php:85
-#, fuzzy
-msgid "Change your profile settings"
-msgstr "Impostazioni del profilo"
+msgstr "Modifica password"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:181
-#: ../actions/register.php:155 ../actions/smssettings.php:65
+#: ../actions/password.php:43 ../actions/recoverpassword.php:166
+#: ../actions/register.php:179
 msgid "Confirm"
 msgstr "Conferma"
 
-#: ../actions/confirmaddress.php:90
+#: ../actions/confirmaddress.php:84
 msgid "Confirm Address"
-msgstr "Conferma l'indirizzo"
+msgstr "Conferma indirizzo"
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245
+#: ../actions/imsettings.php:213
 msgid "Confirmation cancelled."
-msgstr "Conferma cancellata."
-
-#: ../actions/smssettings.php:63
-#, fuzzy
-msgid "Confirmation code"
-msgstr "Nessun codice di conferma."
+msgstr "Conferma annullata."
 
 #: ../actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr "Codice di conferma non trovato."
 
-#: ../actions/register.php:202
-#, php-format
-msgid ""
-"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."
-msgstr ""
-
 #: ../actions/finishopenidlogin.php:91
 msgid "Connect"
 msgstr "Connetti"
 
-#: ../actions/finishopenidlogin.php:86
-#, fuzzy
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
 msgid "Connect existing account"
-msgstr "Collega ad un account esistente"
+msgstr "Collega a un account esistente"
 
-#: ../lib/util.php:332
+#: ../lib/util.php:304
 msgid "Contact"
-msgstr "Contatto"
+msgstr "Contatti"
 
 #: ../lib/openid.php:178
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Impossibile creare il modulo OpenID: %s"
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr ""
-
 #: ../lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
-msgstr "Non posso redirigere al server: %s"
+msgstr "Impossibile redirigere al server: %s"
 
-#: ../actions/updateprofile.php:162
+#: ../actions/updateprofile.php:161
 msgid "Could not save avatar info"
-msgstr "Non posso salvare le informazioni relative all'avatar"
+msgstr "Impossibile salvare le informazioni dell'immagine"
 
-#: ../actions/updateprofile.php:155
+#: ../actions/updateprofile.php:154
 msgid "Could not save new profile info"
-msgstr "Non posso salvare le nuove informazioni relative al profilo"
-
-#: ../lib/subs.php:54
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../lib/subs.php:46
-#, fuzzy
-msgid "Could not subscribe."
-msgstr "Non sottoscritto!"
+msgstr "Impossibile salvare le nuove informazioni del profilo"
 
-#: ../actions/recoverpassword.php:102
-#, fuzzy
-msgid "Could not update user with confirmed email address."
-msgstr "Impossibile inserire il codice di conferma."
+#: ../actions/profilesettings.php:146
+msgid "Couldn't confirm email."
+msgstr "Impossibile confermare l'email."
 
 #: ../actions/finishremotesubscribe.php:99
-#, fuzzy
+#: actions/finishremotesubscribe.php:101
 msgid "Couldn't convert request tokens to access tokens."
 msgstr ""
-"Impossibile convertire le credenziali di richiesta in credenziali di accesso"
+"Impossibile convertire le credenziali di richiesta in credenziali di "
+"accesso."
+
+#: ../actions/subscribe.php:59
+msgid "Couldn't create subscription."
+msgstr "Impossibile creare l'abbonamento."
 
-#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
-#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
 msgid "Couldn't delete email confirmation."
-msgstr "Impossibile cancellare l'email di conferma."
+msgstr "Impossibile eliminare l'email di conferma."
 
-#: ../lib/subs.php:103
+#: ../actions/unsubscribe.php:56
 msgid "Couldn't delete subscription."
-msgstr "Impossibile cancellare la sottoscrizione."
-
-#: ../actions/twitapistatuses.php:93
-#, fuzzy
-msgid "Couldn't find any statuses."
-msgstr "Impossibile aggiornare"
+msgstr "Impossibile eliminare l'abbonamento."
 
-#: ../actions/remotesubscribe.php:127
+#: ../actions/remotesubscribe.php:125
 msgid "Couldn't get a request token."
-msgstr "Impossibile ottenere una credenziale di richiesta."
+msgstr "Impossibile ottenere un token di richiesta."
 
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206
+#: ../actions/imsettings.php:178
 msgid "Couldn't insert confirmation code."
 msgstr "Impossibile inserire il codice di conferma."
 
 #: ../actions/finishremotesubscribe.php:180
 msgid "Couldn't insert new subscription."
-msgstr "Impossibile inserire una nuova sottoscrizione."
+msgstr "Impossibile inserire un nuovo abbonamento."
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: ../actions/profilesettings.php:175
 msgid "Couldn't save profile."
 msgstr "Impossibile salvare il profilo."
 
-#: ../actions/profilesettings.php:161
-#, fuzzy
-msgid "Couldn't update user for autosubscribe."
-msgstr "Impossibile aggiornare"
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#, fuzzy
-msgid "Couldn't update user record."
-msgstr "Impossibile aggiornare"
-
-#: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
-#: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
-#: ../actions/imsettings.php:243 ../actions/profilesettings.php:141
-#: ../actions/smssettings.php:157 ../actions/smssettings.php:269
+#: ../actions/confirmaddress.php:70 ../actions/imsettings.php:129
+#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
 msgid "Couldn't update user."
-msgstr "Impossibile aggiornare"
+msgstr "Impossibile aggiornare l'utente."
 
 #: ../actions/finishopenidlogin.php:84
 msgid "Create"
@@ -559,14 +322,13 @@ msgstr "Crea"
 
 #: ../actions/finishopenidlogin.php:70
 msgid "Create a new user with this nickname."
-msgstr "Crea un nuovo utente con questo nome."
+msgstr "Crea un nuovo utente con questo soprannome."
 
 #: ../actions/finishopenidlogin.php:68
 msgid "Create new account"
 msgstr "Crea un nuovo account"
 
-#: ../actions/finishopenidlogin.php:191
-#, fuzzy
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Creazione nuovo account per OpenID che ha già un utente."
 
@@ -574,232 +336,173 @@ msgstr "Creazione nuovo account per OpenID che ha già un utente."
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Indirizzo Jabber/GTalk attualmente confermato."
 
-#: ../actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:44
-#, fuzzy
-msgid "Current confirmed email address."
-msgstr "Indirizzo Jabber/GTalk attualmente confermato."
-
-#: ../actions/showstream.php:356
+#: ../actions/showstream.php:337
 msgid "Currently"
 msgstr "Attualmente"
 
-#: ../classes/Notice.php:72
-#, fuzzy, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "Errore nel DB inserendo la risposta: %s"
-
-#: ../lib/util.php:1061
+#: ../lib/util.php:893
 #, php-format
 msgid "DB error inserting reply: %s"
-msgstr "Errore nel DB inserendo la risposta: %s"
+msgstr "Errore nel DB nell'inserire la risposta: %s"
 
-#: ../actions/deletenotice.php:41
-#, fuzzy
-msgid "Delete notice"
-msgstr "Nuovo post"
-
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: ../actions/profilesettings.php:54
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Descrivi te stesso e i tuoi interessi in 140 caratteri"
 
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87
+#: ../actions/register.php:181
 msgid "Email"
 msgstr "Email"
 
-#: ../actions/emailsettings.php:59
-#, fuzzy
-msgid "Email Address"
+#: ../actions/profilesettings.php:46
+msgid "Email address"
 msgstr "Indirizzo email"
 
-#: ../actions/emailsettings.php:32
-#, fuzzy
-msgid "Email Settings"
-msgstr "Impostazioni"
-
-#: ../actions/register.php:73
+#: ../actions/profilesettings.php:102 ../actions/register.php:63
 msgid "Email address already exists."
 msgstr "Indirizzo email già esistente."
 
-#: ../lib/mail.php:90
+#: ../lib/mail.php:82
 msgid "Email address confirmation"
 msgstr "Conferma indirizzo email"
 
-#: ../actions/emailsettings.php:61
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/invite.php:129
-#, fuzzy
-msgid "Email addresses"
-msgstr "Indirizzo email"
-
-#: ../actions/recoverpassword.php:191
-#, fuzzy
+#: ../actions/recoverpassword.php:176 ../actions/recoverpassword.php:191
+#: actions/recoverpassword.php:197
 msgid "Enter a nickname or email address."
-msgstr "Alias o indirizzo email"
+msgstr "Inserisci un soprannome o un indirizzo email."
 
-#: ../actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/userauthorization.php:137
+#: ../actions/userauthorization.php:136
 msgid "Error authorizing token"
-msgstr "Errore autorizzando le credenziali"
+msgstr "Errore nell'autorizzare il token"
 
-#: ../actions/finishopenidlogin.php:253
+#: ../actions/finishopenidlogin.php:282
 msgid "Error connecting user to OpenID."
-msgstr "Errore collegando l'utente a OpenID."
+msgstr "Errore nel collegare l'utente a OpenID."
 
 #: ../actions/finishaddopenid.php:78
 msgid "Error connecting user."
-msgstr "Errore connessione utente."
+msgstr "Errore nel connettere l'utente."
 
 #: ../actions/finishremotesubscribe.php:151
 msgid "Error inserting avatar"
-msgstr "Errore inserimento avatar"
+msgstr "Errore nell'inserire l'immagine"
 
 #: ../actions/finishremotesubscribe.php:143
 msgid "Error inserting new profile"
-msgstr "Errore inserimento nuovo profilo"
+msgstr "Errore nell'inserire il nuovo profilo"
+
+#: ../actions/postnotice.php:88
+msgid "Error inserting notice"
+msgstr "Errore nell'inserire un messaggio"
 
 #: ../actions/finishremotesubscribe.php:167
 msgid "Error inserting remote profile"
-msgstr "Errore inserendo un profilo remoto"
+msgstr "Errore nell'inserire un profilo remoto"
 
-#: ../actions/recoverpassword.php:240
+#: ../actions/recoverpassword.php:201
 msgid "Error saving address confirmation."
-msgstr "Errore salvando la conferma dell'indirizzo."
+msgstr "Errore nel salvare la conferma dell'indirizzo."
 
-#: ../actions/userauthorization.php:140
+#: ../actions/userauthorization.php:139
 msgid "Error saving remote profile"
-msgstr "Errore salvando il profilo remoto"
+msgstr "Errore nel salvare il profilo remoto"
 
-#: ../lib/openid.php:226
+#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
 msgid "Error saving the profile."
-msgstr "Errore salvando il profilo."
+msgstr "Errore nel salvare il profilo."
 
 #: ../lib/openid.php:237
 msgid "Error saving the user."
-msgstr "Errore salvando l'utente."
+msgstr "Errore nel salvare l'utente."
 
 #: ../actions/password.php:80
 msgid "Error saving user; invalid."
-msgstr "Errore salvando l'utente; non valido."
+msgstr "Errore nel salvare l'utente; non valido."
 
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
+#: ../actions/login.php:43 ../actions/login.php:69
+#: ../actions/recoverpassword.php:268 ../actions/register.php:73
 msgid "Error setting user."
-msgstr "Errore impostazione utente."
+msgstr "Errore nell'impostare l'utente."
 
 #: ../actions/finishaddopenid.php:83
 msgid "Error updating profile"
-msgstr "Errore aggiornamento profilo"
+msgstr "Errore nell'aggiornare il profilo"
 
 #: ../actions/finishremotesubscribe.php:161
 msgid "Error updating remote profile"
-msgstr "Errore aggiornando il profilo remoto"
+msgstr "Errore nell'aggiornare il profilo remoto"
 
-#: ../actions/recoverpassword.php:80
+#: ../actions/recoverpassword.php:79
 msgid "Error with confirmation code."
 msgstr "Errore con il codice di conferma."
 
-#: ../actions/finishopenidlogin.php:89
-#, fuzzy
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
 msgid "Existing nickname"
-msgstr "Nickname esistente"
+msgstr "Soprannome esistente"
 
-#: ../lib/util.php:326
+#: ../lib/util.php:298
 msgid "FAQ"
 msgstr "FAQ"
 
 #: ../actions/avatar.php:115
 msgid "Failed updating avatar."
-msgstr "Errore aggiornando l'avatar."
+msgstr "Errore nell'aggiornare l'immagine."
 
-#: ../actions/all.php:61 ../actions/allrss.php:64
+#: ../actions/all.php:61 ../actions/allrss.php:74
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Feed per gli amici di %s"
 
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: ../actions/replies.php:61 ../actions/repliesrss.php:80
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Feed per le risposte a %s"
 
-#: ../actions/tag.php:55
-#, fuzzy, php-format
-msgid "Feed for tag %s"
-msgstr "Feed per le risposte a %s"
-
-#: ../lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/login.php:122
+#: ../actions/login.php:118
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
-"Per motivi di sicurezza sei pregato di reinserire il tuo nome utente e la "
-"tua password prima di modificare le tue impostazioni."
+"Per motivi di sicurezza è necessario reinserire il proprio nome utente e la "
+"propria password prima di modificare le impostazioni."
 
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: ../actions/profilesettings.php:44
 msgid "Full name"
 msgstr "Nome"
 
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93
+#: ../actions/profilesettings.php:90 ../actions/updateprofile.php:92
 msgid "Full name is too long (max 255 chars)."
-msgstr "Nome troppo lungo (max 255 car.)"
+msgstr "Nome troppo lungo (max 255 caratteri)"
 
-#: ../lib/util.php:322
+#: ../lib/util.php:279
 msgid "Help"
 msgstr "Aiuto"
 
-#: ../lib/util.php:298
-#, fuzzy
+#: ../lib/util.php:274 ../lib/util.php:298 lib/util.php:314
 msgid "Home"
 msgstr "Home"
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: ../actions/profilesettings.php:49
 msgid "Homepage"
-msgstr "Pagina iniziale"
+msgstr "Pagina web"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: ../actions/profilesettings.php:87
 msgid "Homepage is not a valid URL."
-msgstr "L'indirizzo della pagina iniziale non è valido."
-
-#: ../actions/emailsettings.php:91
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102
-msgid "IM"
-msgstr ""
+msgstr "L'URL della pagina web non è valido."
 
-#: ../actions/imsettings.php:60
+#: ../actions/imsettings.php:61
 msgid "IM Address"
-msgstr "Indirizzo IM"
+msgstr "Indirizzo di messaggistica istantanea"
 
 #: ../actions/imsettings.php:33
 msgid "IM Settings"
-msgstr "Impostazioni IM"
+msgstr "Impostazioni messaggistica istantanea"
 
 #: ../actions/finishopenidlogin.php:88
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
 msgstr ""
-"Se hai già un account, effettua il login col tuo nome utente e la tua "
+"Se hai già un account, esegui l'accesso col tuo nome utente e la tua "
 "password per connetterlo al tuo OpenID."
 
 #: ../actions/openidsettings.php:45
@@ -807,36 +510,26 @@ msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
 msgstr ""
-"Se vuoi aggiungere un OpenID al tuo account, inseriscilo nel box sottostante "
-"e clicca su \"Aggiungi\"."
+"Se vuoi aggiungere un OpenID al tuo account, inseriscilo nel riquadro "
+"sottostante e fai clic su \"Aggiungi\"."
 
-#: ../actions/recoverpassword.php:137
-#, fuzzy
+#: ../actions/recoverpassword.php:122
 msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
+"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 ""
 "Se hai dimenticato o perso la tua password, puoi riceverne una nuova "
 "all'indirizzo email memorizzato nel tuo account."
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283
-#, fuzzy
-msgid "Incoming email address removed."
-msgstr "L'indirizzo è stato rimosso."
-
 #: ../actions/password.php:69
 msgid "Incorrect old password"
 msgstr "Vecchia password non corretta"
 
-#: ../actions/login.php:67
+#: ../actions/login.php:63
 msgid "Incorrect username or password."
-msgstr "Nome utente o password non corretti."
+msgstr "Nome utente o password non corretto."
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:226
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -844,322 +537,230 @@ msgstr ""
 "Le istruzioni per recuperare la tua password sono state inviate "
 "all'indirizzo email registrato nel tuo account."
 
-#: ../actions/updateprofile.php:114
-#, fuzzy, php-format
+#: ../actions/updateprofile.php:113 ../actions/updateprofile.php:114
+#: actions/updateprofile.php:115
+#, php-format
 msgid "Invalid avatar URL '%s'"
-msgstr "URL dell'avatar non valido '%s'"
+msgstr "URL \"%s\" dell'immagine non valido"
 
-#: ../actions/invite.php:55
-#, fuzzy, php-format
-msgid "Invalid email address: %s"
-msgstr "Non è un indirizzo email valido"
-
-#: ../actions/updateprofile.php:98
-#, fuzzy, php-format
+#: ../actions/updateprofile.php:97 ../actions/updateprofile.php:98
+#: actions/updateprofile.php:99
+#, php-format
 msgid "Invalid homepage '%s'"
-msgstr "Pagina iniziale non valida '%s'"
+msgstr "Pagina web \"%s\" non valida"
 
-#: ../actions/updateprofile.php:82
+#: ../actions/updateprofile.php:81
 #, php-format
 msgid "Invalid license URL '%s'"
-msgstr "URL della licenza non valido '%s'"
+msgstr "URL \"%s\" della licenza non valido"
 
-#: ../actions/postnotice.php:61
-#, fuzzy
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
 msgid "Invalid notice content"
-msgstr "Contenuto del post invalido"
+msgstr "Contenuto del messaggio non valido"
 
-#: ../actions/postnotice.php:67
-#, fuzzy
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
 msgid "Invalid notice uri"
-msgstr "Uri del post invalido"
+msgstr "URI del messaggio non valido"
 
-#: ../actions/postnotice.php:72
-#, fuzzy
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
 msgid "Invalid notice url"
-msgstr "Url del post invalido"
+msgstr "URL del messaggio non valido"
 
-#: ../actions/updateprofile.php:87
-#, fuzzy, php-format
+#: ../actions/updateprofile.php:86 ../actions/updateprofile.php:87
+#: actions/updateprofile.php:88
+#, php-format
 msgid "Invalid profile URL '%s'."
-msgstr "URL del profilo invalido '%s'"
+msgstr "URL \"%s\" del profilo non valido"
 
 #: ../actions/remotesubscribe.php:96
 msgid "Invalid profile URL (bad format)"
-msgstr "URL del profilo invalido (formato errato)"
+msgstr "URL del profilo non valido (formato errato)"
 
 #: ../actions/finishremotesubscribe.php:77
 msgid "Invalid profile URL returned by server."
-msgstr "URL del profilo invalido ritornato dal server"
+msgstr "URL del profilo restituito dal server non valido."
 
 #: ../actions/avatarbynickname.php:37
 msgid "Invalid size."
 msgstr "Dimensione non valida."
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111
+#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
+#: ../actions/register.php:84
 msgid "Invalid username or password."
-msgstr "Nome utente o password non validi."
-
-#: ../actions/invite.php:79
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
+msgstr "Nome utente o password non valido."
 
-#: ../lib/util.php:306
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123
-msgid "Invite new users"
-msgstr ""
-
-#: ../lib/util.php:261
+#: ../lib/util.php:237
 #, 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)."
+"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 ""
-"Gestito da software di microblogging [Laconica](http://laconi.ca/), versione "
-"%s, disponibile sotto licenza [GNU Affero General Public License](http://www."
-"fsf.org/licensing/licenses/agpl-3.0.html)."
+" Gestito dal software di micro-blog [Laconica](http://laconi.ca/), versione "
+"%s, disponibile sotto licenza [GNU Affero General Public "
+"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:173
+#: ../actions/imsettings.php:164
 msgid "Jabber ID already belongs to another user."
-msgstr "Jabber ID già assegnato ad un altro utente."
+msgstr "ID Jabber già assegnato a un altro utente."
 
-#: ../actions/imsettings.php:62
+#: ../actions/imsettings.php:63
 #, 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 ""
-"Indirizzo Jabber o GTalk, come \"NomeUtente@example.org\". Prima assicurati "
-"di aggiungere %s alla lista dei tuoi contatti nel tuo client IM o su GTalk."
+"Indirizzo Jabber o GTalk nella forma \"NomeUtente@example.org\". Per prima "
+"cosa, assicurati di aggiungere %s all'elenco dei contatti nel tuo programma "
+"di messaggistica o su GTalk."
 
-#: ../actions/profilesettings.php:57
-msgid "Language"
-msgstr ""
-
-#: ../actions/profilesettings.php:113
-#, fuzzy
-msgid "Language is too long (max 50 chars)."
-msgstr "Località troppo lunga (max 255 car.)."
-
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: ../actions/profilesettings.php:55
 msgid "Location"
-msgstr "Località"
+msgstr "Ubicazione"
 
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108
+#: ../actions/profilesettings.php:96 ../actions/updateprofile.php:107
 msgid "Location is too long (max 255 chars)."
-msgstr "Località troppo lunga (max 255 car.)."
+msgstr "Ubicazione troppo lunga (max 255 caratteri)."
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310
+#: ../actions/login.php:93 ../actions/login.php:102
+#: ../actions/openidlogin.php:68 ../lib/util.php:286
 msgid "Login"
 msgstr "Accedi"
 
 #: ../actions/openidlogin.php:44
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Accedi con un [OpenID](%%doc.openid%%) account."
+msgstr "Accedi con un account [OpenID](%%doc.openid%%)."
 
-#: ../actions/login.php:126
+#: ../actions/login.php:122
 #, 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%"
-"%). "
+"Login with your username and password. Don't have a username yet? "
+"[Register](%%action.register%%) a new account, or try "
+"[OpenID](%%action.openidlogin%%). "
 msgstr ""
-"Accedi con un username e password. Non hai ancora un username? [Registra](%%"
-"action.register%%) un nuovo account, o prova [OpenID](%%action.openidlogin%"
-"%). "
+"Accedi con nome utente e password. Non hai ancora un nome utente? "
+"[Registra](%%action.register%%) un nuovo account o prova "
+"[OpenID](%%action.openidlogin%%). "
 
-#: ../lib/util.php:308
+#: ../lib/util.php:284
 msgid "Logout"
 msgstr "Esci"
 
-#: ../actions/register.php:166
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
-
-#: ../actions/login.php:110
+#: ../actions/login.php:106
 msgid "Lost or forgotten password?"
 msgstr "Password persa o dimenticata?"
 
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr ""
-
-#: ../actions/showstream.php:300
+#: ../actions/showstream.php:281
 msgid "Member since"
 msgstr "Membro dal "
 
 #: ../actions/userrss.php:70
 #, php-format
 msgid "Microblog by %s"
-msgstr "Microblog by %s"
-
-#: ../actions/smssettings.php:304
-#, php-format
-msgid ""
-"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
-"email but isn't listed here, send email to let us know at %s."
-msgstr ""
+msgstr "Micro-blog di %s"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
 msgid "My text and files are available under "
-msgstr "I miei testi e files sono disponibili sotto"
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-msgid "New"
-msgstr ""
+msgstr "I miei testi e file sono disponibili sotto"
 
-#: ../lib/mail.php:144
-#, fuzzy, php-format
-msgid "New email address for posting to %s"
-msgstr "Nessun indirizzo email registrato per questo utente."
-
-#: ../actions/emailsettings.php:297
-#, fuzzy
-msgid "New incoming email address added."
-msgstr "Non è un indirizzo email valido"
-
-#: ../actions/finishopenidlogin.php:71
-#, fuzzy
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
 msgid "New nickname"
-msgstr "Nuovo nickname"
+msgstr "Nuovo soprannome"
 
-#: ../actions/newnotice.php:87
-#, fuzzy
+#: ../actions/newnotice.php:100 ../actions/newnotice.php:87
+#: actions/newnotice.php:96
 msgid "New notice"
-msgstr "Nuovo post"
+msgstr "Nuovo messaggio"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
+#: ../actions/password.php:41 ../actions/recoverpassword.php:164
 msgid "New password"
 msgstr "Nuova password"
 
-#: ../actions/recoverpassword.php:314
-#, fuzzy
+#: ../actions/recoverpassword.php:275 ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nuova password salvata con successo. Hai effettuato l'accesso."
 
-#: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151
-#, fuzzy
+#: ../actions/login.php:97 ../actions/profilesettings.php:41
+#: ../actions/register.php:175 ../actions/login.php:101
+#: ../actions/register.php:151 actions/login.php:101
+#: actions/profilesettings.php:74 actions/register.php:165
 msgid "Nickname"
-msgstr "Nickname"
+msgstr "Soprannome"
 
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69
-#, fuzzy
+#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:99
+#: ../actions/register.php:59 ../actions/profilesettings.php:110
+#: ../actions/register.php:69 actions/finishopenidlogin.php:181
+#: actions/profilesettings.php:225 actions/register.php:76
 msgid "Nickname already in use. Try another one."
-msgstr "Nickname già in uso. Prova con un altro."
-
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:67 ../actions/updateprofile.php:77
-#, fuzzy
+msgstr "Soprannome già in uso. Prova con un altro."
+
+#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:80
+#: ../actions/register.php:57 ../actions/updateprofile.php:76
+#: ../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
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
-"Il nickname può essere composto solo da lettere minuscole e numeri, senza "
-"spazi"
+"Il soprannome deve essere composto solo da lettere minuscole e numeri, senza "
+"spazi."
 
-#: ../actions/finishopenidlogin.php:170
-#, fuzzy
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
 msgid "Nickname not allowed."
-msgstr "Nickname non ammesso."
+msgstr "Soprannome non consentito."
 
-#: ../actions/remotesubscribe.php:72
-#, fuzzy
+#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
 msgid "Nickname of the user you want to follow"
-msgstr "Nickname dell'utente che vuoi seguire"
+msgstr "Soprannome dell'utente che vuoi seguire"
 
-#: ../actions/recoverpassword.php:162
-#, fuzzy
+#: ../actions/recoverpassword.php:147 ../actions/recoverpassword.php:162
+#: actions/recoverpassword.php:167
 msgid "Nickname or email"
-msgstr "Nickname o email"
-
-#: ../actions/deletenotice.php:59
-msgid "No"
-msgstr ""
+msgstr "Soprannome o email"
 
-#: ../actions/imsettings.php:156
+#: ../actions/imsettings.php:147
 msgid "No Jabber ID."
-msgstr "Nessun Jabber ID."
+msgstr "Nessun ID di Jabber."
 
-#: ../actions/userauthorization.php:129
+#: ../actions/userauthorization.php:128
 msgid "No authorization request!"
 msgstr "Nessuna richiesta di autorizzazione!"
 
-#: ../actions/smssettings.php:181
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316
-#, fuzzy
-msgid "No code entered"
-msgstr "Nessun contenuto!"
-
 #: ../actions/confirmaddress.php:33
 msgid "No confirmation code."
 msgstr "Nessun codice di conferma."
 
-#: ../actions/newnotice.php:44
+#: ../actions/newnotice.php:49
 msgid "No content!"
 msgstr "Nessun contenuto!"
 
-#: ../actions/emailsettings.php:174
-#, fuzzy
-msgid "No email address."
-msgstr "Indirizzo email"
-
-#: ../actions/userbyid.php:32
+#: ../actions/userbyid.php:27
 msgid "No id."
 msgstr "Nessun id."
 
-#: ../actions/emailsettings.php:271
-#, fuzzy
-msgid "No incoming email address."
-msgstr "Non è un indirizzo email valido"
-
 #: ../actions/finishremotesubscribe.php:65
-#, fuzzy
+#: actions/finishremotesubscribe.php:67
 msgid "No nickname provided by remote server."
-msgstr "Nessun nickname fornito dal server remoto."
+msgstr "Nessun soprannome fornito dal server remoto."
 
 #: ../actions/avatarbynickname.php:27
 msgid "No nickname."
-msgstr "Nessun nickname."
+msgstr "Nessun soprannome."
 
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229
+#: ../actions/imsettings.php:197
 msgid "No pending confirmation to cancel."
-msgstr "Nessuna conferma in attesa da cancellare."
-
-#: ../actions/smssettings.php:176
-#, fuzzy
-msgid "No phone number."
-msgstr "Nessun utente."
+msgstr "Nessuna conferma da annullare."
 
 #: ../actions/finishremotesubscribe.php:72
 msgid "No profile URL returned by server."
 msgstr "Nessun URL di profilo restituito dal server."
 
-#: ../actions/recoverpassword.php:226
+#: ../actions/recoverpassword.php:189
 msgid "No registered email address for that user."
-msgstr "Nessun indirizzo email registrato per questo utente."
+msgstr "Nessun indirizzo email registrato per quell'utente."
 
-#: ../actions/userauthorization.php:49
+#: ../actions/userauthorization.php:48
 msgid "No request found!"
 msgstr "Nessuna richiesta trovata!"
 
@@ -1171,97 +772,69 @@ msgstr "Nessun risultato"
 msgid "No size."
 msgstr "Nessuna dimensione."
 
-#: ../actions/twitapistatuses.php:595
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555
-msgid "No status with that ID found."
-msgstr ""
-
 #: ../actions/openidsettings.php:135
 msgid "No such OpenID."
-msgstr "Nessun OpenID"
+msgstr "Nessun tale OpenID."
 
 #: ../actions/doc.php:29
 msgid "No such document."
-msgstr "Nessun documento."
+msgstr "Nessun tale documento."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30
-#, fuzzy
+#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
+#: ../actions/shownotice.php:83 ../lib/deleteaction.php:30
+#: actions/shownotice.php:32 actions/shownotice.php:83 lib/deleteaction.php:30
 msgid "No such notice."
-msgstr "Nessun post."
+msgstr "Nessun tale messaggio."
 
 #: ../actions/recoverpassword.php:56
 msgid "No such recovery code."
-msgstr "Nessun codice di ricovero."
+msgstr "Nessun codice di ripristino."
 
 #: ../actions/postnotice.php:56
 msgid "No such subscription"
-msgstr "Nessuna sottoscrizione"
+msgstr "Nessun tale abbonamento"
 
 #: ../actions/all.php:34 ../actions/allrss.php:35
-#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
-#: ../actions/remotesubscribe.php:84 ../actions/remotesubscribe.php:91
-#: ../actions/replies.php:57 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:110 ../actions/userbyid.php:36
-#: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
-#: ../lib/subs.php:33 ../lib/subs.php:82
+#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:36
+#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
+#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
+#: ../actions/showstream.php:95 ../actions/subscribe.php:43
+#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
+#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
 msgid "No such user."
-msgstr "Nessun utente."
-
-#: ../actions/recoverpassword.php:211
-#, fuzzy
-msgid "No user with that email address or username."
-msgstr "Nessun indirizzo email registrato per questo utente."
+msgstr "Nessun tale utente."
 
-#: ../lib/gallery.php:80
+#: ../lib/gallery.php:76
 msgid "Nobody to show!"
 msgstr "Nessuno da mostrare!"
 
 #: ../actions/recoverpassword.php:60
 msgid "Not a recovery code."
-msgstr "Non è un codice di recupero."
-
-#: ../scripts/maildaemon.php:50
-#, fuzzy
-msgid "Not a registered user."
-msgstr "Non è un codice di recupero."
-
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332
-#, fuzzy
-msgid "Not a supported data format."
-msgstr "Formato file immagine non supportato."
+msgstr "Non è un codice di ripristino."
 
-#: ../actions/imsettings.php:167
+#: ../actions/imsettings.php:158
 msgid "Not a valid Jabber ID"
-msgstr "Non è un Jabber ID valido"
+msgstr "Non è un ID Jabber valido"
 
 #: ../lib/openid.php:131
 msgid "Not a valid OpenID."
 msgstr "Non è un OpenID valido."
 
-#: ../actions/emailsettings.php:185
-#, fuzzy
-msgid "Not a valid email address"
-msgstr "Non è un indirizzo email valido"
-
-#: ../actions/register.php:63
+#: ../actions/profilesettings.php:75 ../actions/register.php:53
 msgid "Not a valid email address."
-msgstr "Non è un indirizzo email valido"
+msgstr "Non è un indirizzo email valido."
 
+#: ../actions/profilesettings.php:83 ../actions/register.php:61
 #: ../actions/profilesettings.php:91 ../actions/register.php:71
-#, fuzzy
+#: actions/profilesettings.php:206 actions/register.php:78
 msgid "Not a valid nickname."
-msgstr "Non è un nickname valido"
+msgstr "Non è un soprannome valido."
 
-#: ../actions/remotesubscribe.php:120
+#: ../actions/remotesubscribe.php:118
 msgid "Not a valid profile URL (incorrect services)."
-msgstr "Non è un URL di profilo valido (servizio incorretto)"
+msgstr "Non è un URL di profilo valido (servizio incorretto)."
 
-#: ../actions/remotesubscribe.php:113
+#: ../actions/remotesubscribe.php:111
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "Non è un URL di profilo valido (nessun XRDS definito)."
 
@@ -1271,7 +844,7 @@ msgstr "Non è un URL di profilo valido (nessun documento YADIS)."
 
 #: ../actions/avatar.php:95
 msgid "Not an image or corrupt file."
-msgstr "Non è un'immagine o il file è corrotto."
+msgstr "Non è un'immagine o il file è danneggiato."
 
 #: ../actions/finishremotesubscribe.php:51
 msgid "Not authorized."
@@ -1281,62 +854,45 @@ msgstr "Non autorizzato."
 msgid "Not expecting this response!"
 msgstr "Non aspettavo questa risposta!"
 
-#: ../actions/twitapistatuses.php:422
-#, fuzzy
-msgid "Not found"
-msgstr "Nessuna richiesta trovata!"
-
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:28
-#: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
-#: ../lib/settingsaction.php:27
+#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
+#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
+#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
 msgid "Not logged in."
 msgstr "Non connesso."
 
-#: ../lib/subs.php:91
+#: ../actions/unsubscribe.php:43
 msgid "Not subscribed!."
-msgstr "Non sottoscritto!"
+msgstr "Non abbonato!"
 
-#: ../actions/opensearch.php:35
-#, fuzzy
-msgid "Notice Search"
-msgstr "Cerca"
-
-#: ../actions/showstream.php:82
-#, fuzzy, php-format
+#: ../actions/showstream.php:82 actions/showstream.php:82
+#, php-format
 msgid "Notice feed for %s"
-msgstr "Feed dei post per %s"
+msgstr "Feed dei messaggi per %s"
 
-#: ../actions/shownotice.php:39
-#, fuzzy
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
 msgid "Notice has no profile"
-msgstr "Post senza profilo"
+msgstr "Il messaggio non ha un profilo"
 
-#: ../actions/showstream.php:316
-#, fuzzy
+#: ../actions/showstream.php:297 ../actions/showstream.php:316
+#: actions/showstream.php:331
 msgid "Notices"
-msgstr "Post"
-
-#: ../actions/tag.php:35 ../actions/tag.php:81
-#, fuzzy, php-format
-msgid "Notices tagged with %s"
-msgstr "Feed dei post per %s"
+msgstr "Messaggi"
 
 #: ../actions/password.php:39
 msgid "Old password"
 msgstr "Vecchia password"
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314
+#: ../lib/util.php:288
 msgid "OpenID"
 msgstr "OpenID"
 
 #: ../actions/finishopenidlogin.php:61
 msgid "OpenID Account Setup"
-msgstr "Impostazione account OpenID"
+msgstr "Configurazione account OpenID"
 
 #: ../lib/openid.php:180
 msgid "OpenID Auto-Submit"
-msgstr "Auto-Invio OpenID"
+msgstr "Auto-invio OpenID"
 
 #: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
 #: ../actions/openidlogin.php:60
@@ -1349,12 +905,12 @@ msgstr "URL OpenID"
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 msgid "OpenID authentication cancelled."
-msgstr "Autenticazione OpenID cancellata."
+msgstr "Autenticazione OpenID annullata."
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #, php-format
 msgid "OpenID authentication failed: %s"
-msgstr "Autenticazione OpenID fallita: %s"
+msgstr "Autenticazione OpenID non riuscita: %s"
 
 #: ../lib/openid.php:133
 #, php-format
@@ -1369,106 +925,74 @@ msgstr "OpenID rimosso."
 msgid "OpenID settings"
 msgstr "Impostazioni OpenID"
 
-#: ../actions/invite.php:135
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
 #: ../actions/avatar.php:84
 msgid "Partial upload."
 msgstr "Caricamento parziale."
 
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
-#: ../actions/register.php:153 ../lib/settingsaction.php:93
+#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
+#: ../actions/register.php:177
 msgid "Password"
 msgstr "Password"
 
-#: ../actions/recoverpassword.php:288
+#: ../actions/recoverpassword.php:249
 msgid "Password and confirmation do not match."
 msgstr "La password e la conferma non corrispondono."
 
-#: ../actions/recoverpassword.php:284
+#: ../actions/recoverpassword.php:245
 msgid "Password must be 6 chars or more."
 msgstr "La password dev'essere lunga almeno 6 caratteri."
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
 msgid "Password recovery requested"
-msgstr "Richiesta la password di ripristino"
+msgstr "Richiesta password di ripristino"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: ../actions/password.php:89 ../actions/recoverpassword.php:274
 msgid "Password saved."
-msgstr "Password salvata"
+msgstr "Password salvata."
 
-#: ../actions/password.php:61 ../actions/register.php:88
+#: ../actions/password.php:61 ../actions/register.php:65
 msgid "Passwords don't match."
 msgstr "Le password non corrispondono."
 
-#: ../lib/searchaction.php:100
-#, fuzzy
-msgid "People"
-msgstr "Ricerca persone"
-
-#: ../actions/opensearch.php:33
-#, fuzzy
-msgid "People Search"
-msgstr "Ricerca persone"
-
 #: ../actions/peoplesearch.php:33
 msgid "People search"
 msgstr "Ricerca persone"
 
-#: ../lib/stream.php:50
+#: ../lib/stream.php:44
 msgid "Personal"
 msgstr "Personale"
 
-#: ../actions/invite.php:133
-#, fuzzy
-msgid "Personal message"
-msgstr "Personale"
-
-#: ../actions/smssettings.php:69
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "1-64 lettere o numeri, senza spazi o simboli di punteggiatura"
-
-#: ../actions/userauthorization.php:78
-#, fuzzy
+#: ../actions/userauthorization.php:77 ../actions/userauthorization.php:78
 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 \"Cancel\"."
 msgstr ""
-"Per favore controlla questi dettagli per essere sicuro che vuoi "
-"sottoscrivere i post di questo utente. Se tu non hai chiesto di "
-"sottoscrivere nessuno, click \"Cancella\"."
+"Controlla i dettagli seguenti per essere sicuro di volerti abbonare ai "
+"messaggi di questo utente. Se non hai richiesto ciò, fai clic su "
+"\"Annulla\"."
 
-#: ../actions/imsettings.php:73
+#: ../actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "Pubblica un avviso quando il mio stato Jabber/GTalk cambia."
+msgstr "Pubblica un messaggio quando il mio stato Jabber/GTalk cambia"
 
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94
+#: ../actions/imsettings.php:68
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163
+#: ../actions/imsettings.php:135
 msgid "Preferences saved."
 msgstr "Preferenze salvate."
 
-#: ../actions/profilesettings.php:57
-#, fuzzy
-msgid "Preferred language"
-msgstr "Preferenze"
-
-#: ../lib/util.php:328
+#: ../lib/util.php:300
 msgid "Privacy"
 msgstr "Privacy"
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106
+#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
 msgid "Problem saving notice."
-msgstr "Problema salvando il post."
+msgstr "Problema nel salvare il messaggio."
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60
+#: ../lib/stream.php:54
 msgid "Profile"
 msgstr "Profilo"
 
@@ -1480,77 +1004,56 @@ msgstr "URL del profilo"
 msgid "Profile settings"
 msgstr "Impostazioni del profilo"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
 msgid "Profile unknown"
 msgstr "Profilo sconosciuto"
 
+#: ../lib/util.php:276
+msgid "Public"
+msgstr "Pubblico"
+
 #: ../actions/public.php:54
 msgid "Public Stream Feed"
-msgstr "Feed del Flusso Pubblico"
+msgstr "Feed del flusso pubblico"
 
+#  Solo una prova, se non sta bene si ripristina la versione vecchia, giusto per avere l'interfaccia il più tradotta possibile
 #: ../actions/public.php:33
 msgid "Public timeline"
-msgstr "Timeline pubblica"
-
-#: ../actions/imsettings.php:79
-#, fuzzy
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Indirizzo Jabber/GTalk attualmente confermato."
-
-#: ../actions/emailsettings.php:94
-#, fuzzy
-msgid "Publish a MicroID for my email address."
-msgstr "Alias o indirizzo email"
+msgstr "Attività pubblica"
 
-#: ../actions/tag.php:75 ../actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
-
-#: ../actions/recoverpassword.php:166
+#: ../actions/recoverpassword.php:151
 msgid "Recover"
 msgstr "Recupero"
 
-#: ../actions/recoverpassword.php:156
+#: ../actions/recoverpassword.php:141
 msgid "Recover password"
 msgstr "Recupero password"
 
 #: ../actions/recoverpassword.php:67
 msgid "Recovery code for unknown user."
-msgstr "Recupero codice per utenti sconosciuti."
+msgstr "Codice di recupero per utente sconosciuto."
 
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: ../actions/register.php:171 ../actions/register.php:195 ../lib/util.php:287
 msgid "Register"
 msgstr "Registra"
 
-#: ../actions/register.php:28
-#, fuzzy
-msgid "Registration not allowed."
-msgstr "Nickname non ammesso."
-
-#: ../actions/register.php:200
-msgid "Registration successful"
-msgstr ""
-
-#: ../actions/userauthorization.php:120
+#: ../actions/userauthorization.php:119
 msgid "Reject"
 msgstr "Rifiuta"
 
-#: ../actions/login.php:103 ../actions/register.php:176
+#: ../actions/login.php:99 ../actions/register.php:183
 msgid "Remember me"
 msgstr "Ricordami"
 
-#: ../actions/updateprofile.php:70
+#: ../actions/updateprofile.php:69
 msgid "Remote profile with no matching profile"
 msgstr "Profilo remoto senza profilo corrispondente"
 
-#: ../actions/remotesubscribe.php:65
-#, fuzzy
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
 msgid "Remote subscribe"
-msgstr "Sottoscrizione remota"
+msgstr "Abbonamento remoto"
 
-#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
-#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
 msgid "Remove"
 msgstr "Rimuovi"
 
@@ -1563,74 +1066,50 @@ msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 msgstr ""
-"Rimuovere il tuo unico OpenID renderà impossibile effettuare il login! Se "
+"Rimuovere il tuo unico OpenID renderà impossibile effettuare l'accesso! Se "
 "vuoi rimuoverlo, prima aggiungi un altro OpenID."
 
-#: ../lib/stream.php:55
+#: ../lib/stream.php:49
 msgid "Replies"
 msgstr "Risposte"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
 #, php-format
 msgid "Replies to %s"
 msgstr "Risposte a %s"
 
-#: ../actions/recoverpassword.php:183
+#: ../actions/recoverpassword.php:168
 msgid "Reset"
-msgstr "Reset"
+msgstr "Reimposta"
 
-#: ../actions/recoverpassword.php:173
+#: ../actions/recoverpassword.php:158
 msgid "Reset password"
-msgstr "Reset password"
-
-#: ../lib/settingsaction.php:99
-msgid "SMS"
-msgstr ""
-
-#: ../actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
+msgstr "Reimposta password"
 
-#: ../actions/smssettings.php:33
-#, fuzzy
-msgid "SMS Settings"
-msgstr "Impostazioni IM"
-
-#: ../lib/mail.php:219
-#, fuzzy
-msgid "SMS confirmation"
-msgstr "Nessun codice di conferma."
-
-#: ../actions/recoverpassword.php:182
+#: ../actions/recoverpassword.php:167 ../actions/register.php:180
 msgid "Same as password above"
-msgstr "Uguale alla password sopra"
+msgstr "Stessa password di sopra"
 
-#: ../actions/register.php:156
-#, fuzzy
-msgid "Same as password above. Required."
-msgstr "Uguale alla password sopra"
-
-#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
-#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
+#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
 msgid "Save"
 msgstr "Salva"
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300
+#: ../lib/searchaction.php:73 ../lib/util.php:277
 msgid "Search"
-msgstr "Cerca"
+msgstr "Ricerca"
 
 #: ../actions/noticesearch.php:80
 msgid "Search Stream Feed"
-msgstr "Cerca nel Flusso Feed"
+msgstr "Ricerca nel flusso dei feed"
 
-#: ../actions/noticesearch.php:30
-#, fuzzy, php-format
+#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#, 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 ""
-"Cerca i post su %%site.name%% in base al contenuto. Separa i termini di "
-"ricerca con degli spazi; lunghezza minima 3 caratteri."
+"Ricerca tra i messaggi su %%site.name%% in base al contenuto. Separa i "
+"termini di ricerca con degli spazi; lunghezza minima 3 caratteri."
 
 #: ../actions/peoplesearch.php:28
 #, php-format
@@ -1638,53 +1117,25 @@ 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 ""
-"Cerca le persone su %%site.name%% per nome, località o interessi. Separa i "
-"termini di ricerca con degli spazi; lunghezza minima 3 caratteri."
+"Ricerca le persone su %%site.name%% per nome, ubicazione o interessi. Separa "
+"i termini di ricerca con degli spazi; lunghezza minima 3 caratteri."
 
-#: ../actions/smssettings.php:296
-msgid "Select a carrier"
-msgstr ""
-
-#: ../actions/invite.php:137 ../lib/util.php:1172
+#: ../lib/util.php:982
 msgid "Send"
 msgstr "Invia"
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
-msgstr ""
-
-#: ../actions/emailsettings.php:88
-#, fuzzy
-msgid "Send me notices of new subscriptions through email."
-msgstr "Inviami i post via Jabber/GTalk."
-
-#: ../actions/imsettings.php:70
-#, fuzzy
+#: ../actions/imsettings.php:71 ../actions/imsettings.php:70
+#: actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
-msgstr "Inviami i post via Jabber/GTalk."
-
-#: ../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
-#, fuzzy
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr "Inviami i post via Jabber/GTalk."
+msgstr "Inviami le notifiche via Jabber/GTalk"
 
-#: ../lib/util.php:304
+#: ../lib/util.php:282
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: ../actions/profilesettings.php:192
+#: ../actions/profilesettings.php:183
 msgid "Settings saved."
-msgstr "Impostazioni memorizzate."
-
-#: ../actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
+msgstr "Impostazioni salvate."
 
 #: ../actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
@@ -1692,63 +1143,47 @@ msgstr "Qualcun altro ha già questo OpenID."
 
 #: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
 msgid "Something weird happened."
-msgstr "E' successo qualcosa di strano."
+msgstr "È successo qualcosa di strano."
 
-#: ../scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54
-#, fuzzy
-msgid "Sorry, that is not your incoming email address."
-msgstr "Quello è l'indirizzo IM sbagliato."
-
-#: ../lib/util.php:330
+#: ../lib/util.php:302
 msgid "Source"
-msgstr "Sorgente"
+msgstr "Sorgenti"
 
-#: ../actions/showstream.php:296
+#: ../actions/showstream.php:277
 msgid "Statistics"
 msgstr "Statistiche"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
 msgid "Stored OpenID not found."
-msgstr "Non trovato OpenID memorizzato"
+msgstr "OpenID memorizzato non trovato."
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197
+#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
+#: ../actions/showstream.php:181
 msgid "Subscribe"
-msgstr "Sottoscrivi"
+msgstr "Abbonati"
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#, fuzzy
+#: ../actions/showstream.php:294 ../actions/subscribers.php:27
+#: ../actions/showstream.php:313 actions/showstream.php:328
+#: actions/subscribers.php:27
 msgid "Subscribers"
-msgstr "Sottoscrittori"
+msgstr "Abbonati"
 
-#: ../actions/userauthorization.php:310
+#: ../actions/userauthorization.php:309
 msgid "Subscription authorized"
-msgstr "Sottoscrizione accettata"
+msgstr "Abbonamento autorizzato"
 
-#: ../actions/userauthorization.php:320
+#: ../actions/userauthorization.php:319
 msgid "Subscription rejected"
-msgstr "Sottoscrizione rifiutata"
+msgstr "Abbonamento rifiutato"
 
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
+#: ../actions/showstream.php:212 ../actions/showstream.php:288
 #: ../actions/subscriptions.php:27
 msgid "Subscriptions"
-msgstr "Sottoscrizioni"
+msgstr "Abbonamenti"
 
 #: ../actions/avatar.php:87
 msgid "System error uploading file."
-msgstr "Errore di sistema durante il caricamento del file."
-
-#: ../actions/tag.php:41 ../lib/util.php:301
-msgid "Tags"
-msgstr ""
-
-#: ../lib/searchaction.php:104
-msgid "Text"
-msgstr ""
+msgstr "Errore di sistema nel caricare il file."
 
 #: ../actions/noticesearch.php:34
 msgid "Text search"
@@ -1756,7 +1191,7 @@ msgstr "Ricerca testo"
 
 #: ../actions/openidsettings.php:140
 msgid "That OpenID does not belong to you."
-msgstr "Quel OpenID non appartiene a te."
+msgstr "Quel OpenID non ti appartiene."
 
 #: ../actions/confirmaddress.php:52
 msgid "That address has already been confirmed."
@@ -1766,105 +1201,64 @@ msgstr "Quell'indirizzo è già stato confermato."
 msgid "That confirmation code is not for you!"
 msgstr "Quel codice di conferma non è per te!"
 
-#: ../actions/emailsettings.php:191
-#, fuzzy
-msgid "That email address already belongs to another user."
-msgstr "Jabber ID già assegnato ad un altro utente."
-
 #: ../actions/avatar.php:80
 msgid "That file is too big."
-msgstr "File troppo grande."
+msgstr "Quel file è troppo grande."
 
-#: ../actions/imsettings.php:170
+#: ../actions/imsettings.php:161
 msgid "That is already your Jabber ID."
-msgstr "Questo è già il tuo Jabber ID."
+msgstr "Quello è già il tuo ID di Jabber."
 
-#: ../actions/emailsettings.php:188
-#, fuzzy
-msgid "That is already your email address."
-msgstr "Questo è già il tuo Jabber ID."
-
-#: ../actions/smssettings.php:188
-#, fuzzy
-msgid "That is already your phone number."
-msgstr "Questo è già il tuo Jabber ID."
-
-#: ../actions/imsettings.php:233
+#: ../actions/imsettings.php:224
 msgid "That is not your Jabber ID."
-msgstr "Quello non è il tuo Jabber ID."
-
-#: ../actions/emailsettings.php:249
-#, fuzzy
-msgid "That is not your email address."
-msgstr "Quello è l'indirizzo IM sbagliato."
-
-#: ../actions/smssettings.php:257
-#, fuzzy
-msgid "That is not your phone number."
-msgstr "Quello non è il tuo Jabber ID."
+msgstr "Quello non è il tuo ID di Jabber."
 
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
+#: ../actions/imsettings.php:201
 msgid "That is the wrong IM address."
-msgstr "Quello è l'indirizzo IM sbagliato."
-
-#: ../actions/smssettings.php:233
-#, fuzzy
-msgid "That is the wrong confirmation number."
-msgstr "Quello è l'indirizzo IM sbagliato."
+msgstr "Quello è l'indirizzo di messaggistica sbagliato."
 
-#: ../actions/smssettings.php:191
-#, fuzzy
-msgid "That phone number already belongs to another user."
-msgstr "Jabber ID già assegnato ad un altro utente."
-
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: ../actions/newnotice.php:52
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "Troppo lungo. Lunghezza massima 140 caratteri."
 
-#: ../actions/twitapiaccount.php:74
-#, fuzzy
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "Troppo lungo. Lunghezza massima 140 caratteri."
-
-#: ../actions/confirmaddress.php:92
-#, fuzzy, php-format
+#: ../actions/confirmaddress.php:86 ../actions/confirmaddress.php:92
+#: actions/confirmaddress.php:92
+#, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "L'indirizzo \"%s\" è stato confermato per il tuo account."
 
-#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274
+#: ../actions/imsettings.php:241
 msgid "The address was removed."
 msgstr "L'indirizzo è stato rimosso."
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:311
 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 ""
-"La sottoscrizione è stata autorizzata, ma nessun URL di richiamo è stato "
-"passato. Controlla con le istruzioni del sito per dettagli su come "
-"autorizzare la sottoscrizione. Il tuo token di sottoscrizione è:"
+"L'abbonamento è stato autorizzato, ma non è stato passato alcun URL di "
+"richiamo. Controlla le istruzioni del sito per i dettagli su come "
+"autorizzare l'abbonamento. Il tuo token per l'abbonamento è:"
 
-#: ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:321
 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 ""
-"La sottoscrizione è stata rifiutata, ma nessun URL di richiamo è stato "
-"passato. Controlla con le istruzioni del sito per dettagli su come rimuovere "
-"completamente la sottoscrizione."
+"L'abbonamento è stato rifiutato, ma non è stato passato alcun URL di "
+"richiamo. Controlla con le istruzioni del sito per i dettagli su come "
+"rifiutare completamente l'abbonamento."
 
-#: ../actions/subscribers.php:35
-#, fuzzy, php-format
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#, php-format
 msgid "These are the people who listen to %s's notices."
-msgstr "Queste sono le persone che seguono i post di %s."
+msgstr "Queste sono le persone che seguono %s."
 
-#: ../actions/subscribers.php:33
-#, fuzzy
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
 msgid "These are the people who listen to your notices."
-msgstr "Queste sono le persone che seguono i tuoi post."
+msgstr "Queste sono le persone che ti seguono."
 
 #: ../actions/subscriptions.php:35
 #, php-format
@@ -1875,22 +1269,17 @@ msgstr "Queste sono le persone seguite da %s."
 msgid "These are the people whose notices you listen to."
 msgstr "Queste sono le persone che stai seguendo."
 
-#: ../actions/invite.php:89
-msgid ""
-"These people are already users and you were automatically subscribed to them:"
-msgstr ""
-
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:87
 msgid "This confirmation code is too old. Please start again."
-msgstr "Questo codice di conferma è scaduto. Per favore ricomincia da capo."
+msgstr "Questo codice di conferma è scaduto. Ricomincia da capo."
 
 #: ../lib/openid.php:195
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr ""
-"Questo modulo dovrebbe inviarsi automaticamente. In caso contrario fai click "
-"sul bottone per inviarla al tuo provider OpenID."
+"Questo modulo dovrebbe inviarsi automaticamente. In caso contrario, fai clic "
+"sul pulsante per inviarlo al tuo servizio OpenID."
 
 #: ../actions/finishopenidlogin.php:56
 #, php-format
@@ -1899,93 +1288,66 @@ msgid ""
 "to a local account. You can either create a new account, or connect with "
 "your existing account, if you have one."
 msgstr ""
-"Questa è la prima volta in cui accedi a %s quindi noi dobbiamo collegare il "
-"tuo OpenID a un account locale. Puoi crearne uno nuovo o collegarlo con il "
-"tuo account esistente, se ne hai uno."
+"Questa è la prima volta in cui accedi a %s quindi è necessario collegare "
+"il tuo OpenID a un account locale. Puoi crearne uno nuovo o collegarlo con "
+"il tuo account esistente, se ne hai uno."
 
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-msgid "This method requires a POST or DELETE."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381
-msgid "This method requires a POST."
-msgstr ""
-
-#: ../lib/util.php:164
+#: ../lib/util.php:147
 msgid "This page is not available in a media type you accept"
-msgstr "Questa pagina non è disponibile nel media type che hai accettato."
-
-#: ../actions/profilesettings.php:63
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107
-msgid "Timezone not selected."
-msgstr ""
+msgstr "Questa pagina non è disponibile in un tipo di supporto che tu accetti"
 
 #: ../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."
+"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 ""
-"Per iscriverti, tu puoi [entrare](%%action.login%%), oppure [registrare](%%"
-"action.register%%) un nuovo account. Se tu ne possiedi già uno su un [sito "
-"di microblogging compatibile](%%doc.openmublog%%), inserisci l'indirizzo del "
-"tuo profilo qui di seguito."
+"Per abbonarti puoi [eseguire l'accesso](%%action.login%%) oppure "
+"[registrare](%%action.register%%) un nuovo account. Se ne possiedi già uno "
+"su un [sito di micro-blog compatibile](%%doc.openmublog%%), inserisci "
+"l'indirizzo del tuo profilo qui di seguito."
 
-#: ../actions/twitapifriendships.php:163
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
-
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: ../actions/profilesettings.php:51
 msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL della tua homepage, blog o profilo su di un altro sito"
+msgstr "URL della tua pagina web, blog o profilo su un altro sito"
 
 #: ../actions/remotesubscribe.php:74
 msgid "URL of your profile on another compatible microblogging service"
-msgstr ""
-"URL del tuo profilo su di un altro servizio di microblogging compatibile"
+msgstr "URL del tuo profilo su un altro servizio di micro-blog compatibile"
 
-#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
-#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
 msgid "Unexpected form submission."
-msgstr "Inaspettato invio del modulo."
+msgstr "Invio del modulo inaspettato."
 
-#: ../actions/recoverpassword.php:276
+#: ../actions/recoverpassword.php:237
 msgid "Unexpected password reset."
-msgstr "Inaspettato reset della password"
-
-#: ../index.php:57
-msgid "Unknown action"
-msgstr ""
+msgstr "Ripristino della password inaspettato."
 
 #: ../actions/finishremotesubscribe.php:58
 msgid "Unknown version of OMB protocol."
-msgstr "Versione sconosciuta del protocollo OMB."
+msgstr "Versione del protocollo OMB sconosciuta."
 
-#: ../lib/util.php:269
-#, fuzzy
+#: ../lib/util.php:245 ../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 ""
-"Tranne dove indicato diversamente, i contenuti di questo sito sono copyright "
-"dei singoli utenti e sono disponibili sotto"
+"Se non indicato diversamente, i diritti d'autore dei contenuti di questo "
+"sito sono dei singoli utenti e sono disponibili sotto"
 
 #: ../actions/confirmaddress.php:48
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "Tipo di indirizzo non riconosciuto %s"
 
-#: ../actions/showstream.php:209
-#, fuzzy
+#: ../actions/showstream.php:193 ../actions/showstream.php:209
+#: actions/showstream.php:219
 msgid "Unsubscribe"
-msgstr "Annulla sottoscrizione"
+msgstr "Annulla abbonamento"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
 msgid "Unsupported OMB version"
 msgstr "Versione OMB non supportata"
 
@@ -1993,24 +1355,6 @@ msgstr "Versione OMB non supportata"
 msgid "Unsupported image file format."
 msgstr "Formato file immagine non supportato."
 
-#: ../lib/settingsaction.php:100
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:241
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:341
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
 #: ../actions/avatar.php:68
 msgid "Upload"
 msgstr "Carica"
@@ -2022,176 +1366,103 @@ msgid ""
 "site license, also. Use a picture that belongs to you and that you want to "
 "share."
 msgstr ""
-"Carica un nuovo \"avatar\" (immagine utente) qui. Non puoi modificare "
-"l'immagine dopo averla caricata, quindi sii sicuro che sia più o meno "
-"quadrata. Deve anche essere sotto la licenza del sito. Usa un'immagine che "
-"appartenga a te e che tu voglia condividere."
+"Carica qui una nuova immagine utente. Non puoi modificarla una volta "
+"caricata, quindi sii sicuro che sia più o meno quadrata. Deve anche essere "
+"rilasciata sotto la licenza del sito. Usa un'immagine che ti appartiene e "
+"che tu voglia condividere."
 
-#: ../lib/settingsaction.php:91
-#, fuzzy
-msgid "Upload a new profile image"
-msgstr "Non posso salvare le nuove informazioni relative al profilo"
-
-#: ../actions/invite.php:114
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
-msgstr ""
-
-#: ../actions/register.php:159 ../actions/register.php:162
+#  Femminile, è l'email
+#: ../actions/profilesettings.php:48 ../actions/register.php:182
 msgid "Used only for updates, announcements, and password recovery"
-msgstr "Usato solo per aggiornamenti, annunci e recupero password"
+msgstr "Usata solo per aggiornamenti, annunci e recupero password"
 
 #: ../actions/finishremotesubscribe.php:86
 msgid "User being listened to doesn't exist."
 msgstr "L'utente che intendi seguire non esiste."
 
 #: ../actions/all.php:41 ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:47 ../actions/replies.php:41
-#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
-#: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
-#: ../actions/twitapiusers.php:82
+#: ../actions/foaf.php:43 ../actions/replies.php:41
+#: ../actions/showstream.php:44
 msgid "User has no profile."
 msgstr "L'utente non ha un profilo."
 
-#: ../actions/remotesubscribe.php:71
-#, fuzzy
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
 msgid "User nickname"
-msgstr "Nickname dell'utente"
-
-#: ../actions/twitapiusers.php:75
-#, fuzzy
-msgid "User not found."
-msgstr "Non trovato OpenID memorizzato"
+msgstr "Soprannome dell'utente"
 
-#: ../actions/profilesettings.php:63
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../lib/util.php:1159
-#, fuzzy, php-format
+#: ../lib/util.php:969 ../lib/util.php:1159 lib/util.php:1293
+#, php-format
 msgid "What's up, %s?"
-msgstr "Cosa succede, %s?"
+msgstr "Cosa succede %s?"
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: ../actions/profilesettings.php:57
 msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Dove ti trovi, \"Città, Regione, Stato\""
+msgstr "Dove ti trovi, tipo \"città, regione, stato\""
 
-#: ../actions/updateprofile.php:128
+#: ../actions/updateprofile.php:127
 #, php-format
 msgid "Wrong image type for '%s'"
-msgstr "Tipo di immagine errata per '%s'"
+msgstr "Tipo di immagine errata per \"%s\""
 
-#: ../actions/updateprofile.php:123
+#: ../actions/updateprofile.php:122
 #, php-format
 msgid "Wrong size image at '%s'"
-msgstr "Dimensione dell'immagine sbagliata a '%s'"
-
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-msgid "Yes"
-msgstr ""
+msgstr "Dimensione dell'immagine sbagliata a \"%s\""
 
 #: ../actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr "Hai già questo OpenID!"
 
-#: ../actions/deletenotice.php:37
-msgid ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
-msgstr ""
-
-#: ../actions/recoverpassword.php:31
-#, fuzzy
+#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
 msgid "You are already logged in!"
-msgstr "Sei già collegato!"
-
-#: ../actions/invite.php:81
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr ""
+msgstr "Hai già effettuato l'accesso!"
 
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
 msgstr "Qui puoi cambiare la tua password. Scegline una buona!"
 
-#: ../actions/register.php:135
-#, fuzzy
+#: ../actions/register.php:164 ../actions/register.php:135
+#: actions/register.php:145
 msgid "You can create a new account to start posting notices."
-msgstr "Puoi creare un nuovo account per iniziare a postare."
-
-#: ../actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
+msgstr "Puoi creare un nuovo account per iniziare a inviare messaggi."
 
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
-msgstr ""
-"Puoi rimuovere un OpenID dal tuo account cliccando sul pulsante \"Rimuovi\""
+msgstr "Puoi rimuovere un OpenID dal tuo account facendo clic su \"Rimuovi\"."
 
-#: ../actions/imsettings.php:28
-#, fuzzy, php-format
+#: ../actions/imsettings.php:28 actions/imsettings.php:28
+#, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
-"Puoi inviare e ricevere notifiche attraverso Jabber/GTalk [messaggi "
-"istantanei](%%doc.im%%). Configura il tuo indirizzo di posta elettronica e "
-"le impostazioni qui di seguito."
+"Puoi inviare e ricevere messaggi attraverso i servizi di [messaggistica "
+"istantanea](%%doc.im%%) Jabber/GTalk. Configura il tuo indirizzo e le "
+"impostazioni qui di seguito."
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about you."
+"You can update your personal profile info here so people know more about "
+"you."
 msgstr ""
-"Puoi aggiornare le informazioni del tuo profilo personale qui così gli altri "
-"possono conoscere qualcosa in più di te"
+"Puoi aggiornare le informazioni del tuo profilo personale qui, così gli "
+"altri potranno conoscere qualcosa in più di te."
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
 msgid "You can use the local subscription!"
-msgstr "Puoi usare la sottoscrizione locale!"
+msgstr "Puoi usare l'abbonamento locale!"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
 msgid "You can't register if you don't agree to the license."
 msgstr "Non puoi registrarti se non accetti la licenza."
 
-#: ../actions/updateprofile.php:63
+#: ../actions/updateprofile.php:62
 msgid "You did not send us that profile"
-msgstr "Non ci hai mandato quel profilo"
-
-#: ../lib/mail.php:147
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
-"Send email to %2$s to post new messages.\n"
-"\n"
-"More email instructions at %3$s.\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s"
-msgstr ""
+msgstr "Non hai inviato quel profilo"
 
-#: ../actions/twitapistatuses.php:612
-msgid "You may not delete another user's status."
-msgstr ""
-
-#: ../actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr ""
-
-#: ../actions/invite.php:103
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
-
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:134
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Sei stato identificato. Inserisci una nuova password qui sotto."
 
@@ -2199,10 +1470,11 @@ msgstr "Sei stato identificato. Inserisci una nuova password qui sotto."
 msgid "Your OpenID URL"
 msgstr "Il tuo URL OpenID"
 
-#: ../actions/recoverpassword.php:164
-#, fuzzy
+#: ../actions/recoverpassword.php:149 ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
-msgstr "Il tuo nickname su questo server, o il tuo indirizzo email registrato."
+msgstr ""
+"Il tuo soprannome su questo server o il tuo indirizzo email "
+"registrato."
 
 #: ../actions/openidsettings.php:28
 #, php-format
@@ -2213,87 +1485,1484 @@ msgstr ""
 "[OpenID](%%doc.openid%%) ti permette di accedere a molti siti con lo stesso "
 "account. Gestisci i tuoi OpenID associati da qui."
 
-#: ../lib/util.php:943
+#: ../lib/util.php:814
 msgid "a few seconds ago"
 msgstr "pochi secondi fa"
 
-#: ../lib/util.php:955
+#: ../lib/util.php:826
 #, php-format
 msgid "about %d days ago"
 msgstr "circa %d giorni fa"
 
-#: ../lib/util.php:951
+#: ../lib/util.php:822
 #, php-format
 msgid "about %d hours ago"
 msgstr "circa %d ore fa"
 
-#: ../lib/util.php:947
+#: ../lib/util.php:818
 #, php-format
 msgid "about %d minutes ago"
 msgstr "circa %d minuti fa"
 
-#: ../lib/util.php:959
+#: ../lib/util.php:830
 #, php-format
 msgid "about %d months ago"
 msgstr "circa %d mesi fa"
 
-#: ../lib/util.php:953
+#: ../lib/util.php:824
 msgid "about a day ago"
 msgstr "circa un giorno fa"
 
-#: ../lib/util.php:945
+#: ../lib/util.php:816
 msgid "about a minute ago"
 msgstr "circa un minuto fa"
 
-#: ../lib/util.php:957
+#: ../lib/util.php:828
 msgid "about a month ago"
 msgstr "circa un mese fa"
 
-#: ../lib/util.php:961
+#: ../lib/util.php:832
 msgid "about a year ago"
 msgstr "circa un anno fa"
 
-#: ../lib/util.php:949
+#: ../lib/util.php:820
 msgid "about an hour ago"
-msgstr "circa un ora fa"
+msgstr "circa un'ora fa"
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-msgid "delete"
-msgstr ""
-
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117
+#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
+#: ../lib/stream.php:101
 msgid "in reply to..."
-msgstr "in risposta a ..."
+msgstr "in risposta a..."
 
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124
+#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
+#: ../lib/stream.php:108
 msgid "reply"
 msgstr "rispondi"
 
 #: ../actions/password.php:44
 msgid "same as password above"
-msgstr "Uguale alla password sopra"
+msgstr "stessa password di sopra"
 
-#: ../actions/twitapistatuses.php:755
-#, fuzzy
-msgid "unsupported file type"
-msgstr "Formato file immagine non supportato."
-
-#: ../lib/util.php:1309
-#, fuzzy
+#: ../lib/util.php:1127 ../lib/util.php:1309 lib/util.php:1443
 msgid "« After"
 msgstr "« Successivi"
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "Impossibile confermare l'email."
+#  Non ne sono sicuro, ma dovrebbe essere quello che si vede come descrizione da dove si è inviato il messaggio. Mettere 'da' non suona bene ('da web', 'da api'...), 'via' mi pare la soluzione migliore ('via web', 'via api', 'via Twhirl'...).
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+msgid " from "
+msgstr "via"
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr "%1$s / Aggiornamenti in risposta a %2$s"
+
+#  %USERNAME has invited you to join THEM on %site. You start with a singular and end with a plural???
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s ti invita a seguirlo su %2$s"
+
+#  link -> collegamento
+#  micro-blogging -> micro-blog
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+"%1$s ti invita a seguirlo su %2$s (%3$s).\n"
+"\n"
+"%2$s è un servizio di micro-blog che ti consente di rimanere aggiornato "
+"sulle persone che conosci e che ti interessano.\n"
+"\n"
+"Puoi anche condividere notizie che ti riguardano, i tuoi pensieri o la tua "
+"vita in rete con le persone che ti conoscono. È anche un ottimo strumento "
+"per conoscere nuove persone che condividono i tuoi stessi interessi.\n"
+"\n"
+"%1$s ha scritto:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Puoi vedere il profilo di %1$s su %2$s qui:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Se vuoi provare il servizio, fai clic sul collegamento qui sotto per "
+"accettare l'invito:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Se non è ciò che vuoi, ignora semplicemente questo messaggio. Grazie per "
+"aver letto questo invito e per il tuo tempo!\n"
+"\n"
+"Cordiali saluti, %2$s\n"
+
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr "%1$s aggiornamenti in risposta agli aggiornamenti da %2$s / %3$s"
+
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#  Solo una prova, se non sta bene si ripristina la versione vecchia, giusto per avere l'interfaccia il più tradotta possibile
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#, php-format
+msgid "%s public timeline"
+msgstr "attività pubblica di %s"
+
+#: ../lib/mail.php:206 lib/mail.php:212
+#, php-format
+msgid "%s status"
+msgstr "stato di %s"
+
+#  Solo una prova, se non sta bene si ripristina la versione vecchia, giusto per avere l'interfaccia il più tradotta possibile
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#, php-format
+msgid "%s timeline"
+msgstr "Attività di %s"
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#, php-format
+msgid "%s updates from everyone!"
+msgstr "Aggiornamenti di %s da tutti!"
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+"(Dovresti ricevere, entro breve, un messaggio email con istruzioni su come "
+"confermare il tuo indirizzo email.)"
+
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+"1-64 lettere minuscole o numeri, niente punteggiatura o spazi. "
+"Richiesto."
+
+#  Femminile, è la password
+#: ../actions/register.php:154 actions/register.php:168
+msgid "6 or more characters. Required."
+msgstr "6 o più caratteri. Richiesta."
+
+#: ../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 codice di conferma è stato inviato all'indirizzo di posta da te "
+"aggiunto. Controlla la tua casella di posta (e anche la posta indesiderata!) "
+"per il codice e le istruzioni su come usarlo."
+
+#: ../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 codice di conferma è stato inviato al numero di telefono da te aggiunto. "
+"Controlla la tua casella di posta (e anche la posta indesiderata!) per il "
+"codice e le istruzioni su come usarlo."
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55
+msgid "API method not found!"
+msgstr "Metodo delle API non trovato!"
+
+#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
+#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
+#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
+#: ../actions/twitapidirect_messages.php:49
+#: ../actions/twitapidirect_messages.php:56
+#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
+#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
+#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
+#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
+#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
+#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
+#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
+#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
+#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
+#: actions/twitapistatuses.php:690
+msgid "API method under construction."
+msgstr "Metodo delle API in lavorazione."
+
+#  we don't use 's' in plurals even from english words.
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+msgid "Add or remove OpenIDs"
+msgstr "Aggiungi o rimuovi OpenID"
+
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr "Indirizzi email di amici da invitare (uno per riga)"
+
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr "Sei sicuro di voler eliminare questo messaggio?"
+
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for "
+"non-humans)"
+msgstr ""
+"Abbonami automaticamente a chi si abbona ai miei messaggi (utile per i "
+"non-umani)"
+
+#: ../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 ""
+"Attesa la conferma per questo indirizzo. Controlla la tua casella di posta "
+"(e anche la posta indesiderata!) per un messaggio con ulteriori "
+"istruzioni."
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr "Attesa la conferma per questo numero di telefono."
+
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr "Impossibile eliminare questo messaggio."
+
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+msgid "Cannot normalize that email address"
+msgstr "Impossibile normalizzare l'indirizzo email"
+
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+msgid "Change email handling"
+msgstr "Modifica la gestione dell'email"
+
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr "Modifica la tua password"
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+msgid "Change your profile settings"
+msgstr "Modifica le impostazioni del tuo profilo"
+
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr "Codice di conferma"
+
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"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."
+msgstr ""
+"Congratulazioni %s! Benvenuto/a in %%%%site.name%%%%. Da qui ora "
+"puoi...\n"
+"\n"
+"* Visitare il [tuo profilo](%s) e inviare il tuo primo messaggio.\n"
+"*Aggiungere un [indirizzo Jabber/GTalk](%%%%action.imsettings%%%%) per usare "
+"quel servizio per inviare messaggi.\n"
+"*[Ricercare persone](%%%%action.peoplesearch%%%%) che potresti conoscere o "
+"che condividono i tuoi stessi interessi.\n"
+"* Aggiornare le [tue impostazioni](%%%%action.profilesettings%%%%) per "
+"fornire agli altri più informazioni su di te.\n"
+"* Leggere la [documentazione in rete](%%%%doc.help%%%%) per le "
+"caratteristiche che magari non hai ancora visto.\n"
+"\n"
+"Grazie per esserti iscritto/a e speriamo tu possa divertiti usando questo "
+"servizio."
+
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr "Impossibile seguire l'utente: %s è già nel tuo elenco."
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+msgid "Could not follow user: User not found."
+msgstr "Impossibile seguire l'utente: utente non trovato."
+
+#: ../lib/subs.php:54 lib/subs.php:61
+msgid "Could not subscribe other to you."
+msgstr "Impossibile abbonare altri a te."
+
+#: ../lib/subs.php:46 lib/subs.php:46
+msgid "Could not subscribe."
+msgstr "Impossibile abbonarsi."
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr "Impossibile aggiornare l'utente con l'indirizzo email confermato."
+
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+msgid "Couldn't find any statuses."
+msgstr "Impossibile trovare un qualsiasi stato."
+
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+msgid "Couldn't update user for autosubscribe."
+msgstr "Impossibile aggiornare l'utente per auto-abbonarsi."
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+msgid "Couldn't update user record."
+msgstr "Impossibile aggiornare i record dell'utente."
+
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "Numero di telefono attualmente confermato per gli SMS."
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr "Indirizzo email attualmente confermato."
+
+#: ../classes/Notice.php:72 classes/Notice.php:86
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "Errore del DB nell'inserire un hastag: %s"
+
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr "Elimina messaggio"
+
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr "Indirizzo email"
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr "Impostazioni email"
+
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr "Indirizzo email, del tipo \"NomeUtente@example.org\""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr "Indirizzi email"
+
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr "Inserisci il codice che hai ricevuto sul tuo telefono."
+
+#: ../actions/tag.php:55 actions/tag.php:55
+#, php-format
+msgid "Feed for tag %s"
+msgstr "Feed per l'etichetta %s"
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr "Ricerca contenuto dei messaggi"
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr "Ricerca persone in questo sito"
+
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+msgid "I want to post notices by email."
+msgstr "Voglio inviare i messaggi via email"
+
+#  Non è il massimo (Messaggistica Istantanea), ma non lo è nemmeno in inglese, questo tipo di abbreviazioni sarebbe da evitare sempre...
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+msgid "IM"
+msgstr "MI"
+
+#: ../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 hai dimenticato o perso la tua password, puoi fartene inviare una nuova "
+"per email all'indirizzo indicato nel tuo profilo."
+
+#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
+msgid "Incoming email"
+msgstr "Email di ricezione"
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+msgid "Incoming email address removed."
+msgstr "Indirizzo email di ricezione rimosso."
+
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "Indirizzo email non valido: %s"
+
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr "Inviti inviati"
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr "Inviti inviati ai seguenti indirizzi:"
+
+#: ../lib/util.php:306 lib/util.php:322
+msgid "Invite"
+msgstr "Invita"
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr "Invita nuovi utenti"
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Language"
+msgstr "Lingua"
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+msgid "Language is too long (max 50 chars)."
+msgstr "La lingua è troppo lunga (max 50 caratteri)"
+
+#: ../actions/register.php:166 actions/register.php:180
+msgid "Longer name, preferably your \"real\" name"
+msgstr "Nome completo, preferibilmente il tuo \"vero\" nome"
+
+#: ../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 ""
+"Crea un nuovo indirizzo email a cui inviare i messaggi, rimuove quello "
+"vecchio."
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr "Gestisci la ricezione delle email da %%site.name%%."
+
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+"Operatore di telefonia mobile. Se conosci un operatore che accetta gli SMS "
+"via email, ma non è elencato qui, scrivici a %s."
+
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr "Nuovo"
+
+#: ../lib/mail.php:144 lib/mail.php:144
+#, php-format
+msgid "New email address for posting to %s"
+msgstr "Nuovo indirizzo email per inviare messaggi a %s"
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+msgid "New incoming email address added."
+msgstr "Nuovo indirizzo email di ricezione aggiunto."
+
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+msgid "No"
+msgstr "No"
+
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr "Nessun operatore selezionato."
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr "Nessun codice inserito"
+
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+msgid "No email address."
+msgstr "Nessun indirizzo email."
+
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+msgid "No incoming email address."
+msgstr "Nessun indirizzo email di ricezione."
+
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr "Nessun numero di telefono."
+
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520
+msgid "No status found with that ID."
+msgstr "Nessuno stato trovato con quel ID."
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+msgid "No status with that ID found."
+msgstr "Nessuno stato con quel ID trovato."
+
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr "Nessun utente con quell'email o nome utente."
+
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+msgid "Not a registered user."
+msgstr "Non è un utente registrato."
+
+#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
+#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
+#: lib/twitterapi.php:502
+msgid "Not a supported data format."
+msgstr "Non è un formato di dati supportato."
+
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+msgid "Not a valid email address"
+msgstr "Non è un indirizzo email valido"
+
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+msgid "Not found"
+msgstr "Non trovato"
+
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr "Ricerca messaggi"
+
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr "Messaggi etichettati con %s"
+
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr "Puoi aggiungere un messaggio personale agli inviti."
+
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr "Persone"
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr "Ricerca persone"
+
+#: ../actions/invite.php:133 actions/invite.php:141
+msgid "Personal message"
+msgstr "Messaggio personale"
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "Numero di telefono, senza punteggiatura o spazi, con il prefisso"
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Preferred language"
+msgstr "Lingua preferita"
+
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Pubblica un MicroID per il mio indirizzo Jabber/GTalk"
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+msgid "Publish a MicroID for my email address."
+msgstr "Pubblica un MicroID per il mio indirizzo email"
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr "Etichette recenti"
+
+#: ../actions/register.php:28 actions/register.php:28
+msgid "Registration not allowed."
+msgstr "Registrazione non consentita."
+
+#: ../actions/register.php:200 actions/register.php:214
+msgid "Registration successful"
+msgstr "Registrazione riuscita"
+
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+msgid "SMS"
+msgstr "SMS"
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr "Numero di telefono per SMS"
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr "Impostazioni SMS"
+
+#: ../lib/mail.php:219 lib/mail.php:225
+msgid "SMS confirmation"
+msgstr "Conferma SMS"
+
+#  Femminile, è la password
+#: ../actions/register.php:156 actions/register.php:170
+msgid "Same as password above. Required."
+msgstr "Stessa password di sopra. Richiesta."
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr "Seleziona un operatore"
+
+#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
+#: actions/emailsettings.php:74 actions/smssettings.php:82
+msgid "Send email to this address to post new notices."
+msgstr "Invia le email a questo indirizzo per scrivere nuovi messaggi."
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr "Inviami avvisi di nuovi abbonamenti via email"
+
+#: ../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 ""
+"Inviami avvisi via SMS: comprendo che potrei incorrere in esorbitanti "
+"bollette da parte del mio operatore"
+
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr "Inviami le risposte delle persone a cui sono abbonato via Jabber/GTalk"
+
+#: ../actions/tag.php:60 actions/tag.php:60
+msgid "Showing most popular tags from the last week"
+msgstr "Le etichette più popolari dell'ultima settimana"
+
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr "Email di ricezione non consentita."
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr "Quella non è la tua email di ricezione."
+
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317
+msgid "Tags"
+msgstr "Etichette"
+
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
+msgid "Text"
+msgstr "Testo"
+
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+msgid "That email address already belongs to another user."
+msgstr "Qeull'indirizzo email appartiene già a un altro utente."
+
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+msgid "That is already your email address."
+msgstr "Quello è già il tuo indirizzo email."
+
+#  previous suggestion missed the dot
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr "Quello è già il tuo numero di telefono."
+
+#  previous suggestion missed the dot
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+msgid "That is not your email address."
+msgstr "Quello non è il tuo indirizzo email."
+
+#  previous suggestion missed the dot
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+msgid "That is not your phone number."
+msgstr "Quello non è il tuo numero di telefono."
+
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr "Quello è il numero di conferma errato."
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr "Quel numero di telefono appartiene già a un altro utente."
+
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+msgid "That's too long. Max notice size is 255 chars."
+msgstr "Troppo lungo. Massimo 255 caratteri."
+
+#: ../actions/invite.php:89 actions/invite.php:96
+msgid ""
+"These people are already users and you were automatically subscribed to "
+"them:"
+msgstr ""
+"Queste persone sono già utenti e sei stato automaticamente abbonato a "
+"loro:"
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511
+msgid "This method requires a POST or DELETE."
+msgstr "Questo metodo richiede POST o DELETE."
+
+#: ../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
+msgid "This method requires a POST."
+msgstr "Questo metodo richiede POST."
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "Timezone"
+msgstr "Fuso orario"
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+msgid "Timezone not selected."
+msgstr "Fuso orario non selezionato"
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+msgid "Two user ids or screen_names must be supplied."
+msgstr "Devono essere forniti due ID utente o nominativi."
+
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr "Azione sconosciuta"
+
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+msgid "Updates by SMS"
+msgstr "Aggiornamenti via SMS"
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+msgid "Updates by instant messenger (IM)"
+msgstr "Aggiornamenti via messaggistica istantanea (MI)"
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr "Aggiornamenti da %1$s e amici su %2$s!"
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "Aggiornamenti da %1$s su %2$s!"
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr "Carica una nuova immagine per il profilo"
+
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this "
+"service."
+msgstr ""
+"Usa questo modulo per invitare i tuoi amici e colleghi a usare questo "
+"servizio."
+
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr "Utente non trovato."
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "What timezone are you normally in?"
+msgstr "In che fuso orario risiedi solitamente?"
+
+#  "si" is the last musical note in the "do scale". "sì" is the correct Italian translation for "yes".
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+msgid "Yes"
+msgstr "Sì"
+
+#: ../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 ""
+"Stai per eliminare definitivamente un messaggio. Una volta fatto non sarà "
+"possibile recuperarlo."
+
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr "Sei già abbonato a questi utenti:"
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+msgid "You are not friends with the specified user."
+msgstr "Non sei amico dell'utente specificato."
+
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr "Puoi ricevere messaggi SMS attraverso l'email da %%site.name%%."
+
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+"Hai un nuovo indirizzo di invio su %1$s.\n"
+"\n"
+"Scrivi le email a %2$S per inviare nuovi messaggi.\n"
+"\n"
+"Puoi trovare maggiori informazioni presso %£4s.\n"
+"\n"
+"Cordiali saluti,\n"
+"%4$s"
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+msgid "You may not delete another user's status."
+msgstr "Non puoi eliminare lo stato di un altro utente."
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr "Devi eseguire l'accesso per invitare altri utenti a usare %s"
+
+#: ../actions/invite.php:103 actions/invite.php:110
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
+msgstr ""
+"Verrai avvisato quando i tuoi invitati accetteranno e si registreranno sul "
+"sito. Grazie per l'aiuto ad accrescere la comunità!"
+
+#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99
+msgid "delete"
+msgstr "elimina"
+
+#  wrong capitalization in previous suggestion
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+msgid "unsupported file type"
+msgstr "tipo di file non supportato"
+
+#: actions/deletenotice.php:74 actions/disfavor.php:43
+#: actions/emailsettings.php:127 actions/favor.php:45
+#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
+#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
+#: actions/openidsettings.php:123 actions/profilesettings.php:47
+#: actions/recoverpassword.php:282 actions/register.php:42
+#: actions/remotesubscribe.php:40 actions/smssettings.php:124
+#: actions/subscribe.php:44 actions/twittersettings.php:97
+#: actions/unsubscribe.php:41 actions/userauthorization.php:35
+msgid "There was a problem with your session token. Try again, please."
+msgstr "C'è stato un problema con il tuo token di sessione. Prova di nuovo."
+
+#: actions/disfavor.php:55
+msgid "This notice is not a favorite!"
+msgstr "Questo messaggio non è un preferito!"
+
+#: actions/disfavor.php:63
+msgid "Could not delete favorite."
+msgstr "Impossibile eliminare un preferito."
+
+#: actions/disfavor.php:72
+msgid "Favor"
+msgstr "Preferito"
+
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+"Inviami un'email quando qualcuno aggiunge un mio messaggio ai "
+"preferiti"
+
+#: actions/emailsettings.php:95
+msgid "Send me email when someone sends me a private message."
+msgstr "Inviami un'email quando qualcuno mi invia un messaggio privato"
+
+#: actions/favor.php:53 actions/twitapifavorites.php:142
+msgid "This notice is already a favorite!"
+msgstr "Questo messaggio è già un preferito!"
+
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132
+msgid "Could not create favorite."
+msgstr "Impossibile creare preferito."
+
+#: actions/favor.php:70
+msgid "Disfavor"
+msgstr "Non preferito"
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#, php-format
+msgid "%s favorite notices"
+msgstr "Messaggi preferiti di %s"
+
+#: actions/favoritesrss.php:64
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr "Feed dei messaggi preferiti di %s"
+
+#: actions/inbox.php:28
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr "Casella posta in arrivo di %s - pagina %d"
+
+#: actions/inbox.php:30
+#, php-format
+msgid "Inbox for %s"
+msgstr "Casella posta in arrivo di %s"
+
+#: actions/inbox.php:53
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+"Questa è la casella della tua posta in arrivo, contiene i messaggi privati "
+"ricevuti."
+
+#: actions/invite.php:178
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+msgstr ""
+"%1$s ti ha invitato a unirti a loro su %2$s (%3$s).\n"
+"\n"
+
+#: actions/login.php:104
+msgid "Automatically login in the future; "
+msgstr "Accesso automatico in futuro;"
+
+#: actions/login.php:122
+msgid "For security reasons, please re-enter your "
+msgstr "Per motivi di sicurezza reinserire la propria"
+
+#: actions/login.php:126
+msgid "Login with your username and password. "
+msgstr "Accedi con il tuo nome utente e password."
+
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+msgid "That's too long. Max message size is 140 chars."
+msgstr "Troppo lungo. Il massimo per un messaggio è 140 caratteri."
+
+#: actions/newmessage.php:65
+msgid "No recipient specified."
+msgstr "Nessun destinatario specificato."
+
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206
+msgid "You can't send a message to this user."
+msgstr "Non puoi inviare un messaggio a questo utente."
+
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly "
+"instead."
+msgstr "Non inviarti un messaggio, piuttosto ripetilo a voce dolcemente."
+
+#: actions/newmessage.php:108
+msgid "No such user"
+msgstr "Nessun tale utente"
+
+#: actions/newmessage.php:117
+msgid "New message"
+msgstr "Nuovo messaggio"
+
+#: actions/noticesearch.php:95
+msgid "Notice without matching profile"
+msgstr "Messaggi senza un profilo corrispondente"
+
+#: actions/openidsettings.php:28
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr "[OpenID](%%doc.openid%%) ti consente di collegarti a molti siti"
+
+#: actions/openidsettings.php:46
+msgid "If you want to add an OpenID to your account, "
+msgstr "Se vuoi aggiungere un OpenID al tuo account,"
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr "Rimuovere il tuo unico OpenID ti impedirebbe di eseguire l'accesso!"
+
+#: actions/openidsettings.php:87
+msgid "You can remove an OpenID from your account "
+msgstr "Puoi rimuovere un OpenID dal tuo account"
+
+#: actions/outbox.php:28
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr "Casella posta inviata di %s - pagina %d"
+
+#: actions/outbox.php:30
+#, php-format
+msgid "Outbox for %s"
+msgstr "Casella posta inviata di %s"
+
+#: actions/outbox.php:53
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+"Questa è la casella della tua posta inviata, contiene i messaggi privati "
+"che hai inviato."
+
+#: actions/peoplesearch.php:28
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+msgstr "Ricerca persone su %%site.name%% per nome, ubicazione o interessi."
+
+#: actions/profilesettings.php:27
+msgid "You can update your personal profile info here "
+msgstr "Qui puoi aggiornare il tuo profilo personale"
+
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+msgid "User without matching profile"
+msgstr "Utente senza profilo corrispondente"
+
+#: actions/recoverpassword.php:91
+msgid "This confirmation code is too old. "
+msgstr "Questo codice di conferma è troppo vecchio."
+
+#: actions/recoverpassword.php:141
+msgid "If you've forgotten or lost your"
+msgstr "Se hai dimenticato o perso la tua"
+
+#: actions/recoverpassword.php:154
+msgid "You've been identified. Enter a "
+msgstr "Sei ora identificato. Inserisci un"
+
+#: actions/recoverpassword.php:169
+msgid "Your nickname on this server, "
+msgstr "Il tuo soprannome su questo server,"
+
+#: actions/recoverpassword.php:271
+msgid "Instructions for recovering your password "
+msgstr "Istruzioni per il recupero della password"
+
+#: actions/recoverpassword.php:327
+msgid "New password successfully saved. "
+msgstr "Nuova password salvata con successo."
+
+#: actions/register.php:95
+msgid "Password must be 6 or more characters."
+msgstr "La password deve essere di 6 o più caratteri."
+
+#: actions/register.php:216
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
+msgstr ""
+"Congratulazioni, %s! Benvenuto su %%%%site.name%%%%. Ora potresti "
+"voler..."
+
+#: actions/register.php:227
+msgid "(You should receive a message by email momentarily, with "
+msgstr "(Dovresti ricevere, entro breve, un messaggio email con"
+
+#: actions/remotesubscribe.php:51
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
+msgstr "Per abbonarti, puoi [eseguire l'accesso](%%action.login%%),"
+
+#: actions/showfavorites.php:61
+#, php-format
+msgid "Feed for favorites of %s"
+msgstr "Feed dei preferiti di %s"
+
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+msgid "Could not retrieve favorite notices."
+msgstr "Impossibile recuperare i messaggi favoriti."
+
+#: actions/showmessage.php:33
+msgid "No such message."
+msgstr "Nessun tale messaggio."
+
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
+msgstr "Solo mittente e destinatario possono leggere questo messaggio."
+
+#: actions/showmessage.php:61
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr "Messaggio a %1$s su %2$s"
+
+#: actions/showmessage.php:66
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr "Messaggio da %1$s su %2$s"
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr "Invia un messaggio"
+
+#: actions/smssettings.php:312
+#, php-format
+msgid "Mobile carrier for your phone. "
+msgstr "Operatore mobile del tuo telefono."
+
+#: actions/twitapidirect_messages.php:76
+#, php-format
+msgid "Direct messages to %s"
+msgstr "Messaggi diretti a %s"
+
+#: actions/twitapidirect_messages.php:77
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr "Tutti i messaggi diretti inviati a %s"
+
+#: actions/twitapidirect_messages.php:81
+msgid "Direct Messages You've Sent"
+msgstr "Messaggi diretti inviati"
+
+#: actions/twitapidirect_messages.php:82
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr "Tutti i messaggi diretti inviati da %s"
+
+#: actions/twitapidirect_messages.php:128
+msgid "No message text!"
+msgstr "Nessun testo nel messaggio!"
+
+#: actions/twitapidirect_messages.php:138
+msgid "Recipient user not found."
+msgstr "Utente destinatario non trovato."
+
+#: actions/twitapidirect_messages.php:141
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr "Non puoi inviare messaggi diretti a utenti che non sono amici tuoi."
+
+#: actions/twitapifavorites.php:92
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr "%s / Preferiti da %s"
+
+#: actions/twitapifavorites.php:95
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr "%s aggiornamenti preferiti da %s / %s"
+
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#, php-format
+msgid "%s added your notice as a favorite"
+msgstr "%s ha aggiunto il tuo messaggio tra i suoi preferiti"
+
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+msgstr ""
+"%1$s ha appena aggiunto il tuo messaggio da %2$s tra i suoi preferiti.\n"
+"\n"
+
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+msgstr ""
+"Aggiungi il tuo account Twitter per inviare automaticamente i tuoi messaggi "
+"su Twitter,"
+
+#: actions/twittersettings.php:41
+msgid "Twitter settings"
+msgstr "Impostazioni Twitter"
+
+#: actions/twittersettings.php:48
+msgid "Twitter Account"
+msgstr "Account Twitter"
+
+#: actions/twittersettings.php:56
+msgid "Current verified Twitter account."
+msgstr "Account Twitter attualmente verificato."
+
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr "Nome utente di Twitter"
+
+#: actions/twittersettings.php:65
+msgid "No spaces, please."
+msgstr "Niente spazi, grazie."
+
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr "Password di Twitter"
+
+#: actions/twittersettings.php:72
+msgid "Automatically send my notices to Twitter."
+msgstr "Invia automaticamente i miei messaggi a Twitter"
+
+#: actions/twittersettings.php:75
+msgid "Send local \"@\" replies to Twitter."
+msgstr "Invia le risposte \"@\" locali a Twitter"
+
+#: actions/twittersettings.php:78
+msgid "Subscribe to my Twitter friends here."
+msgstr "Abbonami ai miei amici di Twitter"
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+"Il nome utente deve contenere solo numeri, lettere maiuscole e minuscole e "
+"underscore (_) (max 15 caratteri)."
+
+#: actions/twittersettings.php:128
+msgid "Could not verify your Twitter credentials!"
+msgstr "Impossibile verificare le tue credenziali di Twitter!"
+
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgstr "Impossibile ottenere informazioni sull'account \"%s\" da Twitter."
+
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+msgid "Unable to save your Twitter settings!"
+msgstr "Impossibile salvare le tue impostazioni di Twitter!"
+
+#: actions/twittersettings.php:174
+msgid "Twitter settings saved."
+msgstr "Impostazioni di Twitter salvate."
+
+#: actions/twittersettings.php:192
+msgid "That is not your Twitter account."
+msgstr "Quello non è il tuo account Twitter."
+
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+msgid "Couldn't remove Twitter user."
+msgstr "Impossibile rimuovere l'utente Twitter."
+
+#: actions/twittersettings.php:212
+msgid "Twitter account removed."
+msgstr "Account Twitter rimosso."
+
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+msgid "Couldn't save Twitter preferences."
+msgstr "Impossibile salvare le preferenze di Twitter."
+
+#: actions/twittersettings.php:245
+msgid "Twitter preferences saved."
+msgstr "Preferenze di Twitter salvate."
+
+#: actions/userauthorization.php:84
+msgid "Please check these details to make sure "
+msgstr "Controlla questi dettagli per assicurarti"
+
+#: actions/userauthorization.php:324
+msgid "The subscription has been authorized, but no "
+msgstr "L'abbonamento è stato autorizzato, ma non"
+
+#: actions/userauthorization.php:334
+msgid "The subscription has been rejected, but no "
+msgstr "L'abbonamento è stato rifiutato, ma non"
+
+#: classes/Channel.php:113
+msgid "Command results"
+msgstr "Risultati comando"
+
+#: classes/Channel.php:148
+msgid "Command complete"
+msgstr "Comando completato"
+
+#: classes/Channel.php:158
+msgid "Command failed"
+msgstr "Comando non riuscito"
+
+#: classes/Command.php:39
+msgid "Sorry, this command is not yet implemented."
+msgstr "Questo comando non è ancora implementato"
+
+#: classes/Command.php:96
+#, php-format
+msgid "Subscriptions: %1$s\n"
+msgstr "Abbonamenti: %1$s\n"
+
+#: classes/Command.php:125 classes/Command.php:242
+msgid "User has no last notice"
+msgstr "L'utente non ha un ultimo messaggio"
+
+#: classes/Command.php:146
+msgid "Notice marked as fave."
+msgstr "Messaggio indicato come preferito."
+
+#: classes/Command.php:166
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#: classes/Command.php:169
+#, php-format
+msgid "Fullname: %s"
+msgstr "Nome completo: %s"
+
+#: classes/Command.php:172
+#, php-format
+msgid "Location: %s"
+msgstr "Ubicazione: %s"
+
+#: classes/Command.php:175
+#, php-format
+msgid "Homepage: %s"
+msgstr "Pagina web: %s"
+
+#: classes/Command.php:178
+#, php-format
+msgid "About: %s"
+msgstr "Informazioni: %s"
+
+#: classes/Command.php:200
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr "Messaggio troppo lungo - massimo 140 caratteri, inviati %d"
+
+#: classes/Command.php:214
+#, php-format
+msgid "Direct message to %s sent"
+msgstr "Messaggio diretto a %s inviato"
+
+#: classes/Command.php:216
+msgid "Error sending direct message."
+msgstr "Errore nell'inviare il messaggio diretto."
+
+#: classes/Command.php:263
+msgid "Specify the name of the user to subscribe to"
+msgstr "Specifica il nome dell'utente a cui abbonarti"
+
+#: classes/Command.php:270
+#, php-format
+msgid "Subscribed to %s"
+msgstr "Abbonato a %s"
+
+#: classes/Command.php:288
+msgid "Specify the name of the user to unsubscribe from"
+msgstr "Specifica il nome dell'utente da cui annullare l'abbonamento"
+
+#: classes/Command.php:295
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr "Abbonamento a %s annullato"
+
+#: classes/Command.php:310 classes/Command.php:330
+msgid "Command not yet implemented."
+msgstr "Comando non ancora implementato."
+
+#: classes/Command.php:313
+msgid "Notification off."
+msgstr "Notifiche disattivate."
+
+#: classes/Command.php:315
+msgid "Can't turn off notification."
+msgstr "Impossibile disattivare le notifiche."
+
+#: classes/Command.php:333
+msgid "Notification on."
+msgstr "Notifiche attivate."
+
+#: classes/Command.php:335
+msgid "Can't turn on notification."
+msgstr "Impossibile attivare le notifiche."
+
+#: classes/Command.php:344
+msgid "Commands:\n"
+msgstr "Comandi:\n"
+
+#: classes/Message.php:53
+msgid "Could not insert message."
+msgstr "Impossibile inserire messaggio."
+
+#: classes/Message.php:63
+msgid "Could not update message with new URI."
+msgstr "Impossibile aggiornare il messaggio con il nuovo URI."
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr "Utente senza profilo corrispondente nel sistema."
+
+#: lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
+"Hai un nuovo indirizzo di ricezione su %1$s.\n"
+"\n"
+
+#: lib/mail.php:249
+#, php-format
+msgid "New private message from %s"
+msgstr "Nuovo messaggio privato da %s"
+
+#: lib/mail.php:253
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+msgstr ""
+"%1$s (%2$s) ti ha inviato un messaggio privato:\n"
+"\n"
+
+#: lib/mailbox.php:43
+msgid "Only the user can read their own mailboxes."
+msgstr "Solo l'utente può leggere la propria casella di posta."
+
+#: lib/openid.php:195
+msgid "This form should automatically submit itself. "
+msgstr "Questo modulo dovrebbe inviarsi automaticamente."
+
+#: lib/personal.php:65
+msgid "Favorites"
+msgstr "Preferiti"
+
+#: lib/personal.php:66
+#, php-format
+msgid "%s's favorite notices"
+msgstr "Messaggi preferiti di %s"
+
+#: lib/personal.php:66
+msgid "User"
+msgstr "Utente"
+
+#: lib/personal.php:75
+msgid "Inbox"
+msgstr "In arrivo"
+
+#: lib/personal.php:76
+msgid "Your incoming messages"
+msgstr "I tuoi messaggi in arrivo"
+
+#: lib/personal.php:80
+msgid "Outbox"
+msgstr "Inviati"
+
+#: lib/personal.php:81
+msgid "Your sent messages"
+msgstr "I tuoi messaggi inviati"
+
+#: lib/settingsaction.php:99
+msgid "Twitter"
+msgstr "Twitter"
 
-#~ msgid "Couldn't create subscription."
-#~ msgstr "Impossibile creare la sottoscrizione."
+#: lib/settingsaction.php:100
+msgid "Twitter integration options"
+msgstr "Opzioni di integrazione Twitter"
 
-#, fuzzy
-#~ msgid "Error inserting notice"
-#~ msgstr "Errore inserimento post"
+#: lib/util.php:1718
+msgid "To"
+msgstr "A"
 
-#~ msgid "Public"
-#~ msgstr "Pubblico"
+#: scripts/maildaemon.php:45
+msgid "Could not parse message."
+msgstr "Impossibile analizzare il messaggio."
diff --git a/locale/ja_JP/LC_MESSAGES/laconica.mo b/locale/ja_JP/LC_MESSAGES/laconica.mo
new file mode 100644
index 000000000..8dbab6632
--- /dev/null
+++ 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 6792dd8af..835b9941c 100644
--- a/locale/ja_JP/LC_MESSAGES/laconica.po
+++ b/locale/ja_JP/LC_MESSAGES/laconica.po
@@ -1,10 +1,19 @@
+# #-#-#-#-#  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.
 # Toshiya TSURU <turutosiya@gmail.com>, 2008
 #
+# #-#-#-#-#  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.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-07-14 21:07+1200\n"
@@ -13,6 +22,16 @@ msgstr ""
 "Language-Team: Japanese <turutosiya+laconica@gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 7bit\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../actions/noticesearchrss.php:64
@@ -591,45 +610,13 @@ msgstr "ログイン"
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "[OpenID](%%doc.openid%%) �ログイン。"
 
-#: ../actions/login.php:122
+#: ../actions/login.php:122 ../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 ""
-"ã"
-"ƒ"
-"¦"
-"ã"
-"ƒ"
-"¼"
-"ã"
-"‚"
-"¶"
-"å"
-"�"
-"�"
-"ã"
-"€"
-"�"
-"ã"
-"ƒ"
-"‘"
-"ã"
-"‚"
-"¹"
-"ã"
-"ƒ"
-"¯"
-"ã"
-"ƒ"
-"¼"
-"ã"
-"ƒ"
-"‰"
-"ã"
-"�§ãƒ­ã‚°ã‚¤ãƒ³ã€‚ユーザå��ã‚’ã�ŠæŒ�ã�¡ã�§ç„¡ã�‘ã‚Œã�°[登録](%%action.register%%), ã‚‚ã�—ã��ã�¯ [OpenID](%%action.openidlogin%%) ã�§ãƒ­ã‚°ã‚¤ãƒ³ã€‚ "
 
 #: ../lib/util.php:284
 msgid "Logout"
@@ -1187,48 +1174,19 @@ msgstr "アドレス \"%s\" ã�¯ã�‚ã�ªã�Ÿã�®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã�¨ã�—ã�¦æ‰¿èª�ã�•ã‚Œã
 msgid "The address was removed."
 msgstr "アドレス�削除�れ���。"
 
-#: ../actions/userauthorization.php:311
+#: ../actions/userauthorization.php:311 ../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 ""
-"ã"
-"‚"
-"µ"
-"ã"
-"ƒ"
-"–"
-"ã"
-"‚"
-"¹"
-"ã"
-"‚"
-"¯"
-"ã"
-"ƒ"
-"ª"
-"ã"
-"ƒ"
-"—"
-"ã"
-"‚"
-"·"
-"ã"
-"ƒ"
-"§"
-"ン�許��れ�����コール�ックURL�渡�れ����ん。サブスクリプションを許��る方法�����サイト�説明を�覧����。����サブスクリプショントークン� : "
-
-#: ../actions/userauthorization.php:321
+
+#: ../actions/userauthorization.php:321 ../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 ""
-"ã"
-"‚"
-"µ"
-"ブスクリプション�拒��れ�����コール�ックURL�渡�れ����ん。サブスクリプションを拒��る方法�����サイト�説明を�覧����。"
 
 #: ../actions/subscribers.php:35
 #, php-format
@@ -1509,3 +1467,1308 @@ msgstr "上�パスワード���"
 #: ../lib/util.php:1127
 msgid "« After"
 msgstr "<< �"
+
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+msgid " from "
+msgstr ""
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
+
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#, php-format
+msgid "%s public timeline"
+msgstr ""
+
+#: ../lib/mail.php:206 lib/mail.php:212
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/register.php:154 actions/register.php:168
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55
+msgid "API method not found!"
+msgstr ""
+
+#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
+#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
+#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
+#: ../actions/twitapidirect_messages.php:49
+#: ../actions/twitapidirect_messages.php:56
+#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
+#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
+#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
+#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
+#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
+#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
+#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
+#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
+#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
+#: actions/twitapistatuses.php:690
+msgid "API method under construction."
+msgstr ""
+
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
+
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for "
+"non-humans)"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
+
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr ""
+
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+msgid "Change email handling"
+msgstr ""
+
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+msgid "Change your profile settings"
+msgstr ""
+
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+msgid "Could not follow user: User not found."
+msgstr ""
+
+#: ../lib/subs.php:54 lib/subs.php:61
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: ../lib/subs.php:46 lib/subs.php:46
+msgid "Could not subscribe."
+msgstr ""
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+msgid "Couldn't update user record."
+msgstr ""
+
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr ""
+
+#: ../classes/Notice.php:72 classes/Notice.php:86
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr ""
+
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr ""
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr ""
+
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: ../actions/tag.php:55 actions/tag.php:55
+#, php-format
+msgid "Feed for tag %s"
+msgstr ""
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr ""
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr ""
+
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+msgid "I want to post notices by email."
+msgstr ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+msgid "IM"
+msgstr ""
+
+#: ../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
+msgid "Incoming email"
+msgstr ""
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+msgid "Incoming email address removed."
+msgstr ""
+
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Language"
+msgstr ""
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+msgid "Language is too long (max 50 chars)."
+msgstr ""
+
+#: ../actions/register.php:166 actions/register.php:180
+msgid "Longer name, preferably your \"real\" name"
+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 ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr ""
+
+#: ../lib/mail.php:144 lib/mail.php:144
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+msgid "New incoming email address added."
+msgstr ""
+
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+msgid "No"
+msgstr ""
+
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr ""
+
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+msgid "No email address."
+msgstr ""
+
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+msgid "No incoming email address."
+msgstr ""
+
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+msgid "No status with that ID found."
+msgstr ""
+
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+msgid "Not a registered user."
+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
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+msgid "Not found"
+msgstr ""
+
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr ""
+
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
+
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr ""
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr ""
+
+#: ../actions/invite.php:133 actions/invite.php:141
+msgid "Personal message"
+msgstr ""
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Preferred language"
+msgstr ""
+
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/register.php:28 actions/register.php:28
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+msgid "Registration successful"
+msgstr ""
+
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/register.php:156 actions/register.php:170
+msgid "Same as password above. Required."
+msgstr ""
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr ""
+
+#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
+#: actions/emailsettings.php:74 actions/smssettings.php:82
+msgid "Send email to this address to post new notices."
+msgstr ""
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../actions/tag.php:60 actions/tag.php:60
+msgid "Showing most popular tags from the last week"
+msgstr ""
+
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317
+msgid "Tags"
+msgstr ""
+
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
+msgid "Text"
+msgstr ""
+
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+msgid "That is not your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+msgid "That is not your phone number."
+msgstr ""
+
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/invite.php:89 actions/invite.php:96
+msgid ""
+"These people are already users and you were automatically subscribed to "
+"them:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511
+msgid "This method requires a POST or 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
+msgid "This method requires a POST."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+msgid "Timezone not selected."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+msgid "Two user ids or screen_names must be supplied."
+msgstr ""
+
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this "
+"service."
+msgstr ""
+
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+msgid "Yes"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+msgid "You are not friends with the specified user."
+msgstr ""
+
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr ""
+
+#: ../actions/invite.php:103 actions/invite.php:110
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
+msgstr ""
+
+#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99
+msgid "delete"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+msgid "unsupported file type"
+msgstr ""
+
+#: actions/deletenotice.php:74 actions/disfavor.php:43
+#: actions/emailsettings.php:127 actions/favor.php:45
+#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
+#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
+#: actions/openidsettings.php:123 actions/profilesettings.php:47
+#: actions/recoverpassword.php:282 actions/register.php:42
+#: actions/remotesubscribe.php:40 actions/smssettings.php:124
+#: actions/subscribe.php:44 actions/twittersettings.php:97
+#: actions/unsubscribe.php:41 actions/userauthorization.php:35
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/disfavor.php:55
+msgid "This notice is not a favorite!"
+msgstr ""
+
+#: actions/disfavor.php:63
+msgid "Could not delete favorite."
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Favor"
+msgstr ""
+
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+
+#: actions/emailsettings.php:95
+msgid "Send me email when someone sends me a private message."
+msgstr ""
+
+#: actions/favor.php:53 actions/twitapifavorites.php:142
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132
+msgid "Could not create favorite."
+msgstr ""
+
+#: actions/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#, php-format
+msgid "%s favorite notices"
+msgstr ""
+
+#: actions/favoritesrss.php:64
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr ""
+
+#: actions/inbox.php:28
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+
+#: actions/invite.php:178
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+msgstr ""
+
+#: actions/login.php:104
+msgid "Automatically login in the future; "
+msgstr ""
+
+#: actions/login.php:122
+msgid "For security reasons, please re-enter your "
+msgstr ""
+
+#: actions/login.php:126
+msgid "Login with your username and password. "
+msgstr ""
+
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+msgid "That's too long. Max message size is 140 chars."
+msgstr ""
+
+#: actions/newmessage.php:65
+msgid "No recipient specified."
+msgstr ""
+
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206
+msgid "You can't send a message to this user."
+msgstr ""
+
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly "
+"instead."
+msgstr ""
+
+#: actions/newmessage.php:108
+msgid "No such user"
+msgstr ""
+
+#: actions/newmessage.php:117
+msgid "New message"
+msgstr ""
+
+#: actions/noticesearch.php:95
+msgid "Notice without matching profile"
+msgstr ""
+
+#: actions/openidsettings.php:28
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr ""
+
+#: actions/openidsettings.php:46
+msgid "If you want to add an OpenID to your account, "
+msgstr ""
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr ""
+
+#: actions/openidsettings.php:87
+msgid "You can remove an OpenID from your account "
+msgstr ""
+
+#: actions/outbox.php:28
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr ""
+
+#: actions/outbox.php:30
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#: actions/outbox.php:53
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+
+#: actions/peoplesearch.php:28
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+msgstr ""
+
+#: actions/profilesettings.php:27
+msgid "You can update your personal profile info here "
+msgstr ""
+
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+msgid "User without matching profile"
+msgstr ""
+
+#: actions/recoverpassword.php:91
+msgid "This confirmation code is too old. "
+msgstr ""
+
+#: actions/recoverpassword.php:141
+msgid "If you've forgotten or lost your"
+msgstr ""
+
+#: actions/recoverpassword.php:154
+msgid "You've been identified. Enter a "
+msgstr ""
+
+#: actions/recoverpassword.php:169
+msgid "Your nickname on this server, "
+msgstr ""
+
+#: actions/recoverpassword.php:271
+msgid "Instructions for recovering your password "
+msgstr ""
+
+#: actions/recoverpassword.php:327
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95
+msgid "Password must be 6 or more characters."
+msgstr ""
+
+#: actions/register.php:216
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
+msgstr ""
+
+#: actions/register.php:227
+msgid "(You should receive a message by email momentarily, with "
+msgstr ""
+
+#: actions/remotesubscribe.php:51
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
+msgstr ""
+
+#: actions/showfavorites.php:61
+#, php-format
+msgid "Feed for favorites of %s"
+msgstr ""
+
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+msgid "Could not retrieve favorite notices."
+msgstr ""
+
+#: actions/showmessage.php:33
+msgid "No such message."
+msgstr ""
+
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
+msgstr ""
+
+#: actions/showmessage.php:61
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr ""
+
+#: actions/showmessage.php:66
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr ""
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr ""
+
+#: actions/smssettings.php:312
+#, php-format
+msgid "Mobile carrier for your phone. "
+msgstr ""
+
+#: actions/twitapidirect_messages.php:76
+#, php-format
+msgid "Direct messages to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:77
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:81
+msgid "Direct Messages You've Sent"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:82
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:128
+msgid "No message text!"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:138
+msgid "Recipient user not found."
+msgstr ""
+
+#: actions/twitapidirect_messages.php:141
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
+#: actions/twitapifavorites.php:92
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr ""
+
+#: actions/twitapifavorites.php:95
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr ""
+
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#, php-format
+msgid "%s added your notice as a favorite"
+msgstr ""
+
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+msgstr ""
+
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+msgstr ""
+
+#: actions/twittersettings.php:41
+msgid "Twitter settings"
+msgstr ""
+
+#: actions/twittersettings.php:48
+msgid "Twitter Account"
+msgstr ""
+
+#: actions/twittersettings.php:56
+msgid "Current verified Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr ""
+
+#: actions/twittersettings.php:65
+msgid "No spaces, please."
+msgstr ""
+
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr ""
+
+#: actions/twittersettings.php:72
+msgid "Automatically send my notices to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:75
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:78
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+
+#: actions/twittersettings.php:128
+msgid "Could not verify your Twitter credentials!"
+msgstr ""
+
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+msgid "Unable to save your Twitter settings!"
+msgstr ""
+
+#: actions/twittersettings.php:174
+msgid "Twitter settings saved."
+msgstr ""
+
+#: actions/twittersettings.php:192
+msgid "That is not your Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+msgid "Couldn't remove Twitter user."
+msgstr ""
+
+#: actions/twittersettings.php:212
+msgid "Twitter account removed."
+msgstr ""
+
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+msgid "Couldn't save Twitter preferences."
+msgstr ""
+
+#: actions/twittersettings.php:245
+msgid "Twitter preferences saved."
+msgstr ""
+
+#: actions/userauthorization.php:84
+msgid "Please check these details to make sure "
+msgstr ""
+
+#: actions/userauthorization.php:324
+msgid "The subscription has been authorized, but no "
+msgstr ""
+
+#: actions/userauthorization.php:334
+msgid "The subscription has been rejected, but no "
+msgstr ""
+
+#: classes/Channel.php:113
+msgid "Command results"
+msgstr ""
+
+#: classes/Channel.php:148
+msgid "Command complete"
+msgstr ""
+
+#: classes/Channel.php:158
+msgid "Command failed"
+msgstr ""
+
+#: classes/Command.php:39
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: classes/Command.php:96
+#, php-format
+msgid "Subscriptions: %1$s\n"
+msgstr ""
+
+#: classes/Command.php:125 classes/Command.php:242
+msgid "User has no last notice"
+msgstr ""
+
+#: classes/Command.php:146
+msgid "Notice marked as fave."
+msgstr ""
+
+#: classes/Command.php:166
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr ""
+
+#: classes/Command.php:169
+#, php-format
+msgid "Fullname: %s"
+msgstr ""
+
+#: classes/Command.php:172
+#, php-format
+msgid "Location: %s"
+msgstr ""
+
+#: classes/Command.php:175
+#, php-format
+msgid "Homepage: %s"
+msgstr ""
+
+#: classes/Command.php:178
+#, php-format
+msgid "About: %s"
+msgstr ""
+
+#: classes/Command.php:200
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
+
+#: classes/Command.php:214
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
+
+#: classes/Command.php:216
+msgid "Error sending direct message."
+msgstr ""
+
+#: classes/Command.php:263
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: classes/Command.php:270
+#, php-format
+msgid "Subscribed to %s"
+msgstr ""
+
+#: classes/Command.php:288
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
+
+#: classes/Command.php:295
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr ""
+
+#: classes/Command.php:310 classes/Command.php:330
+msgid "Command not yet implemented."
+msgstr ""
+
+#: classes/Command.php:313
+msgid "Notification off."
+msgstr ""
+
+#: classes/Command.php:315
+msgid "Can't turn off notification."
+msgstr ""
+
+#: classes/Command.php:333
+msgid "Notification on."
+msgstr ""
+
+#: classes/Command.php:335
+msgid "Can't turn on notification."
+msgstr ""
+
+#: classes/Command.php:344
+msgid "Commands:\n"
+msgstr ""
+
+#: classes/Message.php:53
+msgid "Could not insert message."
+msgstr ""
+
+#: classes/Message.php:63
+msgid "Could not update message with new URI."
+msgstr ""
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr ""
+
+#: lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:249
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:253
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+msgstr ""
+
+#: lib/mailbox.php:43
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/openid.php:195
+msgid "This form should automatically submit itself. "
+msgstr ""
+
+#: lib/personal.php:65
+msgid "Favorites"
+msgstr ""
+
+#: lib/personal.php:66
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
+#: lib/personal.php:66
+msgid "User"
+msgstr ""
+
+#: lib/personal.php:75
+msgid "Inbox"
+msgstr ""
+
+#: lib/personal.php:76
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personal.php:80
+msgid "Outbox"
+msgstr ""
+
+#: lib/personal.php:81
+msgid "Your sent messages"
+msgstr ""
+
+#: lib/settingsaction.php:99
+msgid "Twitter"
+msgstr ""
+
+#: lib/settingsaction.php:100
+msgid "Twitter integration options"
+msgstr ""
+
+#: lib/util.php:1718
+msgid "To"
+msgstr ""
+
+#: scripts/maildaemon.php:45
+msgid "Could not parse message."
+msgstr ""
diff --git a/locale/ko/LC_MESSAGES/laconica.mo b/locale/ko/LC_MESSAGES/laconica.mo
index ed25f58e3..c97fe45df 100644
--- a/locale/ko/LC_MESSAGES/laconica.mo
+++ b/locale/ko/LC_MESSAGES/laconica.mo
diff --git a/locale/ko/LC_MESSAGES/laconica.po b/locale/ko/LC_MESSAGES/laconica.po
index a72703942..971ac3df7 100644
--- a/locale/ko/LC_MESSAGES/laconica.po
+++ b/locale/ko/LC_MESSAGES/laconica.po
@@ -6,9 +6,20 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-27 14:57-0400\n"
+"POT-Creation-Date: 2008-07-14 21:07+1200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-10-13 21:07+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,67 +27,26 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
+#: ../actions/register.php:191 actions/finishopenidlogin.php:88
+#: actions/register.php:205
 msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr ""
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-msgid " from "
-msgstr ""
-
-#: ../actions/twitapistatuses.php:478
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/invite.php:168
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
+" except this private data: password, email address, IM address, phone "
+"number."
 msgstr ""
 
-#: ../lib/mail.php:124
+#: ../actions/subscribe.php:84 ../lib/mail.php:124 lib/mail.php:124
+#: lib/mail.php:126
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr ""
 
-#: ../lib/mail.php:126
+#: ../actions/subscribe.php:86 ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -87,143 +57,78 @@ msgid ""
 "%4$s.\n"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:482
-#, 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:45
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr ""
 
-#: ../actions/invite.php:84 ../actions/invite.php:92
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:60 ../actions/publicrss.php:62
+#: actions/publicrss.php:48
 #, php-format
 msgid "%s Public Stream"
 msgstr ""
 
-#: ../actions/all.php:47 ../actions/allrss.php:60
-#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51
+#: ../actions/all.php:47 ../actions/allrss.php:70 ../lib/stream.php:45
+#: ../actions/allrss.php:60 ../actions/twitapistatuses.php:238
+#: ../lib/stream.php:51 actions/all.php:47 actions/allrss.php:60
+#: actions/twitapistatuses.php:155 lib/personal.php:51
 #, php-format
 msgid "%s and friends"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:49
-#, php-format
-msgid "%s public timeline"
-msgstr ""
-
-#: ../lib/mail.php:206
-#, php-format
-msgid "%s status"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:338
-#, php-format
-msgid "%s timeline"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:213
-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:233 ../lib/util.php:257 lib/util.php:273
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** is a microblogging service brought to you by "
+"[%%site.broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
 
-#: ../lib/util.php:259
+#: ../lib/util.php:235 ../lib/util.php:259 lib/util.php:275
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr ""
 
-#: ../lib/util.php:274
+#: ../lib/util.php:250 ../lib/util.php:274 lib/util.php:290
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
+#: ../actions/register.php:176 actions/finishopenidlogin.php:79
+#: actions/profilesettings.php:76
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 
-#: ../actions/register.php:152
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-
-#: ../actions/password.php:42
+#: ../actions/password.php:42 ../actions/register.php:178
 msgid "6 or more characters"
 msgstr "6글� ��"
 
-#: ../actions/recoverpassword.php:180
+#: ../actions/recoverpassword.php:165 ../actions/recoverpassword.php:180
+#: actions/recoverpassword.php:186
 msgid "6 or more characters, and don't forget it!"
 msgstr ""
 
-#: ../actions/register.php:154
-#, fuzzy
-msgid "6 or more characters. Required."
-msgstr "6글� ��"
-
-#: ../actions/imsettings.php:197
+#: ../actions/imsettings.php:188 ../actions/imsettings.php:197
+#: actions/imsettings.php:205
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+"A confirmation code was sent to the IM address you added. You must approve "
+"%s for sending messages to you."
 msgstr ""
 
-#: ../actions/emailsettings.php:213
-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 ""
-
-#: ../actions/smssettings.php:216
-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 ""
-
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122
-msgid "API method not found!"
-msgstr ""
-
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-msgid "API method under construction."
-msgstr ""
-
-#: ../lib/util.php:324
+#: ../lib/util.php:296 ../lib/util.php:324 lib/util.php:340
 msgid "About"
 msgstr ""
 
-#: ../actions/userauthorization.php:119
+#: ../actions/userauthorization.php:118 ../actions/userauthorization.php:119
+#: actions/userauthorization.php:126
 msgid "Accept"
 msgstr ""
 
+#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
 #: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
-#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: ../actions/smssettings.php:71 actions/emailsettings.php:63
+#: actions/imsettings.php:64 actions/openidsettings.php:58
+#: actions/smssettings.php:71 actions/twittersettings.php:85
 msgid "Add"
 msgstr ""
 
@@ -231,515 +136,430 @@ msgstr ""
 msgid "Add OpenID"
 msgstr "OpenID 추가"
 
-#: ../lib/settingsaction.php:97
-#, fuzzy
-msgid "Add or remove OpenIDs"
-msgstr "OpenID 삭제"
-
-#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39
+#: ../actions/imsettings.php:39
 msgid "Address"
 msgstr "주소"
 
-#: ../actions/invite.php:131
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../actions/showstream.php:273
+#: ../actions/showstream.php:254 ../actions/showstream.php:273
+#: actions/showstream.php:288
 msgid "All subscriptions"
 msgstr ""
 
-#: ../actions/publicrss.php:64
+#: ../actions/publicrss.php:62 ../actions/publicrss.php:64
+#: actions/publicrss.php:50
 #, php-format
 msgid "All updates for %s"
 msgstr ""
 
-#: ../actions/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
-#: ../actions/openidlogin.php:29 ../actions/register.php:30
+#: ../actions/finishopenidlogin.php:29 ../actions/login.php:27
+#: ../actions/openidlogin.php:29 ../actions/register.php:28
+#: ../actions/login.php:31 ../actions/register.php:30
+#: actions/finishopenidlogin.php:29 actions/login.php:31
+#: actions/openidlogin.php:29 actions/register.php:30
 msgid "Already logged in."
 msgstr ""
 
-#: ../lib/subs.php:42
+#: ../actions/subscribe.php:48 ../lib/subs.php:42 lib/subs.php:42
 msgid "Already subscribed!."
 msgstr ""
 
-#: ../actions/deletenotice.php:54
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/userauthorization.php:77
+#: ../actions/userauthorization.php:76 ../actions/userauthorization.php:77
+#: actions/userauthorization.php:83
 msgid "Authorize subscription"
 msgstr ""
 
+#: ../actions/login.php:100 ../actions/register.php:184
 #: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
-#: ../actions/profilesettings.php:65
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr ""
-
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: ../actions/avatar.php:32
 msgid "Avatar"
 msgstr "아바타"
 
-#: ../actions/avatar.php:113
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
 msgid "Avatar updated."
 msgstr ""
 
-#: ../actions/imsettings.php:55
+#: ../actions/imsettings.php:55 actions/imsettings.php:56
 #, 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 ""
 
-#: ../actions/emailsettings.php:54
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-msgstr ""
-
-#: ../actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
-
-#: ../lib/util.php:1318
+#: ../lib/util.php:1136 ../lib/util.php:1318 lib/util.php:1452
 msgid "Before »"
 msgstr ""
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: ../actions/profilesettings.php:52 ../actions/profilesettings.php:49
+#: ../actions/register.php:170 actions/profilesettings.php:82
+#: actions/register.php:184
 msgid "Bio"
 msgstr ""
 
+#: ../actions/profilesettings.php:93 ../actions/updateprofile.php:102
 #: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103
+#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
+#: actions/register.php:89 actions/updateprofile.php:104
 msgid "Bio is too long (max 140 chars)."
 msgstr ""
 
-#: ../lib/deleteaction.php:41
-msgid "Can't delete this notice."
-msgstr ""
-
-#: ../actions/updateprofile.php:119
+#: ../actions/updateprofile.php:118 ../actions/updateprofile.php:119
+#: actions/updateprofile.php:120
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr ""
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
+#: ../actions/password.php:85 ../actions/recoverpassword.php:261
+#: ../actions/recoverpassword.php:300 actions/profilesettings.php:404
+#: actions/recoverpassword.php:313
 msgid "Can't save new password."
 msgstr ""
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62
+#: ../actions/imsettings.php:59 ../actions/emailsettings.php:57
+#: ../actions/imsettings.php:58 ../actions/smssettings.php:62
+#: actions/emailsettings.php:58 actions/imsettings.php:59
+#: actions/smssettings.php:62
 msgid "Cancel"
 msgstr ""
 
-#: ../lib/openid.php:121
+#: ../lib/openid.php:121 lib/openid.php:121
 msgid "Cannot instantiate OpenID consumer object."
 msgstr ""
 
-#: ../actions/imsettings.php:163
+#: ../actions/imsettings.php:154 ../actions/imsettings.php:163
+#: actions/imsettings.php:171
 msgid "Cannot normalize that Jabber ID"
 msgstr ""
 
-#: ../actions/emailsettings.php:181
-msgid "Cannot normalize that email address"
-msgstr ""
-
-#: ../actions/password.php:45
+#: ../actions/password.php:45 actions/profilesettings.php:184
 msgid "Change"
 msgstr ""
 
-#: ../lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
-#: ../actions/password.php:32
+#: ../actions/password.php:32 actions/profilesettings.php:36
 msgid "Change password"
 msgstr ""
 
-#: ../lib/settingsaction.php:94
-msgid "Change your password"
-msgstr ""
-
-#: ../lib/settingsaction.php:85
-msgid "Change your profile settings"
-msgstr ""
-
-#: ../actions/password.php:43 ../actions/recoverpassword.php:181
+#: ../actions/password.php:43 ../actions/recoverpassword.php:166
+#: ../actions/register.php:179 ../actions/recoverpassword.php:181
 #: ../actions/register.php:155 ../actions/smssettings.php:65
+#: actions/profilesettings.php:182 actions/recoverpassword.php:187
+#: actions/register.php:169 actions/smssettings.php:65
 msgid "Confirm"
 msgstr ""
 
-#: ../actions/confirmaddress.php:90
+#: ../actions/confirmaddress.php:84 ../actions/confirmaddress.php:90
+#: actions/confirmaddress.php:90
 msgid "Confirm Address"
 msgstr ""
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245
+#: ../actions/imsettings.php:213 ../actions/emailsettings.php:238
+#: ../actions/imsettings.php:222 ../actions/smssettings.php:245
+#: actions/emailsettings.php:256 actions/imsettings.php:230
+#: actions/smssettings.php:253
 msgid "Confirmation cancelled."
 msgstr ""
 
-#: ../actions/smssettings.php:63
-msgid "Confirmation code"
-msgstr ""
-
-#: ../actions/confirmaddress.php:38
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr ""
 
-#: ../actions/register.php:202
-#, php-format
-msgid ""
-"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."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:91
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
 msgid "Connect"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
 msgid "Connect existing account"
 msgstr ""
 
-#: ../lib/util.php:332
+#: ../lib/util.php:304 ../lib/util.php:332 lib/util.php:348
 msgid "Contact"
 msgstr ""
 
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr ""
-
-#: ../lib/openid.php:160
+#: ../lib/openid.php:160 lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr ""
 
-#: ../actions/updateprofile.php:162
+#: ../actions/updateprofile.php:161 ../actions/updateprofile.php:162
+#: actions/updateprofile.php:163
 msgid "Could not save avatar info"
 msgstr ""
 
-#: ../actions/updateprofile.php:155
+#: ../actions/updateprofile.php:154 ../actions/updateprofile.php:155
+#: actions/updateprofile.php:156
 msgid "Could not save new profile info"
 msgstr ""
 
-#: ../lib/subs.php:54
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../lib/subs.php:46
-msgid "Could not subscribe."
-msgstr ""
-
-#: ../actions/recoverpassword.php:102
-msgid "Could not update user with confirmed email address."
+#: ../actions/profilesettings.php:146
+msgid "Couldn't confirm email."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:99
+#: actions/finishremotesubscribe.php:101
 msgid "Couldn't convert request tokens to access tokens."
 msgstr ""
 
+#: ../actions/subscribe.php:59
+msgid "Couldn't create subscription."
+msgstr ""
+
+#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
 #: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
 #: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#: actions/confirmaddress.php:84 actions/emailsettings.php:252
+#: actions/imsettings.php:226 actions/smssettings.php:249
 msgid "Couldn't delete email confirmation."
 msgstr ""
 
-#: ../lib/subs.php:103
+#: ../actions/unsubscribe.php:56 ../lib/subs.php:103 lib/subs.php:116
 msgid "Couldn't delete subscription."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:93
-msgid "Couldn't find any statuses."
-msgstr ""
-
-#: ../actions/remotesubscribe.php:127
+#: ../actions/remotesubscribe.php:125 ../actions/remotesubscribe.php:127
+#: actions/remotesubscribe.php:136
 msgid "Couldn't get a request token."
 msgstr ""
 
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206
+#: ../actions/imsettings.php:178 ../actions/emailsettings.php:205
+#: ../actions/imsettings.php:187 ../actions/smssettings.php:206
+#: actions/emailsettings.php:223 actions/imsettings.php:195
+#: actions/smssettings.php:214
 msgid "Couldn't insert confirmation code."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182
 msgid "Couldn't insert new subscription."
 msgstr ""
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: ../actions/profilesettings.php:175 ../actions/profilesettings.php:184
+#: ../actions/twitapiaccount.php:96 actions/profilesettings.php:299
+#: actions/twitapiaccount.php:94
 msgid "Couldn't save profile."
 msgstr ""
 
-#: ../actions/profilesettings.php:161
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-msgid "Couldn't update user record."
-msgstr ""
-
+#: ../actions/confirmaddress.php:70 ../actions/imsettings.php:129
+#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
 #: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
 #: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
 #: ../actions/imsettings.php:243 ../actions/profilesettings.php:141
 #: ../actions/smssettings.php:157 ../actions/smssettings.php:269
+#: actions/confirmaddress.php:72 actions/emailsettings.php:174
+#: actions/emailsettings.php:277 actions/imsettings.php:146
+#: actions/imsettings.php:251 actions/profilesettings.php:256
+#: actions/smssettings.php:165 actions/smssettings.php:277
 msgid "Couldn't update user."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
 msgid "Create"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:70
+#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
 msgid "Create a new user with this nickname."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
 msgid "Create new account"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:191
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
 msgid "Creating new account for OpenID that already has a user."
 msgstr ""
 
-#: ../actions/imsettings.php:45
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
 msgid "Current confirmed Jabber/GTalk address."
 msgstr ""
 
-#: ../actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:44
-msgid "Current confirmed email address."
-msgstr ""
-
-#: ../actions/showstream.php:356
+#: ../actions/showstream.php:337 ../actions/showstream.php:356
+#: actions/showstream.php:367
 msgid "Currently"
 msgstr ""
 
-#: ../classes/Notice.php:72
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr ""
-
-#: ../lib/util.php:1061
+#: ../lib/util.php:893 ../lib/util.php:1061 lib/util.php:1110
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr ""
 
-#: ../actions/deletenotice.php:41
-msgid "Delete notice"
-msgstr ""
-
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: ../actions/profilesettings.php:54 ../actions/profilesettings.php:51
+#: ../actions/register.php:172 actions/profilesettings.php:84
+#: actions/register.php:186
 msgid "Describe yourself and your interests in 140 chars"
 msgstr ""
 
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87
+#: ../actions/register.php:181
 msgid "Email"
 msgstr "�메�"
 
-#: ../actions/emailsettings.php:59
-#, fuzzy
-msgid "Email Address"
+#: ../actions/profilesettings.php:46
+msgid "Email address"
 msgstr "�메� 주소"
 
-#: ../actions/emailsettings.php:32
-#, fuzzy
-msgid "Email Settings"
-msgstr "메신저 설정"
-
-#: ../actions/register.php:73
+#: ../actions/profilesettings.php:102 ../actions/register.php:63
+#: ../actions/register.php:73 actions/register.php:80
 msgid "Email address already exists."
 msgstr ""
 
-#: ../lib/mail.php:90
+#: ../lib/mail.php:82 ../lib/mail.php:90 lib/mail.php:90
 msgid "Email address confirmation"
 msgstr ""
 
-#: ../actions/emailsettings.php:61
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/invite.php:129
-#, fuzzy
-msgid "Email addresses"
-msgstr "�메� 주소"
-
-#: ../actions/recoverpassword.php:191
+#: ../actions/recoverpassword.php:176 ../actions/recoverpassword.php:191
+#: actions/recoverpassword.php:197
 msgid "Enter a nickname or email address."
 msgstr ""
 
-#: ../actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/userauthorization.php:137
+#: ../actions/userauthorization.php:136 ../actions/userauthorization.php:137
+#: actions/userauthorization.php:144
 msgid "Error authorizing token"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:253
+#: ../actions/finishopenidlogin.php:282 ../actions/finishopenidlogin.php:253
+#: actions/finishopenidlogin.php:259
 msgid "Error connecting user to OpenID."
 msgstr ""
 
-#: ../actions/finishaddopenid.php:78
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
 msgid "Error connecting user."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153
 msgid "Error inserting avatar"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:143
+#: actions/finishremotesubscribe.php:145
 msgid "Error inserting new profile"
 msgstr ""
 
+#: ../actions/postnotice.php:88
+msgid "Error inserting notice"
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169
 msgid "Error inserting remote profile"
 msgstr ""
 
-#: ../actions/recoverpassword.php:240
+#: ../actions/recoverpassword.php:201 ../actions/recoverpassword.php:240
+#: actions/recoverpassword.php:246
 msgid "Error saving address confirmation."
 msgstr ""
 
-#: ../actions/userauthorization.php:140
+#: ../actions/userauthorization.php:139 ../actions/userauthorization.php:140
+#: actions/userauthorization.php:147
 msgid "Error saving remote profile"
 msgstr ""
 
-#: ../lib/openid.php:226
+#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
+#: lib/openid.php:226
 msgid "Error saving the profile."
 msgstr ""
 
-#: ../lib/openid.php:237
+#: ../lib/openid.php:237 lib/openid.php:237
 msgid "Error saving the user."
 msgstr ""
 
-#: ../actions/password.php:80
+#: ../actions/password.php:80 actions/profilesettings.php:399
 msgid "Error saving user; invalid."
 msgstr ""
 
+#: ../actions/login.php:43 ../actions/login.php:69
+#: ../actions/recoverpassword.php:268 ../actions/register.php:73
 #: ../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
 msgid "Error setting user."
 msgstr ""
 
-#: ../actions/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
 msgid "Error updating profile"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:161
+#: actions/finishremotesubscribe.php:163
 msgid "Error updating remote profile"
 msgstr ""
 
-#: ../actions/recoverpassword.php:80
+#: ../actions/recoverpassword.php:79 ../actions/recoverpassword.php:80
+#: actions/recoverpassword.php:80
 msgid "Error with confirmation code."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:89
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
 msgid "Existing nickname"
 msgstr ""
 
-#: ../lib/util.php:326
+#: ../lib/util.php:298 ../lib/util.php:326 lib/util.php:342
 msgid "FAQ"
 msgstr ""
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
 msgid "Failed updating avatar."
 msgstr ""
 
-#: ../actions/all.php:61 ../actions/allrss.php:64
+#: ../actions/all.php:61 ../actions/allrss.php:74 ../actions/allrss.php:64
+#: actions/all.php:61 actions/allrss.php:64
 #, php-format
 msgid "Feed for friends of %s"
 msgstr ""
 
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: ../actions/replies.php:61 ../actions/repliesrss.php:80
+#: ../actions/replies.php:65 actions/replies.php:65 actions/repliesrss.php:66
 #, php-format
 msgid "Feed for replies to %s"
 msgstr ""
 
-#: ../actions/tag.php:55
-#, php-format
-msgid "Feed for tag %s"
-msgstr ""
-
-#: ../lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/login.php:122
+#: ../actions/login.php:118 ../actions/login.php:122
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 
 #: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: actions/profilesettings.php:77 actions/register.php:178
 msgid "Full name"
 msgstr ""
 
+#: ../actions/profilesettings.php:90 ../actions/updateprofile.php:92
 #: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93
+#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
+#: actions/register.php:86 actions/updateprofile.php:94
 msgid "Full name is too long (max 255 chars)."
 msgstr ""
 
-#: ../lib/util.php:322
+#: ../lib/util.php:279
 msgid "Help"
 msgstr "�움�"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:274
 msgid "Home"
 msgstr "홈"
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: ../actions/profilesettings.php:49
 msgid "Homepage"
 msgstr "홈페�지"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: ../actions/profilesettings.php:87
 msgid "Homepage is not a valid URL."
 msgstr "홈페�지 주소형�� 올바르지 않습니다."
 
-#: ../actions/emailsettings.php:91
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102
-msgid "IM"
-msgstr ""
-
-#: ../actions/imsettings.php:60
+#: ../actions/imsettings.php:61
 msgid "IM Address"
 msgstr "메신저 주소"
 
@@ -747,7 +567,7 @@ msgstr "메신저 주소"
 msgid "IM Settings"
 msgstr "메신저 설정"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -759,142 +579,117 @@ msgid ""
 "click \"Add\"."
 msgstr ""
 
-#: ../actions/recoverpassword.php:137
+#: ../actions/recoverpassword.php:122
 msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
+"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 ""
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283
-msgid "Incoming email address removed."
-msgstr ""
-
-#: ../actions/password.php:69
+#: ../actions/password.php:69 actions/profilesettings.php:388
 msgid "Incorrect old password"
 msgstr ""
 
-#: ../actions/login.php:67
+#: ../actions/login.php:63 ../actions/login.php:67 actions/login.php:67
 msgid "Incorrect username or password."
 msgstr ""
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:226 ../actions/recoverpassword.php:265
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
 
-#: ../actions/updateprofile.php:114
+#: ../actions/updateprofile.php:113 ../actions/updateprofile.php:114
+#: actions/updateprofile.php:115
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr ""
 
-#: ../actions/invite.php:55
-#, fuzzy, php-format
-msgid "Invalid email address: %s"
-msgstr "�메� 주소"
-
-#: ../actions/updateprofile.php:98
+#: ../actions/updateprofile.php:97 ../actions/updateprofile.php:98
+#: actions/updateprofile.php:99
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr ""
 
-#: ../actions/updateprofile.php:82
+#: ../actions/updateprofile.php:81 ../actions/updateprofile.php:82
+#: actions/updateprofile.php:83
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr ""
 
-#: ../actions/postnotice.php:61
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
 msgid "Invalid notice content"
 msgstr ""
 
-#: ../actions/postnotice.php:67
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
 msgid "Invalid notice uri"
 msgstr ""
 
-#: ../actions/postnotice.php:72
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
 msgid "Invalid notice url"
 msgstr ""
 
-#: ../actions/updateprofile.php:87
+#: ../actions/updateprofile.php:86 ../actions/updateprofile.php:87
+#: actions/updateprofile.php:88
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:96
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
 msgid "Invalid profile URL (bad format)"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79
 msgid "Invalid profile URL returned by server."
 msgstr ""
 
-#: ../actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 msgid "Invalid size."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111
+#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
+#: ../actions/register.php:84 ../actions/finishopenidlogin.php:235
+#: ../actions/register.php:93 ../actions/register.php:111
+#: actions/finishopenidlogin.php:241 actions/register.php:103
+#: actions/register.php:121
 msgid "Invalid username or password."
 msgstr ""
 
-#: ../actions/invite.php:79
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123
-msgid "Invite new users"
-msgstr ""
-
-#: ../lib/util.php:261
+#: ../lib/util.php:237 ../lib/util.php:261 lib/util.php:277
 #, 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)."
+"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 ""
 
-#: ../actions/imsettings.php:173
+#: ../actions/imsettings.php:164 ../actions/imsettings.php:173
+#: actions/imsettings.php:181
 msgid "Jabber ID already belongs to another user."
 msgstr ""
 
-#: ../actions/imsettings.php:62
+#: ../actions/imsettings.php:63 ../actions/imsettings.php:62
+#: actions/imsettings.php:63
 #, 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 ""
 
-#: ../actions/profilesettings.php:57
-msgid "Language"
-msgstr ""
-
-#: ../actions/profilesettings.php:113
-msgid "Language is too long (max 50 chars)."
-msgstr ""
-
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: ../actions/profilesettings.php:55
 msgid "Location"
 msgstr "위치"
 
+#: ../actions/profilesettings.php:96 ../actions/updateprofile.php:107
 #: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108
+#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
+#: actions/register.php:92 actions/updateprofile.php:109
 msgid "Location is too long (max 255 chars)."
 msgstr ""
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310
+#: ../actions/login.php:93 ../actions/login.php:102
+#: ../actions/openidlogin.php:68 ../lib/util.php:286
 msgid "Login"
 msgstr "로그�"
 
@@ -903,346 +698,298 @@ msgstr "로그�"
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "[OpenID](%%doc.openid%%)로 로그�하세요."
 
-#: ../actions/login.php:126
+#: ../actions/login.php:122 ../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%"
-"%). "
+"Login with your username and password. Don't have a username yet? "
+"[Register](%%action.register%%) a new account, or try "
+"[OpenID](%%action.openidlogin%%). "
 msgstr ""
 
-#: ../lib/util.php:308
+#: ../lib/util.php:284
 msgid "Logout"
 msgstr "로그아웃"
 
-#: ../actions/register.php:166
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
-
-#: ../actions/login.php:110
+#: ../actions/login.php:106
 msgid "Lost or forgotten password?"
 msgstr "비밀번호를 잊어버리셨어요?"
 
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr ""
-
-#: ../actions/showstream.php:300
+#: ../actions/showstream.php:281 ../actions/showstream.php:300
+#: actions/showstream.php:315
 msgid "Member since"
 msgstr ""
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67
 #, php-format
 msgid "Microblog by %s"
 msgstr ""
 
-#: ../actions/smssettings.php:304
-#, php-format
-msgid ""
-"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
-"email but isn't listed here, send email to let us know at %s."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
+#: ../actions/register.php:188 actions/finishopenidlogin.php:85
+#: actions/register.php:202
 msgid "My text and files are available under "
 msgstr ""
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-msgid "New"
-msgstr ""
-
-#: ../lib/mail.php:144
-#, php-format
-msgid "New email address for posting to %s"
-msgstr ""
-
-#: ../actions/emailsettings.php:297
-msgid "New incoming email address added."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:71
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
 msgid "New nickname"
 msgstr ""
 
-#: ../actions/newnotice.php:87
+#: ../actions/newnotice.php:100 ../actions/newnotice.php:87
+#: actions/newnotice.php:96
 msgid "New notice"
 msgstr ""
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
+#: ../actions/password.php:41 ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:179 actions/profilesettings.php:180
+#: actions/recoverpassword.php:185
 msgid "New password"
 msgstr ""
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:275 ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
-#: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151
+#: ../actions/login.php:97 ../actions/profilesettings.php:41
+#: ../actions/register.php:175
 msgid "Nickname"
 msgstr "닉네임"
 
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69
+#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:99
+#: ../actions/register.php:59 ../actions/profilesettings.php:110
+#: ../actions/register.php:69 actions/finishopenidlogin.php:181
+#: actions/profilesettings.php:225 actions/register.php:76
 msgid "Nickname already in use. Try another one."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:67 ../actions/updateprofile.php:77
+#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:80
+#: ../actions/register.php:57 ../actions/updateprofile.php:76
+#: ../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
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:170
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
 msgid "Nickname not allowed."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:72
+#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
 msgid "Nickname of the user you want to follow"
 msgstr ""
 
-#: ../actions/recoverpassword.php:162
+#: ../actions/recoverpassword.php:147 ../actions/recoverpassword.php:162
+#: actions/recoverpassword.php:167
 msgid "Nickname or email"
 msgstr ""
 
-#: ../actions/deletenotice.php:59
-msgid "No"
-msgstr ""
-
-#: ../actions/imsettings.php:156
+#: ../actions/imsettings.php:147 ../actions/imsettings.php:156
+#: actions/imsettings.php:164
 msgid "No Jabber ID."
 msgstr ""
 
-#: ../actions/userauthorization.php:129
+#: ../actions/userauthorization.php:128 ../actions/userauthorization.php:129
+#: actions/userauthorization.php:136
 msgid "No authorization request!"
 msgstr ""
 
-#: ../actions/smssettings.php:181
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316
-msgid "No code entered"
-msgstr ""
-
-#: ../actions/confirmaddress.php:33
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 msgid "No confirmation code."
 msgstr ""
 
-#: ../actions/newnotice.php:44
+#: ../actions/newnotice.php:49 ../actions/newnotice.php:44
+#: actions/newmessage.php:53 actions/newnotice.php:44 classes/Command.php:197
 msgid "No content!"
 msgstr ""
 
-#: ../actions/emailsettings.php:174
-#, fuzzy
-msgid "No email address."
-msgstr "�메� 주소"
-
-#: ../actions/userbyid.php:32
+#: ../actions/userbyid.php:27 ../actions/userbyid.php:32
+#: actions/userbyid.php:32
 msgid "No id."
 msgstr ""
 
-#: ../actions/emailsettings.php:271
-#, fuzzy
-msgid "No incoming email address."
-msgstr "�메� 주소"
-
 #: ../actions/finishremotesubscribe.php:65
+#: actions/finishremotesubscribe.php:67
 msgid "No nickname provided by remote server."
 msgstr ""
 
-#: ../actions/avatarbynickname.php:27
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 msgid "No nickname."
 msgstr ""
 
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229
+#: ../actions/imsettings.php:197 ../actions/emailsettings.php:222
+#: ../actions/imsettings.php:206 ../actions/smssettings.php:229
+#: actions/emailsettings.php:240 actions/imsettings.php:214
+#: actions/smssettings.php:237
 msgid "No pending confirmation to cancel."
 msgstr ""
 
-#: ../actions/smssettings.php:176
-msgid "No phone number."
-msgstr ""
-
 #: ../actions/finishremotesubscribe.php:72
+#: actions/finishremotesubscribe.php:74
 msgid "No profile URL returned by server."
 msgstr ""
 
-#: ../actions/recoverpassword.php:226
+#: ../actions/recoverpassword.php:189 ../actions/recoverpassword.php:226
+#: actions/recoverpassword.php:232
 msgid "No registered email address for that user."
 msgstr ""
 
-#: ../actions/userauthorization.php:49
+#: ../actions/userauthorization.php:48 ../actions/userauthorization.php:49
+#: actions/userauthorization.php:55
 msgid "No request found!"
 msgstr ""
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
+#: actions/noticesearch.php:69 actions/peoplesearch.php:69
 msgid "No results"
 msgstr ""
 
-#: ../actions/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
 msgid "No size."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:595
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555
-msgid "No status with that ID found."
-msgstr ""
-
-#: ../actions/openidsettings.php:135
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 msgid "No such OpenID."
 msgstr ""
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29
 msgid "No such document."
 msgstr ""
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30
+#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
+#: ../actions/shownotice.php:83 ../lib/deleteaction.php:30
+#: actions/shownotice.php:32 actions/shownotice.php:83 lib/deleteaction.php:30
 msgid "No such notice."
 msgstr ""
 
-#: ../actions/recoverpassword.php:56
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
 msgid "No such recovery code."
 msgstr ""
 
-#: ../actions/postnotice.php:56
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
 msgid "No such subscription"
 msgstr ""
 
 #: ../actions/all.php:34 ../actions/allrss.php:35
-#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
-#: ../actions/remotesubscribe.php:84 ../actions/remotesubscribe.php:91
-#: ../actions/replies.php:57 ../actions/repliesrss.php:35
+#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:36
+#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
+#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
+#: ../actions/showstream.php:95 ../actions/subscribe.php:43
+#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
+#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
+#: ../actions/foaf.php:40 ../actions/replies.php:57
 #: ../actions/showstream.php:110 ../actions/userbyid.php:36
-#: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
-#: ../lib/subs.php:33 ../lib/subs.php:82
+#: ../actions/xrds.php:35 ../lib/gallery.php:57 ../lib/subs.php:33
+#: ../lib/subs.php:82 actions/all.php:34 actions/allrss.php:35
+#: actions/avatarbynickname.php:43 actions/favoritesrss.php:35
+#: actions/foaf.php:40 actions/ical.php:31 actions/remotesubscribe.php:93
+#: actions/remotesubscribe.php:100 actions/replies.php:57
+#: actions/repliesrss.php:35 actions/showfavorites.php:34
+#: actions/showstream.php:110 actions/userbyid.php:36 actions/userrss.php:35
+#: actions/xrds.php:35 classes/Command.php:120 classes/Command.php:162
+#: classes/Command.php:203 classes/Command.php:237 lib/gallery.php:62
+#: lib/mailbox.php:36 lib/subs.php:33 lib/subs.php:95
 msgid "No such user."
 msgstr ""
 
-#: ../actions/recoverpassword.php:211
-msgid "No user with that email address or username."
-msgstr ""
-
-#: ../lib/gallery.php:80
+#: ../lib/gallery.php:76 ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
 msgstr ""
 
-#: ../actions/recoverpassword.php:60
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
 msgid "Not a recovery code."
 msgstr ""
 
-#: ../scripts/maildaemon.php:50
-msgid "Not a registered user."
-msgstr ""
-
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332
-msgid "Not a supported data format."
-msgstr ""
-
-#: ../actions/imsettings.php:167
+#: ../actions/imsettings.php:158 ../actions/imsettings.php:167
+#: actions/imsettings.php:175
 msgid "Not a valid Jabber ID"
 msgstr ""
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131
 msgid "Not a valid OpenID."
 msgstr ""
 
-#: ../actions/emailsettings.php:185
-#, fuzzy
-msgid "Not a valid email address"
-msgstr "�메� 주소"
-
-#: ../actions/register.php:63
+#: ../actions/profilesettings.php:75 ../actions/register.php:53
+#: ../actions/register.php:63 actions/register.php:70
 msgid "Not a valid email address."
 msgstr ""
 
+#: ../actions/profilesettings.php:83 ../actions/register.php:61
 #: ../actions/profilesettings.php:91 ../actions/register.php:71
+#: actions/profilesettings.php:206 actions/register.php:78
 msgid "Not a valid nickname."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:120
+#: ../actions/remotesubscribe.php:118 ../actions/remotesubscribe.php:120
+#: actions/remotesubscribe.php:129
 msgid "Not a valid profile URL (incorrect services)."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:113
+#: ../actions/remotesubscribe.php:111 ../actions/remotesubscribe.php:113
+#: actions/remotesubscribe.php:122
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:104
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
 msgid "Not a valid profile URL (no YADIS document)."
 msgstr ""
 
-#: ../actions/avatar.php:95
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
 msgid "Not an image or corrupt file."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53
 msgid "Not authorized."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38
 msgid "Not expecting this response!"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:422
-msgid "Not found"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:28
+#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
+#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
+#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+#: ../actions/logout.php:33 ../actions/subscribe.php:28
 #: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
-#: ../lib/settingsaction.php:27
+#: actions/disfavor.php:29 actions/favor.php:30 actions/finishaddopenid.php:29
+#: actions/logout.php:33 actions/newmessage.php:28 actions/newnotice.php:29
+#: actions/subscribe.php:28 actions/unsubscribe.php:25 lib/deleteaction.php:38
+#: lib/settingsaction.php:27
 msgid "Not logged in."
 msgstr ""
 
-#: ../lib/subs.php:91
+#: ../actions/unsubscribe.php:43 ../lib/subs.php:91 lib/subs.php:104
 msgid "Not subscribed!."
 msgstr ""
 
-#: ../actions/opensearch.php:35
-#, fuzzy
-msgid "Notice Search"
-msgstr "검색"
-
-#: ../actions/showstream.php:82
+#: ../actions/showstream.php:82 actions/showstream.php:82
 #, php-format
 msgid "Notice feed for %s"
 msgstr ""
 
-#: ../actions/shownotice.php:39
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
 msgid "Notice has no profile"
 msgstr ""
 
-#: ../actions/showstream.php:316
+#: ../actions/showstream.php:297 ../actions/showstream.php:316
+#: actions/showstream.php:331
 msgid "Notices"
 msgstr ""
 
-#: ../actions/tag.php:35 ../actions/tag.php:81
-#, php-format
-msgid "Notices tagged with %s"
-msgstr ""
-
-#: ../actions/password.php:39
+#: ../actions/password.php:39 actions/profilesettings.php:178
 msgid "Old password"
 msgstr ""
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314
+#: ../lib/util.php:288
 msgid "OpenID"
 msgstr "OpenID"
 
-#: ../actions/finishopenidlogin.php:61
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
 msgid "OpenID Account Setup"
 msgstr ""
 
-#: ../lib/openid.php:180
+#: ../lib/openid.php:180 lib/openid.php:180
 msgid "OpenID Auto-Submit"
 msgstr ""
 
@@ -1252,201 +999,180 @@ msgid "OpenID Login"
 msgstr "OpenID 로그�"
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
+#: actions/openidlogin.php:74 actions/openidsettings.php:50
 msgid "OpenID URL"
 msgstr ""
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
+#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 msgid "OpenID authentication cancelled."
 msgstr ""
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr ""
 
-#: ../lib/openid.php:133
+#: ../lib/openid.php:133 lib/openid.php:133
 #, php-format
 msgid "OpenID failure: %s"
 msgstr ""
 
-#: ../actions/openidsettings.php:144
+#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
 msgid "OpenID removed."
 msgstr ""
 
-#: ../actions/openidsettings.php:37
+#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
 msgid "OpenID settings"
 msgstr ""
 
-#: ../actions/invite.php:135
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
-#: ../actions/avatar.php:84
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
 msgid "Partial upload."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
-#: ../actions/register.php:153 ../lib/settingsaction.php:93
+#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
+#: ../actions/register.php:177
 msgid "Password"
 msgstr "비밀번호"
 
-#: ../actions/recoverpassword.php:288
+#: ../actions/recoverpassword.php:249
 msgid "Password and confirmation do not match."
 msgstr "비밀번호가 �치하지 않습니다."
 
-#: ../actions/recoverpassword.php:284
+#: ../actions/recoverpassword.php:245 ../actions/recoverpassword.php:284
+#: actions/recoverpassword.php:297
 msgid "Password must be 6 chars or more."
 msgstr ""
 
+#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 msgid "Password recovery requested"
 msgstr ""
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: ../actions/password.php:89 ../actions/recoverpassword.php:274
+#: ../actions/recoverpassword.php:313 actions/profilesettings.php:408
+#: actions/recoverpassword.php:326
 msgid "Password saved."
 msgstr ""
 
-#: ../actions/password.php:61 ../actions/register.php:88
+#: ../actions/password.php:61 ../actions/register.php:65
 msgid "Passwords don't match."
 msgstr "비밀번호가 �치하지 않습니다."
 
-#: ../lib/searchaction.php:100
-msgid "People"
-msgstr ""
-
-#: ../actions/opensearch.php:33
-#, fuzzy
-msgid "People Search"
-msgstr "검색"
-
-#: ../actions/peoplesearch.php:33
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
 msgid "People search"
 msgstr ""
 
-#: ../lib/stream.php:50
+#: ../lib/stream.php:44 ../lib/stream.php:50 lib/personal.php:50
 msgid "Personal"
 msgstr ""
 
-#: ../actions/invite.php:133
-msgid "Personal message"
-msgstr ""
-
-#: ../actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-
-#: ../actions/userauthorization.php:78
+#: ../actions/userauthorization.php:77 ../actions/userauthorization.php:78
 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 \"Cancel\"."
 msgstr ""
 
-#: ../actions/imsettings.php:73
+#: ../actions/imsettings.php:74 ../actions/imsettings.php:73
+#: actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94
+#: ../actions/imsettings.php:68 ../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
 msgid "Preferences"
 msgstr ""
 
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163
+#: ../actions/imsettings.php:135 ../actions/emailsettings.php:162
+#: ../actions/imsettings.php:144 ../actions/smssettings.php:163
+#: actions/emailsettings.php:180 actions/imsettings.php:152
+#: actions/smssettings.php:171
 msgid "Preferences saved."
 msgstr ""
 
-#: ../actions/profilesettings.php:57
-msgid "Preferred language"
-msgstr ""
-
-#: ../lib/util.php:328
+#: ../lib/util.php:300
 msgid "Privacy"
 msgstr "개�정보보호"
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106
+#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
+#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
+#: classes/Notice.php:119
 msgid "Problem saving notice."
 msgstr ""
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60
+#: ../lib/stream.php:54 ../lib/settingsaction.php:84 ../lib/stream.php:60
+#: lib/personal.php:60 lib/settingsaction.php:84
 msgid "Profile"
 msgstr ""
 
-#: ../actions/remotesubscribe.php:73
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
 msgid "Profile URL"
 msgstr ""
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
 msgid "Profile settings"
 msgstr ""
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
+#: ../actions/updateprofile.php:52 actions/postnotice.php:52
+#: actions/updateprofile.php:53
 msgid "Profile unknown"
 msgstr ""
 
-#: ../actions/public.php:54
-msgid "Public Stream Feed"
-msgstr ""
-
-#: ../actions/public.php:33
-msgid "Public timeline"
+#: ../lib/util.php:276
+msgid "Public"
 msgstr ""
 
-#: ../actions/imsettings.php:79
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
-
-#: ../actions/emailsettings.php:94
-msgid "Publish a MicroID for my email address."
+#: ../actions/public.php:54 actions/public.php:54
+msgid "Public Stream Feed"
 msgstr ""
 
-#: ../actions/tag.php:75 ../actions/tag.php:76
-msgid "Recent Tags"
+#: ../actions/public.php:33 actions/public.php:33
+msgid "Public timeline"
 msgstr ""
 
-#: ../actions/recoverpassword.php:166
+#: ../actions/recoverpassword.php:151 ../actions/recoverpassword.php:166
+#: actions/recoverpassword.php:171
 msgid "Recover"
 msgstr ""
 
-#: ../actions/recoverpassword.php:156
+#: ../actions/recoverpassword.php:141 ../actions/recoverpassword.php:156
+#: actions/recoverpassword.php:161
 msgid "Recover password"
 msgstr ""
 
-#: ../actions/recoverpassword.php:67
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
 msgid "Recovery code for unknown user."
 msgstr ""
 
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: ../actions/register.php:171 ../actions/register.php:195 ../lib/util.php:287
 msgid "Register"
 msgstr "회�가입"
 
-#: ../actions/register.php:28
-msgid "Registration not allowed."
-msgstr ""
-
-#: ../actions/register.php:200
-msgid "Registration successful"
-msgstr ""
-
-#: ../actions/userauthorization.php:120
+#: ../actions/userauthorization.php:119 ../actions/userauthorization.php:120
+#: actions/userauthorization.php:127
 msgid "Reject"
 msgstr ""
 
-#: ../actions/login.php:103 ../actions/register.php:176
+#: ../actions/login.php:99 ../actions/register.php:183
 msgid "Remember me"
 msgstr "�� 로그�"
 
-#: ../actions/updateprofile.php:70
+#: ../actions/updateprofile.php:69 ../actions/updateprofile.php:70
+#: actions/updateprofile.php:71
 msgid "Remote profile with no matching profile"
 msgstr ""
 
-#: ../actions/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
 msgid "Remote subscribe"
 msgstr ""
 
-#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
-#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
 msgid "Remove"
 msgstr "삭제"
 
@@ -1460,62 +1186,50 @@ msgid ""
 "remove it, add another OpenID first."
 msgstr ""
 
-#: ../lib/stream.php:55
+#: ../lib/stream.php:49 ../lib/stream.php:55 lib/personal.php:55
 msgid "Replies"
 msgstr ""
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
+#: ../lib/stream.php:56 actions/replies.php:47 actions/repliesrss.php:62
+#: lib/personal.php:56
 #, php-format
 msgid "Replies to %s"
 msgstr ""
 
-#: ../actions/recoverpassword.php:183
+#: ../actions/recoverpassword.php:168 ../actions/recoverpassword.php:183
+#: actions/recoverpassword.php:189
 msgid "Reset"
 msgstr ""
 
-#: ../actions/recoverpassword.php:173
+#: ../actions/recoverpassword.php:158 ../actions/recoverpassword.php:173
+#: actions/recoverpassword.php:178
 msgid "Reset password"
 msgstr ""
 
-#: ../lib/settingsaction.php:99
-msgid "SMS"
-msgstr ""
-
-#: ../actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
-
-#: ../actions/smssettings.php:33
-#, fuzzy
-msgid "SMS Settings"
-msgstr "메신저 설정"
-
-#: ../lib/mail.php:219
-msgid "SMS confirmation"
-msgstr ""
-
-#: ../actions/recoverpassword.php:182
+#: ../actions/recoverpassword.php:167 ../actions/register.php:180
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
 msgid "Same as password above"
 msgstr ""
 
-#: ../actions/register.php:156
-msgid "Same as password above. Required."
-msgstr ""
-
+#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
 #: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
 #: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
+#: actions/emailsettings.php:104 actions/imsettings.php:82
+#: actions/profilesettings.php:101 actions/smssettings.php:100
+#: actions/twittersettings.php:83
 msgid "Save"
 msgstr ""
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300
+#: ../lib/searchaction.php:73 ../lib/util.php:277
 msgid "Search"
 msgstr "검색"
 
-#: ../actions/noticesearch.php:80
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
 msgid "Search Stream Feed"
 msgstr ""
 
-#: ../actions/noticesearch.php:30
+#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -1529,226 +1243,170 @@ msgid ""
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 
-#: ../actions/smssettings.php:296
-msgid "Select a carrier"
-msgstr ""
-
-#: ../actions/invite.php:137 ../lib/util.php:1172
+#: ../lib/util.php:982 ../actions/invite.php:137 ../lib/util.php:1172
+#: actions/invite.php:145 lib/util.php:1306 lib/util.php:1731
 msgid "Send"
 msgstr ""
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
-msgstr ""
-
-#: ../actions/emailsettings.php:88
-msgid "Send me notices of new subscriptions through email."
-msgstr ""
-
-#: ../actions/imsettings.php:70
+#: ../actions/imsettings.php:71 ../actions/imsettings.php:70
+#: actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
-#: ../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
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr ""
-
-#: ../lib/util.php:304
+#: ../lib/util.php:282 ../lib/util.php:304 lib/util.php:320
 msgid "Settings"
 msgstr ""
 
-#: ../actions/profilesettings.php:192
+#: ../actions/profilesettings.php:183 ../actions/profilesettings.php:192
+#: actions/profilesettings.php:307
 msgid "Settings saved."
 msgstr ""
 
-#: ../actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:66
+#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
+#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
 msgid "Something weird happened."
 msgstr ""
 
-#: ../scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-
-#: ../lib/util.php:330
+#: ../lib/util.php:302
 msgid "Source"
 msgstr "소스 코드"
 
-#: ../actions/showstream.php:296
+#: ../actions/showstream.php:277
 msgid "Statistics"
 msgstr "통계"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../actions/finishopenidlogin.php:246 actions/finishopenidlogin.php:188
+#: actions/finishopenidlogin.php:252
 msgid "Stored OpenID not found."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197
+#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
+#: ../actions/showstream.php:181 ../actions/showstream.php:188
+#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
+#: actions/showstream.php:197 actions/showstream.php:206
 msgid "Subscribe"
 msgstr ""
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: ../actions/showstream.php:294 ../actions/subscribers.php:27
+#: ../actions/showstream.php:313 actions/showstream.php:328
+#: actions/subscribers.php:27
 msgid "Subscribers"
 msgstr ""
 
-#: ../actions/userauthorization.php:310
+#: ../actions/userauthorization.php:309 ../actions/userauthorization.php:310
+#: actions/userauthorization.php:322
 msgid "Subscription authorized"
 msgstr ""
 
-#: ../actions/userauthorization.php:320
+#: ../actions/userauthorization.php:319 ../actions/userauthorization.php:320
+#: actions/userauthorization.php:332
 msgid "Subscription rejected"
 msgstr ""
 
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27
+#: ../actions/showstream.php:212 ../actions/showstream.php:288
+#: ../actions/subscriptions.php:27 ../actions/showstream.php:230
+#: ../actions/showstream.php:307 actions/showstream.php:240
+#: actions/showstream.php:322 actions/subscriptions.php:27
 msgid "Subscriptions"
 msgstr ""
 
-#: ../actions/avatar.php:87
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
 msgid "System error uploading file."
 msgstr ""
 
-#: ../actions/tag.php:41 ../lib/util.php:301
-msgid "Tags"
-msgstr ""
-
-#: ../lib/searchaction.php:104
-msgid "Text"
-msgstr ""
-
-#: ../actions/noticesearch.php:34
+#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
 msgid "Text search"
 msgstr ""
 
-#: ../actions/openidsettings.php:140
+#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
 msgid "That OpenID does not belong to you."
 msgstr ""
 
-#: ../actions/confirmaddress.php:52
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
 msgid "That address has already been confirmed."
 msgstr ""
 
-#: ../actions/confirmaddress.php:43
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
 msgid "That confirmation code is not for you!"
 msgstr ""
 
-#: ../actions/emailsettings.php:191
-msgid "That email address already belongs to another user."
-msgstr ""
-
-#: ../actions/avatar.php:80
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
 msgid "That file is too big."
 msgstr ""
 
-#: ../actions/imsettings.php:170
+#: ../actions/imsettings.php:161 ../actions/imsettings.php:170
+#: actions/imsettings.php:178
 msgid "That is already your Jabber ID."
 msgstr ""
 
-#: ../actions/emailsettings.php:188
-msgid "That is already your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:188
-msgid "That is already your phone number."
-msgstr ""
-
-#: ../actions/imsettings.php:233
+#: ../actions/imsettings.php:224 ../actions/imsettings.php:233
+#: actions/imsettings.php:241
 msgid "That is not your Jabber ID."
 msgstr ""
 
-#: ../actions/emailsettings.php:249
-msgid "That is not your email address."
-msgstr ""
-
-#: ../actions/smssettings.php:257
-msgid "That is not your phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
+#: ../actions/imsettings.php:201 ../actions/emailsettings.php:226
+#: ../actions/imsettings.php:210 actions/emailsettings.php:244
+#: actions/imsettings.php:218
 msgid "That is the wrong IM address."
 msgstr ""
 
-#: ../actions/smssettings.php:233
-msgid "That is the wrong confirmation number."
-msgstr ""
-
-#: ../actions/smssettings.php:191
-msgid "That phone number already belongs to another user."
-msgstr ""
-
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: ../actions/newnotice.php:52 ../actions/newnotice.php:49
+#: ../actions/twitapistatuses.php:408 actions/newnotice.php:49
+#: actions/twitapistatuses.php:330
 msgid "That's too long. Max notice size is 140 chars."
 msgstr ""
 
-#: ../actions/twitapiaccount.php:74
-msgid "That's too long. Max notice size is 255 chars."
-msgstr ""
-
-#: ../actions/confirmaddress.php:92
+#: ../actions/confirmaddress.php:86 ../actions/confirmaddress.php:92
+#: actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
 
-#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274
+#: ../actions/imsettings.php:241 ../actions/emailsettings.php:264
+#: ../actions/imsettings.php:250 ../actions/smssettings.php:274
+#: actions/emailsettings.php:282 actions/imsettings.php:258
+#: actions/smssettings.php:282
 msgid "The address was removed."
 msgstr ""
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:311 ../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 ""
 
-#: ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:321 ../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 ""
 
-#: ../actions/subscribers.php:35
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr ""
 
-#: ../actions/subscribers.php:33
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
 msgid "These are the people who listen to your notices."
 msgstr ""
 
-#: ../actions/subscriptions.php:35
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr ""
 
-#: ../actions/subscriptions.php:33
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
 msgid "These are the people whose notices you listen to."
 msgstr ""
 
-#: ../actions/invite.php:89
-msgid ""
-"These people are already users and you were automatically subscribed to them:"
-msgstr ""
-
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:87 ../actions/recoverpassword.php:88
 msgid "This confirmation code is too old. Please start again."
 msgstr ""
 
@@ -1758,7 +1416,7 @@ msgid ""
 "button to go to your OpenID provider."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:56
+#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -1766,105 +1424,73 @@ msgid ""
 "your existing account, if you have one."
 msgstr ""
 
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-msgid "This method requires a POST or DELETE."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381
-msgid "This method requires a POST."
-msgstr ""
-
-#: ../lib/util.php:164
+#: ../lib/util.php:147 ../lib/util.php:164 lib/util.php:246
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
-#: ../actions/profilesettings.php:63
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107
-msgid "Timezone not selected."
-msgstr ""
-
 #: ../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."
+"To subscribe, you can [login](%%action.login%%), or "
+"[register](%%action.register%%) a new  account. If you already have an "
+"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
+"your profile URL below."
 msgstr ""
 
-#: ../actions/twitapifriendships.php:163
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
-
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: ../actions/profilesettings.php:51 ../actions/profilesettings.php:48
+#: ../actions/register.php:169 actions/profilesettings.php:81
+#: actions/register.php:183
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
-#: ../actions/remotesubscribe.php:74
+#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
 msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
+#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
 #: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
-#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: ../actions/smssettings.php:135 actions/emailsettings.php:144
+#: actions/imsettings.php:118 actions/recoverpassword.php:39
+#: actions/smssettings.php:143 actions/twittersettings.php:108
 msgid "Unexpected form submission."
 msgstr ""
 
-#: ../actions/recoverpassword.php:276
+#: ../actions/recoverpassword.php:237 ../actions/recoverpassword.php:276
+#: actions/recoverpassword.php:289
 msgid "Unexpected password reset."
 msgstr ""
 
-#: ../index.php:57
-msgid "Unknown action"
-msgstr ""
-
 #: ../actions/finishremotesubscribe.php:58
+#: actions/finishremotesubscribe.php:60
 msgid "Unknown version of OMB protocol."
 msgstr ""
 
-#: ../lib/util.php:269
+#: ../lib/util.php:245 ../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 ""
 
-#: ../actions/confirmaddress.php:48
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr ""
 
-#: ../actions/showstream.php:209
+#: ../actions/showstream.php:193 ../actions/showstream.php:209
+#: actions/showstream.php:219
 msgid "Unsubscribe"
 msgstr ""
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
+#: ../actions/updateprofile.php:45 actions/postnotice.php:45
+#: actions/updateprofile.php:46
 msgid "Unsupported OMB version"
 msgstr ""
 
-#: ../actions/avatar.php:105
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
 msgid "Unsupported image file format."
 msgstr ""
 
-#: ../lib/settingsaction.php:100
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:241
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:341
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
 #: ../actions/avatar.php:68
 msgid "Upload"
 msgstr "�미지 올리기"
@@ -1877,131 +1503,874 @@ msgid ""
 "share."
 msgstr ""
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr ""
-
-#: ../actions/invite.php:114
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
-msgstr ""
-
+#: ../actions/profilesettings.php:48 ../actions/register.php:182
 #: ../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 ""
 
 #: ../actions/finishremotesubscribe.php:86
+#: actions/finishremotesubscribe.php:88
 msgid "User being listened to doesn't exist."
 msgstr ""
 
 #: ../actions/all.php:41 ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:47 ../actions/replies.php:41
-#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
-#: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
-#: ../actions/twitapiusers.php:82
+#: ../actions/foaf.php:43 ../actions/replies.php:41
+#: ../actions/showstream.php:44 ../actions/foaf.php:47
+#: ../actions/twitapiaccount.php:82 ../actions/twitapistatuses.php:319
+#: ../actions/twitapistatuses.php:685 ../actions/twitapiusers.php:82
+#: actions/all.php:41 actions/avatarbynickname.php:48 actions/foaf.php:47
+#: actions/replies.php:41 actions/showfavorites.php:41
+#: actions/showstream.php:44 actions/twitapiaccount.php:80
+#: actions/twitapifavorites.php:68 actions/twitapistatuses.php:235
+#: actions/twitapistatuses.php:609 actions/twitapiusers.php:87
+#: lib/mailbox.php:50
 msgid "User has no profile."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
 msgid "User nickname"
 msgstr ""
 
-#: ../actions/twitapiusers.php:75
-msgid "User not found."
-msgstr ""
-
-#: ../actions/profilesettings.php:63
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../lib/util.php:1159
+#: ../lib/util.php:969 ../lib/util.php:1159 lib/util.php:1293
 #, php-format
 msgid "What's up, %s?"
 msgstr ""
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: ../actions/profilesettings.php:57 ../actions/profilesettings.php:54
+#: ../actions/register.php:175 actions/profilesettings.php:87
+#: actions/register.php:189
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
-#: ../actions/updateprofile.php:128
+#: ../actions/updateprofile.php:127 ../actions/updateprofile.php:128
+#: actions/updateprofile.php:129
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr ""
 
-#: ../actions/updateprofile.php:123
+#: ../actions/updateprofile.php:122 ../actions/updateprofile.php:123
+#: actions/updateprofile.php:124
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr ""
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-msgid "Yes"
-msgstr ""
-
-#: ../actions/finishaddopenid.php:64
+#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr ""
 
-#: ../actions/deletenotice.php:37
-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 actions/recoverpassword.php:31
 msgid "You are already logged in!"
 msgstr ""
 
-#: ../actions/invite.php:81
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr ""
-
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
 msgstr ""
 
-#: ../actions/register.php:135
+#: ../actions/register.php:164 ../actions/register.php:135
+#: actions/register.php:145
 msgid "You can create a new account to start posting notices."
 msgstr ""
 
-#: ../actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
 
-#: ../actions/imsettings.php:28
+#: ../actions/imsettings.php:28 actions/imsettings.php:28
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about you."
+"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
 msgid "You can use the local subscription!"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
+#: ../actions/register.php:61 actions/finishopenidlogin.php:38
+#: actions/register.php:68
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 
-#: ../actions/updateprofile.php:63
+#: ../actions/updateprofile.php:62 ../actions/updateprofile.php:63
+#: actions/updateprofile.php:64
 msgid "You did not send us that profile"
 msgstr ""
 
+#: ../actions/recoverpassword.php:134 ../actions/recoverpassword.php:149
+msgid "You've been identified. Enter a  new password below. "
+msgstr ""
+
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+msgid "Your OpenID URL"
+msgstr ""
+
+#: ../actions/recoverpassword.php:149 ../actions/recoverpassword.php:164
+msgid "Your nickname on this server, or your registered email address."
+msgstr ""
+
+#: ../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 ""
+
+#: ../lib/util.php:814 ../lib/util.php:943 lib/util.php:992
+msgid "a few seconds ago"
+msgstr ""
+
+#: ../lib/util.php:826
+#, php-format
+msgid "about %d days ago"
+msgstr "%d�전"
+
+#: ../lib/util.php:822
+#, php-format
+msgid "about %d hours ago"
+msgstr "%d시간전"
+
+#: ../lib/util.php:818
+#, php-format
+msgid "about %d minutes ago"
+msgstr "%d분전"
+
+#: ../lib/util.php:830 ../lib/util.php:959 lib/util.php:1008
+#, php-format
+msgid "about %d months ago"
+msgstr ""
+
+#: ../lib/util.php:824 ../lib/util.php:953 lib/util.php:1002
+msgid "about a day ago"
+msgstr ""
+
+#: ../lib/util.php:816 ../lib/util.php:945 lib/util.php:994
+msgid "about a minute ago"
+msgstr ""
+
+#: ../lib/util.php:828 ../lib/util.php:957 lib/util.php:1006
+msgid "about a month ago"
+msgstr ""
+
+#: ../lib/util.php:832 ../lib/util.php:961 lib/util.php:1010
+msgid "about a year ago"
+msgstr ""
+
+#: ../lib/util.php:820 ../lib/util.php:949 lib/util.php:998
+msgid "about an hour ago"
+msgstr ""
+
+#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
+#: ../lib/stream.php:101 ../actions/noticesearch.php:130
+#: ../actions/showstream.php:408 ../lib/stream.php:117
+#: actions/noticesearch.php:136 actions/showstream.php:426 lib/stream.php:84
+msgid "in reply to..."
+msgstr ""
+
+#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
+#: ../lib/stream.php:108 ../actions/noticesearch.php:137
+#: ../actions/showstream.php:415 ../lib/stream.php:124
+#: actions/noticesearch.php:143 actions/showstream.php:433 lib/stream.php:91
+msgid "reply"
+msgstr ""
+
+#: ../actions/password.php:44 actions/profilesettings.php:183
+msgid "same as password above"
+msgstr ""
+
+#: ../lib/util.php:1127 ../lib/util.php:1309 lib/util.php:1443
+msgid "« After"
+msgstr ""
+
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+msgid " from "
+msgstr ""
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
+
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#, php-format
+msgid "%s public timeline"
+msgstr ""
+
+#: ../lib/mail.php:206 lib/mail.php:212
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/register.php:154 actions/register.php:168
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55
+msgid "API method not found!"
+msgstr ""
+
+#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
+#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
+#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
+#: ../actions/twitapidirect_messages.php:49
+#: ../actions/twitapidirect_messages.php:56
+#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
+#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
+#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
+#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
+#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
+#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
+#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
+#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
+#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
+#: actions/twitapistatuses.php:690
+msgid "API method under construction."
+msgstr ""
+
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
+
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for "
+"non-humans)"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
+
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr ""
+
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+msgid "Change email handling"
+msgstr ""
+
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+msgid "Change your profile settings"
+msgstr ""
+
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+msgid "Could not follow user: User not found."
+msgstr ""
+
+#: ../lib/subs.php:54 lib/subs.php:61
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: ../lib/subs.php:46 lib/subs.php:46
+msgid "Could not subscribe."
+msgstr ""
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+msgid "Couldn't update user record."
+msgstr ""
+
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr ""
+
+#: ../classes/Notice.php:72 classes/Notice.php:86
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr ""
+
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr ""
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr ""
+
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: ../actions/tag.php:55 actions/tag.php:55
+#, php-format
+msgid "Feed for tag %s"
+msgstr ""
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr ""
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr ""
+
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+msgid "I want to post notices by email."
+msgstr ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+msgid "IM"
+msgstr ""
+
+#: ../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
+msgid "Incoming email"
+msgstr ""
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+msgid "Incoming email address removed."
+msgstr ""
+
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Language"
+msgstr ""
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+msgid "Language is too long (max 50 chars)."
+msgstr ""
+
+#: ../actions/register.php:166 actions/register.php:180
+msgid "Longer name, preferably your \"real\" name"
+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 ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr ""
+
+#: ../lib/mail.php:144 lib/mail.php:144
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+msgid "New incoming email address added."
+msgstr ""
+
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+msgid "No"
+msgstr ""
+
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr ""
+
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+msgid "No email address."
+msgstr ""
+
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+msgid "No incoming email address."
+msgstr ""
+
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+msgid "No status with that ID found."
+msgstr ""
+
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+msgid "Not a registered user."
+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
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+msgid "Not found"
+msgstr ""
+
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr ""
+
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
+
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr ""
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr ""
+
+#: ../actions/invite.php:133 actions/invite.php:141
+msgid "Personal message"
+msgstr ""
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Preferred language"
+msgstr ""
+
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/register.php:28 actions/register.php:28
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+msgid "Registration successful"
+msgstr ""
+
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/register.php:156 actions/register.php:170
+msgid "Same as password above. Required."
+msgstr ""
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr ""
+
+#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
+#: actions/emailsettings.php:74 actions/smssettings.php:82
+msgid "Send email to this address to post new notices."
+msgstr ""
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../actions/tag.php:60 actions/tag.php:60
+msgid "Showing most popular tags from the last week"
+msgstr ""
+
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317
+msgid "Tags"
+msgstr ""
+
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
+msgid "Text"
+msgstr ""
+
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+msgid "That is not your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+msgid "That is not your phone number."
+msgstr ""
+
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/invite.php:89 actions/invite.php:96
+msgid ""
+"These people are already users and you were automatically subscribed to "
+"them:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511
+msgid "This method requires a POST or 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
+msgid "This method requires a POST."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+msgid "Timezone not selected."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+msgid "Two user ids or screen_names must be supplied."
+msgstr ""
+
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this "
+"service."
+msgstr ""
+
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+msgid "Yes"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+msgid "You are not friends with the specified user."
+msgstr ""
+
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
 #: ../lib/mail.php:147
 #, php-format
 msgid ""
@@ -2015,106 +2384,615 @@ msgid ""
 "%4$s"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:612
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
 msgid "You may not delete another user's status."
 msgstr ""
 
-#: ../actions/invite.php:31
+#: ../actions/invite.php:31 actions/invite.php:31
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr ""
 
-#: ../actions/invite.php:103
+#: ../actions/invite.php:103 actions/invite.php:110
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
 msgstr ""
 
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
+#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99
+msgid "delete"
 msgstr ""
 
-#: ../actions/openidlogin.php:67
-msgid "Your OpenID URL"
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+msgid "unsupported file type"
 msgstr ""
 
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
+#: actions/deletenotice.php:74 actions/disfavor.php:43
+#: actions/emailsettings.php:127 actions/favor.php:45
+#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
+#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
+#: actions/openidsettings.php:123 actions/profilesettings.php:47
+#: actions/recoverpassword.php:282 actions/register.php:42
+#: actions/remotesubscribe.php:40 actions/smssettings.php:124
+#: actions/subscribe.php:44 actions/twittersettings.php:97
+#: actions/unsubscribe.php:41 actions/userauthorization.php:35
+msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: ../actions/openidsettings.php:28
+#: actions/disfavor.php:55
+msgid "This notice is not a favorite!"
+msgstr ""
+
+#: actions/disfavor.php:63
+msgid "Could not delete favorite."
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Favor"
+msgstr ""
+
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+
+#: actions/emailsettings.php:95
+msgid "Send me email when someone sends me a private message."
+msgstr ""
+
+#: actions/favor.php:53 actions/twitapifavorites.php:142
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132
+msgid "Could not create favorite."
+msgstr ""
+
+#: actions/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#, php-format
+msgid "%s favorite notices"
+msgstr ""
+
+#: actions/favoritesrss.php:64
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr ""
+
+#: actions/inbox.php:28
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+
+#: actions/invite.php:178
 #, php-format
 msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
-"account.  Manage your associated OpenIDs from here."
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
 msgstr ""
 
-#: ../lib/util.php:943
-msgid "a few seconds ago"
+#: actions/login.php:104
+msgid "Automatically login in the future; "
+msgstr ""
+
+#: actions/login.php:122
+msgid "For security reasons, please re-enter your "
+msgstr ""
+
+#: actions/login.php:126
+msgid "Login with your username and password. "
+msgstr ""
+
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+msgid "That's too long. Max message size is 140 chars."
 msgstr ""
 
-#: ../lib/util.php:955
+#: actions/newmessage.php:65
+msgid "No recipient specified."
+msgstr ""
+
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206
+msgid "You can't send a message to this user."
+msgstr ""
+
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly "
+"instead."
+msgstr ""
+
+#: actions/newmessage.php:108
+msgid "No such user"
+msgstr ""
+
+#: actions/newmessage.php:117
+msgid "New message"
+msgstr ""
+
+#: actions/noticesearch.php:95
+msgid "Notice without matching profile"
+msgstr ""
+
+#: actions/openidsettings.php:28
 #, php-format
-msgid "about %d days ago"
-msgstr "%d�전"
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr ""
+
+#: actions/openidsettings.php:46
+msgid "If you want to add an OpenID to your account, "
+msgstr ""
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr ""
 
-#: ../lib/util.php:951
+#: actions/openidsettings.php:87
+msgid "You can remove an OpenID from your account "
+msgstr ""
+
+#: actions/outbox.php:28
 #, php-format
-msgid "about %d hours ago"
-msgstr "%d시간전"
+msgid "Outbox for %s - page %d"
+msgstr ""
 
-#: ../lib/util.php:947
+#: actions/outbox.php:30
 #, php-format
-msgid "about %d minutes ago"
-msgstr "%d분전"
+msgid "Outbox for %s"
+msgstr ""
 
-#: ../lib/util.php:959
+#: actions/outbox.php:53
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+
+#: actions/peoplesearch.php:28
 #, php-format
-msgid "about %d months ago"
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
 msgstr ""
 
-#: ../lib/util.php:953
-msgid "about a day ago"
+#: actions/profilesettings.php:27
+msgid "You can update your personal profile info here "
 msgstr ""
 
-#: ../lib/util.php:945
-msgid "about a minute ago"
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+msgid "User without matching profile"
 msgstr ""
 
-#: ../lib/util.php:957
-msgid "about a month ago"
+#: actions/recoverpassword.php:91
+msgid "This confirmation code is too old. "
 msgstr ""
 
-#: ../lib/util.php:961
-msgid "about a year ago"
+#: actions/recoverpassword.php:141
+msgid "If you've forgotten or lost your"
 msgstr ""
 
-#: ../lib/util.php:949
-msgid "about an hour ago"
+#: actions/recoverpassword.php:154
+msgid "You've been identified. Enter a "
 msgstr ""
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-msgid "delete"
+#: actions/recoverpassword.php:169
+msgid "Your nickname on this server, "
 msgstr ""
 
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117
-msgid "in reply to..."
+#: actions/recoverpassword.php:271
+msgid "Instructions for recovering your password "
 msgstr ""
 
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124
-msgid "reply"
+#: actions/recoverpassword.php:327
+msgid "New password successfully saved. "
 msgstr ""
 
-#: ../actions/password.php:44
-msgid "same as password above"
+#: actions/register.php:95
+msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:755
-msgid "unsupported file type"
+#: actions/register.php:216
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
 msgstr ""
 
-#: ../lib/util.php:1309
-msgid "« After"
+#: actions/register.php:227
+msgid "(You should receive a message by email momentarily, with "
+msgstr ""
+
+#: actions/remotesubscribe.php:51
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
+msgstr ""
+
+#: actions/showfavorites.php:61
+#, php-format
+msgid "Feed for favorites of %s"
+msgstr ""
+
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+msgid "Could not retrieve favorite notices."
+msgstr ""
+
+#: actions/showmessage.php:33
+msgid "No such message."
+msgstr ""
+
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
+msgstr ""
+
+#: actions/showmessage.php:61
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr ""
+
+#: actions/showmessage.php:66
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr ""
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr ""
+
+#: actions/smssettings.php:312
+#, php-format
+msgid "Mobile carrier for your phone. "
+msgstr ""
+
+#: actions/twitapidirect_messages.php:76
+#, php-format
+msgid "Direct messages to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:77
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:81
+msgid "Direct Messages You've Sent"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:82
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:128
+msgid "No message text!"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:138
+msgid "Recipient user not found."
+msgstr ""
+
+#: actions/twitapidirect_messages.php:141
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
+#: actions/twitapifavorites.php:92
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr ""
+
+#: actions/twitapifavorites.php:95
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr ""
+
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#, php-format
+msgid "%s added your notice as a favorite"
+msgstr ""
+
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+msgstr ""
+
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+msgstr ""
+
+#: actions/twittersettings.php:41
+msgid "Twitter settings"
+msgstr ""
+
+#: actions/twittersettings.php:48
+msgid "Twitter Account"
+msgstr ""
+
+#: actions/twittersettings.php:56
+msgid "Current verified Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr ""
+
+#: actions/twittersettings.php:65
+msgid "No spaces, please."
+msgstr ""
+
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr ""
+
+#: actions/twittersettings.php:72
+msgid "Automatically send my notices to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:75
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:78
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+
+#: actions/twittersettings.php:128
+msgid "Could not verify your Twitter credentials!"
+msgstr ""
+
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+msgid "Unable to save your Twitter settings!"
+msgstr ""
+
+#: actions/twittersettings.php:174
+msgid "Twitter settings saved."
+msgstr ""
+
+#: actions/twittersettings.php:192
+msgid "That is not your Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+msgid "Couldn't remove Twitter user."
+msgstr ""
+
+#: actions/twittersettings.php:212
+msgid "Twitter account removed."
+msgstr ""
+
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+msgid "Couldn't save Twitter preferences."
+msgstr ""
+
+#: actions/twittersettings.php:245
+msgid "Twitter preferences saved."
+msgstr ""
+
+#: actions/userauthorization.php:84
+msgid "Please check these details to make sure "
+msgstr ""
+
+#: actions/userauthorization.php:324
+msgid "The subscription has been authorized, but no "
+msgstr ""
+
+#: actions/userauthorization.php:334
+msgid "The subscription has been rejected, but no "
+msgstr ""
+
+#: classes/Channel.php:113
+msgid "Command results"
+msgstr ""
+
+#: classes/Channel.php:148
+msgid "Command complete"
+msgstr ""
+
+#: classes/Channel.php:158
+msgid "Command failed"
+msgstr ""
+
+#: classes/Command.php:39
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: classes/Command.php:96
+#, php-format
+msgid "Subscriptions: %1$s\n"
+msgstr ""
+
+#: classes/Command.php:125 classes/Command.php:242
+msgid "User has no last notice"
+msgstr ""
+
+#: classes/Command.php:146
+msgid "Notice marked as fave."
+msgstr ""
+
+#: classes/Command.php:166
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr ""
+
+#: classes/Command.php:169
+#, php-format
+msgid "Fullname: %s"
+msgstr ""
+
+#: classes/Command.php:172
+#, php-format
+msgid "Location: %s"
+msgstr ""
+
+#: classes/Command.php:175
+#, php-format
+msgid "Homepage: %s"
+msgstr ""
+
+#: classes/Command.php:178
+#, php-format
+msgid "About: %s"
+msgstr ""
+
+#: classes/Command.php:200
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
+
+#: classes/Command.php:214
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
+
+#: classes/Command.php:216
+msgid "Error sending direct message."
+msgstr ""
+
+#: classes/Command.php:263
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: classes/Command.php:270
+#, php-format
+msgid "Subscribed to %s"
+msgstr ""
+
+#: classes/Command.php:288
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
+
+#: classes/Command.php:295
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr ""
+
+#: classes/Command.php:310 classes/Command.php:330
+msgid "Command not yet implemented."
+msgstr ""
+
+#: classes/Command.php:313
+msgid "Notification off."
+msgstr ""
+
+#: classes/Command.php:315
+msgid "Can't turn off notification."
+msgstr ""
+
+#: classes/Command.php:333
+msgid "Notification on."
+msgstr ""
+
+#: classes/Command.php:335
+msgid "Can't turn on notification."
+msgstr ""
+
+#: classes/Command.php:344
+msgid "Commands:\n"
+msgstr ""
+
+#: classes/Message.php:53
+msgid "Could not insert message."
+msgstr ""
+
+#: classes/Message.php:63
+msgid "Could not update message with new URI."
+msgstr ""
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr ""
+
+#: lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:249
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:253
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+msgstr ""
+
+#: lib/mailbox.php:43
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/openid.php:195
+msgid "This form should automatically submit itself. "
+msgstr ""
+
+#: lib/personal.php:65
+msgid "Favorites"
+msgstr ""
+
+#: lib/personal.php:66
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
+#: lib/personal.php:66
+msgid "User"
+msgstr ""
+
+#: lib/personal.php:75
+msgid "Inbox"
+msgstr ""
+
+#: lib/personal.php:76
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personal.php:80
+msgid "Outbox"
+msgstr ""
+
+#: lib/personal.php:81
+msgid "Your sent messages"
+msgstr ""
+
+#: lib/settingsaction.php:99
+msgid "Twitter"
+msgstr ""
+
+#: lib/settingsaction.php:100
+msgid "Twitter integration options"
+msgstr ""
+
+#: lib/util.php:1718
+msgid "To"
+msgstr ""
+
+#: scripts/maildaemon.php:45
+msgid "Could not parse message."
 msgstr ""
diff --git a/locale/mk_MK/LC_MESSAGES/laconica.mo b/locale/mk_MK/LC_MESSAGES/laconica.mo
index e2e8f9cbe..8fa1d1997 100644
--- a/locale/mk_MK/LC_MESSAGES/laconica.mo
+++ b/locale/mk_MK/LC_MESSAGES/laconica.mo
diff --git a/locale/mk_MK/LC_MESSAGES/laconica.po b/locale/mk_MK/LC_MESSAGES/laconica.po
index 8ec8586e3..67538ce60 100644
--- a/locale/mk_MK/LC_MESSAGES/laconica.po
+++ b/locale/mk_MK/LC_MESSAGES/laconica.po
@@ -1,83 +1,58 @@
+# #-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2008 FREE SOFTWARE MACEDONIA
 # This file is distributed under the same license as the PACKAGE package.
 # IGOR STAMATOVSKI <igor@slobodensoftver.org.mk>, 2008.
 #
+# #-#-#-#-#  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.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-27 14:57-0400\n"
+"POT-Creation-Date: 2008-07-14 21:07+1200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: NOVICA NAKOV <novica@slobodensoftver.org.mk>\n"
 "Language-Team: Macedonian <info@slobodensoftver.org.mk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: ../actions/noticesearchrss.php:64
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "Пребарувај го потокот за „%s“"
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
 msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr ""
-"о�вен �ледниве лични податоци: лозинка, адре�а за е-пошта, адре�а за ИМ, "
-"телефон�ки број."
-
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-msgid " from "
-msgstr ""
-
-#: ../actions/twitapistatuses.php:478
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/invite.php:168
-#, fuzzy, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s �ега ги �леди вашите забелешки за %2$s."
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
+" except this private data: password, email address, IM address, phone "
+"number."
 msgstr ""
+"о�вен �ледниве лични податоци: лозинка, "
+"адре�а за е-пошта, адре�а за ИМ, телефон�ки број."
 
-#: ../lib/mail.php:124
+#: ../actions/subscribe.php:84
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s �ега ги �леди вашите забелешки за %2$s."
 
-#: ../lib/mail.php:126
+#: ../actions/subscribe.php:86
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -87,161 +62,75 @@ msgid ""
 "Faithfully yours,\n"
 "%4$s.\n"
 msgstr ""
-"%1$s �ега ги �леди вашите забелешки на %2$s.\n"
-"\n"
-"\t%3$s\n"
+"%1$s �ега ги �леди вашите забелешки на "
+"%2$s.\n"
 "\n"
-"И�крено ваш,\n"
-"%4$s.\n"
-
-#: ../actions/twitapistatuses.php:482
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
+"\t%3$s\n\nИ�крено ваш,\n%4$s.\n"
 
 #: ../actions/shownotice.php:45
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s �тату� на %2$s"
 
-#: ../actions/invite.php:84 ../actions/invite.php:92
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:60
 #, php-format
 msgid "%s Public Stream"
 msgstr "Јавниот поток на %s"
 
-#: ../actions/all.php:47 ../actions/allrss.php:60
-#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51
+#: ../actions/all.php:47 ../actions/allrss.php:70 ../lib/stream.php:45
 #, php-format
 msgid "%s and friends"
 msgstr "%s и пријателите"
 
-#: ../actions/twitapistatuses.php:49
-#, fuzzy, php-format
-msgid "%s public timeline"
-msgstr "Јавна и�торија"
-
-#: ../lib/mail.php:206
-#, fuzzy, php-format
-msgid "%s status"
-msgstr "%1$s �тату� на %2$s"
-
-#: ../actions/twitapistatuses.php:338
-#, fuzzy, php-format
-msgid "%s timeline"
-msgstr "Јавна и�торија"
-
-#: ../actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:213
-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:233
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** is a microblogging service brought to you by "
+"[%%site.broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
-"**%%site.name%%** е �ерви� за микроблогирање што ви го овозможува [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** е �ерви� за микроблогирање што "
+"ви го овозможува [%%site.broughtby%%](%%site.broughtbyurl%%). "
 
-#: ../lib/util.php:259
+#: ../lib/util.php:235
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** е �ерви� за микроблогирање."
 
-#: ../lib/util.php:274
+#: ../lib/util.php:250
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ". Придоне�увачите треба да бидат наведени �о цело име или прекар."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
+#: ../actions/register.php:176
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 мали букви или бројки. Без интерпукци�ки знаци и празни ме�та."
 
-#: ../actions/register.php:152
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64 мали букви или бројки. Без интерпукци�ки знаци и празни ме�та."
-
-#: ../actions/password.php:42
+#: ../actions/password.php:42 ../actions/register.php:178
 msgid "6 or more characters"
 msgstr "6 или повеќе знаци"
 
-#: ../actions/recoverpassword.php:180
+#: ../actions/recoverpassword.php:165
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 или повеќе знаци и не ја заборавајте!"
 
-#: ../actions/register.php:154
-#, fuzzy
-msgid "6 or more characters. Required."
-msgstr "6 или повеќе знаци"
-
-#: ../actions/imsettings.php:197
+#: ../actions/imsettings.php:188
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
-msgstr ""
-"И�пративме код за потврда на IM адре�ата што ја додадовте. Мора да го "
-"одобрите %S за да ви и�праќа пораки."
-
-#: ../actions/emailsettings.php:213
-#, fuzzy
-msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
-msgstr ""
-"И�пративме код за потврда на IM адре�ата што ја додадовте. Мора да го "
-"одобрите %S за да ви и�праќа пораки."
-
-#: ../actions/smssettings.php:216
-#, fuzzy
-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 ""
-"И�пративме код за потврда на IM адре�ата што ја додадовте. Мора да го "
-"одобрите %S за да ви и�праќа пораки."
-
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122
-msgid "API method not found!"
+"A confirmation code was sent to the IM address you added. You must approve "
+"%s for sending messages to you."
 msgstr ""
+"И�пративме код за потврда на IM адре�ата "
+"што ја додадовте. Мора да го одобрите %S за да ви и�праќа пораки."
 
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-msgid "API method under construction."
-msgstr ""
-
-#: ../lib/util.php:324
+#: ../lib/util.php:296
 msgid "About"
 msgstr "За"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/userauthorization.php:118
 msgid "Accept"
 msgstr "Прифати"
 
-#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
-#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
 msgid "Add"
 msgstr "Додај"
 
@@ -249,25 +138,15 @@ msgstr "Додај"
 msgid "Add OpenID"
 msgstr "Додај OpenID"
 
-#: ../lib/settingsaction.php:97
-#, fuzzy
-msgid "Add or remove OpenIDs"
-msgstr "От�трани го OpenID-то"
-
-#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39
+#: ../actions/imsettings.php:39
 msgid "Address"
 msgstr "�дре�а"
 
-#: ../actions/invite.php:131
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../actions/showstream.php:273
+#: ../actions/showstream.php:254
 msgid "All subscriptions"
 msgstr "Сите претплати"
 
-#: ../actions/publicrss.php:64
+#: ../actions/publicrss.php:62
 #, php-format
 msgid "All updates for %s"
 msgstr "Сите новини од %s"
@@ -277,34 +156,26 @@ msgstr "Сите новини од %s"
 msgid "All updates matching search term \"%s\""
 msgstr "Сите новини кои �е еднакви �о бараниот термин „%s“"
 
-#: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
-#: ../actions/openidlogin.php:29 ../actions/register.php:30
+#: ../actions/finishopenidlogin.php:29 ../actions/login.php:27
+#: ../actions/openidlogin.php:29 ../actions/register.php:28
 msgid "Already logged in."
 msgstr "Веќе �те најавени."
 
-#: ../lib/subs.php:42
+#: ../actions/subscribe.php:48
 msgid "Already subscribed!."
 msgstr "Веќе �те претплатени!"
 
-#: ../actions/deletenotice.php:54
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/userauthorization.php:77
+#: ../actions/userauthorization.php:76
 msgid "Authorize subscription"
 msgstr "Одобрете ја претплатата"
 
-#: ../actions/login.php:104 ../actions/register.php:178
+#: ../actions/login.php:100 ../actions/register.php:184
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
-"Следниот пат најавете �е автомат�ки; не за компјутери кои ги делите �о други!"
+"Следниот пат најавете �е автомат�ки; не "
+"за компјутери кои ги делите �о други!"
 
-#: ../actions/profilesettings.php:65
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr ""
-
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: ../actions/avatar.php:32
 msgid "Avatar"
 msgstr "�ватар"
 
@@ -318,53 +189,32 @@ 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 на вашата ли�та �о "
-"пријатели?)"
-
-#: ../actions/emailsettings.php:54
-#, fuzzy
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-msgstr ""
-"Чекам потвдар за оваа адре�а. Проверете ја вашата Jabber/GTalk �метка за "
-"порака �о понатамошни ин�трукции. (Дали го додадовте %s на вашата ли�та �о "
-"пријатели?)"
-
-#: ../actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
+"Чекам потвдар за оваа адре�а. Проверете "
+"ја вашата Jabber/GTalk �метка за порака �о "
+"понатамошни ин�трукции. (Дали го додадовте %s на вашата ли�та �о пријатели?)"
 
-#: ../lib/util.php:1318
+#: ../lib/util.php:1136
 msgid "Before »"
 msgstr "Предходни »"
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: ../actions/profilesettings.php:52
 msgid "Bio"
 msgstr "Био"
 
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103
+#: ../actions/profilesettings.php:93 ../actions/updateprofile.php:102
 msgid "Bio is too long (max 140 chars)."
 msgstr "Биографијата е предолга (мак�имумот е 140 знаци)."
 
-#: ../lib/deleteaction.php:41
-#, fuzzy
-msgid "Can't delete this notice."
-msgstr "�е може да �е креира потврда за е-пошта."
-
-#: ../actions/updateprofile.php:119
+#: ../actions/updateprofile.php:118
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "�е може да �е прочита URL-то на аватарот: '%s'"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
+#: ../actions/password.php:85 ../actions/recoverpassword.php:261
 msgid "Can't save new password."
 msgstr "�овата лозинка не може да �е �ними"
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62
+#: ../actions/imsettings.php:59
 msgid "Cancel"
 msgstr "Откажи"
 
@@ -372,79 +222,35 @@ msgstr "Откажи"
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "�е е возможно да �е ин�танцира OpenID објект за потрошувачка."
 
-#: ../actions/imsettings.php:163
+#: ../actions/imsettings.php:154
 msgid "Cannot normalize that Jabber ID"
 msgstr "Ова JabberID не може да �е нормализира."
 
-#: ../actions/emailsettings.php:181
-#, fuzzy
-msgid "Cannot normalize that email address"
-msgstr "Ова JabberID не може да �е нормализира."
-
 #: ../actions/password.php:45
 msgid "Change"
 msgstr "Промени"
 
-#: ../lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
 #: ../actions/password.php:32
 msgid "Change password"
 msgstr "Промени ја лозинката"
 
-#: ../lib/settingsaction.php:94
-#, fuzzy
-msgid "Change your password"
-msgstr "Промени ја лозинката"
-
-#: ../lib/settingsaction.php:85
-#, fuzzy
-msgid "Change your profile settings"
-msgstr "По�тавки на профилот"
-
-#: ../actions/password.php:43 ../actions/recoverpassword.php:181
-#: ../actions/register.php:155 ../actions/smssettings.php:65
+#: ../actions/password.php:43 ../actions/recoverpassword.php:166
+#: ../actions/register.php:179
 msgid "Confirm"
 msgstr "Потврди"
 
-#: ../actions/confirmaddress.php:90
+#: ../actions/confirmaddress.php:84
 msgid "Confirm Address"
 msgstr "Потврди ја адре�ата"
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245
+#: ../actions/imsettings.php:213
 msgid "Confirmation cancelled."
 msgstr "Потврдата е откажана"
 
-#: ../actions/smssettings.php:63
-#, fuzzy
-msgid "Confirmation code"
-msgstr "�ема код за потврда."
-
 #: ../actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr "Кодот за потврда не е пронајден."
 
-#: ../actions/register.php:202
-#, php-format
-msgid ""
-"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."
-msgstr ""
-
 #: ../actions/finishopenidlogin.php:91
 msgid "Connect"
 msgstr "Поврзи �е"
@@ -453,7 +259,7 @@ msgstr "Поврзи �е"
 msgid "Connect existing account"
 msgstr "Поврзи �е �о по�тоечка �метка"
 
-#: ../lib/util.php:332
+#: ../lib/util.php:304
 msgid "Contact"
 msgstr "Контакт"
 
@@ -462,66 +268,44 @@ msgstr "Контакт"
 msgid "Could not create OpenID form: %s"
 msgstr "OpenID формуларот не може да �е креира:%s"
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr ""
-
 #: ../lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "�е може да �е прена�очи кон �ерверот: %s"
 
-#: ../actions/updateprofile.php:162
+#: ../actions/updateprofile.php:161
 msgid "Could not save avatar info"
 msgstr "Информациите за аватарот не може да �е �нимат"
 
-#: ../actions/updateprofile.php:155
+#: ../actions/updateprofile.php:154
 msgid "Could not save new profile info"
 msgstr "Информациите за новиот профил не може да �е �нимат"
 
-#: ../lib/subs.php:54
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../lib/subs.php:46
-#, fuzzy
-msgid "Could not subscribe."
-msgstr "�е �те претплатени!"
-
-#: ../actions/recoverpassword.php:102
-#, fuzzy
-msgid "Could not update user with confirmed email address."
-msgstr "Кодот за потврда не може да �е вне�е."
+#: ../actions/profilesettings.php:146
+msgid "Couldn't confirm email."
+msgstr "�дре�ата за е-пошта неможе да �е потврди."
 
 #: ../actions/finishremotesubscribe.php:99
 msgid "Couldn't convert request tokens to access tokens."
 msgstr "Белезите за барање не може да �е конвертираат во белези за при�тап."
 
-#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
-#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#: ../actions/subscribe.php:59
+msgid "Couldn't create subscription."
+msgstr "�е може да �е креира претплатата"
+
+#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
 msgid "Couldn't delete email confirmation."
 msgstr "�е може да �е креира потврда за е-пошта."
 
-#: ../lib/subs.php:103
+#: ../actions/unsubscribe.php:56
 msgid "Couldn't delete subscription."
 msgstr "Претплата не може да �е избрише."
 
-#: ../actions/twitapistatuses.php:93
-#, fuzzy
-msgid "Couldn't find any statuses."
-msgstr "Кори�никот не може да �е о�вежи/"
-
-#: ../actions/remotesubscribe.php:127
+#: ../actions/remotesubscribe.php:125
 msgid "Couldn't get a request token."
 msgstr "�е може да �е земе белег за барање."
 
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206
+#: ../actions/imsettings.php:178
 msgid "Couldn't insert confirmation code."
 msgstr "Кодот за потврда не може да �е вне�е."
 
@@ -529,24 +313,12 @@ msgstr "Кодот за потврда не може да �е вне�е."
 msgid "Couldn't insert new subscription."
 msgstr "�е може да �е вне�е нова претплата."
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: ../actions/profilesettings.php:175
 msgid "Couldn't save profile."
 msgstr "Профилот не може да �е �ними."
 
-#: ../actions/profilesettings.php:161
-#, fuzzy
-msgid "Couldn't update user for autosubscribe."
-msgstr "Кори�никот не може да �е о�вежи/"
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#, fuzzy
-msgid "Couldn't update user record."
-msgstr "Кори�никот не може да �е о�вежи/"
-
-#: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
-#: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
-#: ../actions/imsettings.php:243 ../actions/profilesettings.php:141
-#: ../actions/smssettings.php:157 ../actions/smssettings.php:269
+#: ../actions/confirmaddress.php:70 ../actions/imsettings.php:129
+#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
 msgid "Couldn't update user."
 msgstr "Кори�никот не може да �е о�вежи/"
 
@@ -570,83 +342,44 @@ msgstr "Креирање на нова �метка за OpenID што веќе
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Моментално потврдена Jabber/GTalk адре�а."
 
-#: ../actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:44
-#, fuzzy
-msgid "Current confirmed email address."
-msgstr "Моментално потврдена Jabber/GTalk адре�а."
-
-#: ../actions/showstream.php:356
+#: ../actions/showstream.php:337
 msgid "Currently"
 msgstr "Моментално"
 
-#: ../classes/Notice.php:72
-#, fuzzy, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "Одговор од вне�от во базата: %s"
-
-#: ../lib/util.php:1061
+#: ../lib/util.php:893
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Одговор од вне�от во базата: %s"
 
-#: ../actions/deletenotice.php:41
-#, fuzzy
-msgid "Delete notice"
-msgstr "�ово изве�тување"
-
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: ../actions/profilesettings.php:54
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Опишете �е �ебе �и и �оп�твените интере�и во 140 знаци."
 
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87
+#: ../actions/register.php:181
 msgid "Email"
 msgstr "Е-пошта"
 
-#: ../actions/emailsettings.php:59
-#, fuzzy
-msgid "Email Address"
+#: ../actions/profilesettings.php:46
+msgid "Email address"
 msgstr "�дре�а за е-пошта"
 
-#: ../actions/emailsettings.php:32
-#, fuzzy
-msgid "Email Settings"
-msgstr "По�тавки"
-
-#: ../actions/register.php:73
+#: ../actions/profilesettings.php:102 ../actions/register.php:63
 msgid "Email address already exists."
 msgstr "�дре�ата веќе по�тои."
 
-#: ../lib/mail.php:90
+#: ../lib/mail.php:82
 msgid "Email address confirmation"
 msgstr "Потврдување на адре�ата"
 
-#: ../actions/emailsettings.php:61
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/invite.php:129
-#, fuzzy
-msgid "Email addresses"
-msgstr "�дре�а за е-пошта"
-
-#: ../actions/recoverpassword.php:191
+#: ../actions/recoverpassword.php:176
 msgid "Enter a nickname or email address."
 msgstr "Вне�ете прекар или е-пошта"
 
-#: ../actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/userauthorization.php:137
+#: ../actions/userauthorization.php:136
 msgid "Error authorizing token"
 msgstr "Грешка во проверувањето на белегот"
 
-#: ../actions/finishopenidlogin.php:253
+#: ../actions/finishopenidlogin.php:282
 msgid "Error connecting user to OpenID."
 msgstr "Грешка во поврзувањето на кори�никот �о OpenID"
 
@@ -662,19 +395,23 @@ msgstr "Грешка во вне�увањето на аватарот"
 msgid "Error inserting new profile"
 msgstr "Грешка во вне�увањето на новиот профил"
 
+#: ../actions/postnotice.php:88
+msgid "Error inserting notice"
+msgstr "Грешка во вне�увањето на изве�тувањето"
+
 #: ../actions/finishremotesubscribe.php:167
 msgid "Error inserting remote profile"
 msgstr "Грешка во вне�увањето на оддалечениот профил"
 
-#: ../actions/recoverpassword.php:240
+#: ../actions/recoverpassword.php:201
 msgid "Error saving address confirmation."
 msgstr "Грешка во �нимањето на потвдата за адре�ата."
 
-#: ../actions/userauthorization.php:140
+#: ../actions/userauthorization.php:139
 msgid "Error saving remote profile"
 msgstr "Грешка во �нимањето на оддалечениот профил"
 
-#: ../lib/openid.php:226
+#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
 msgid "Error saving the profile."
 msgstr "Грешка во �нимањето на профилот."
 
@@ -686,8 +423,8 @@ msgstr "Грешка во �нимањето на кори�никот."
 msgid "Error saving user; invalid."
 msgstr "Грешка во �нимањето на кори�никот; неправилен."
 
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
+#: ../actions/login.php:43 ../actions/login.php:69
+#: ../actions/recoverpassword.php:268 ../actions/register.php:73
 msgid "Error setting user."
 msgstr "Грешка во по�тавувањето на кори�никот."
 
@@ -699,7 +436,7 @@ msgstr "Грешка во о�вежувањето на профилот"
 msgid "Error updating remote profile"
 msgstr "Грешка во о�вежувањето на оддалечениот профил"
 
-#: ../actions/recoverpassword.php:80
+#: ../actions/recoverpassword.php:79
 msgid "Error with confirmation code."
 msgstr "Грешка �о кодот за потврдување."
 
@@ -707,7 +444,7 @@ msgstr "Грешка �о кодот за потврдување."
 msgid "Existing nickname"
 msgstr "По�тоечки прекар"
 
-#: ../lib/util.php:326
+#: ../lib/util.php:298
 msgid "FAQ"
 msgstr "ЧПП"
 
@@ -715,71 +452,49 @@ msgstr "ЧПП"
 msgid "Failed updating avatar."
 msgstr "Товарањето на аватарот не у�пеа."
 
-#: ../actions/all.php:61 ../actions/allrss.php:64
+#: ../actions/all.php:61 ../actions/allrss.php:74
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Канал �о пријатели на %S"
 
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: ../actions/replies.php:61 ../actions/repliesrss.php:80
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Канал �о одговори на %s"
 
-#: ../actions/tag.php:55
-#, fuzzy, php-format
-msgid "Feed for tag %s"
-msgstr "Канал �о одговори на %s"
-
-#: ../lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/login.php:122
+#: ../actions/login.php:118
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
-"Поради безбедно�ни причини треба повторно да го вне�ете Вашето кори�ничко "
-"име и лозинка пред да ги �мените Вашите по�тавки."
+"Поради безбедно�ни причини треба "
+"повторно да го вне�ете Вашето кори�ничко име и лозинка пред да ги �мените Вашите по�тавки."
 
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: ../actions/profilesettings.php:44
 msgid "Full name"
 msgstr "Цело име"
 
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93
+#: ../actions/profilesettings.php:90 ../actions/updateprofile.php:92
 msgid "Full name is too long (max 255 chars)."
 msgstr "Целото име е предолго (мак�имум 255 знаци)"
 
-#: ../lib/util.php:322
+#: ../lib/util.php:279
 msgid "Help"
 msgstr "Помош"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:274
 msgid "Home"
 msgstr "Дома"
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: ../actions/profilesettings.php:49
 msgid "Homepage"
 msgstr "Домашна �траница"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: ../actions/profilesettings.php:87
 msgid "Homepage is not a valid URL."
 msgstr "Домашната �траница не е правилно URL."
 
-#: ../actions/emailsettings.php:91
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102
-msgid "IM"
-msgstr ""
-
-#: ../actions/imsettings.php:60
+#: ../actions/imsettings.php:61
 msgid "IM Address"
 msgstr "IM адре�а"
 
@@ -792,67 +507,52 @@ 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
-#, fuzzy
+#: ../actions/recoverpassword.php:122
 msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
+"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 ""
-"�ко �те ја заборавиле или загубиле лозинката, можете да добиете нова на "
-"адре�ата што ја вне�овте во Вашата �метка."
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283
-#, fuzzy
-msgid "Incoming email address removed."
-msgstr "�дре�ата е от�транета."
+"�ко �те ја заборавиле или загубиле "
+"лозинката, можете да добиете нова на адре�ата што ја вне�овте во Вашата �метка."
 
 #: ../actions/password.php:69
 msgid "Incorrect old password"
 msgstr "�еточна �тара лозинка"
 
-#: ../actions/login.php:67
+#: ../actions/login.php:63
 msgid "Incorrect username or password."
 msgstr "�еточно кори�ничко име или лозинка"
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:226
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
-"Упат�твото за пронаоѓање на Вашата лозинка е и�пратено до адре�ата за е-"
-"пошта што е реги�трирана �о Вашата �метка."
+"Упат�твото за пронаоѓање на Вашата "
+"лозинка е и�пратено до адре�ата за е-пошта што е реги�трирана �о Вашата �метка."
 
-#: ../actions/updateprofile.php:114
+#: ../actions/updateprofile.php:113
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "�еправилно URL за аватар: '%s'"
 
-#: ../actions/invite.php:55
-#, fuzzy, php-format
-msgid "Invalid email address: %s"
-msgstr "�еправилна адре�а за е-пошта."
-
-#: ../actions/updateprofile.php:98
+#: ../actions/updateprofile.php:97
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "�евалидна домашна �траница: '%s'"
 
-#: ../actions/updateprofile.php:82
+#: ../actions/updateprofile.php:81
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "�еправилно URL за лиценца: '%s'"
@@ -869,7 +569,7 @@ msgstr "�еправилно uri на изве�тување"
 msgid "Invalid notice url"
 msgstr "�еправилно url на изве�тување"
 
-#: ../actions/updateprofile.php:87
+#: ../actions/updateprofile.php:86
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "�еправилно URL на профил: '%s'"
@@ -886,71 +586,45 @@ msgstr "Ð�еправилно URL на профил вратено од Ñ�ервÐ
 msgid "Invalid size."
 msgstr "Погрешна големина."
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111
+#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
+#: ../actions/register.php:84
 msgid "Invalid username or password."
 msgstr "Погрешно име или лозинка."
 
-#: ../actions/invite.php:79
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123
-msgid "Invite new users"
-msgstr ""
-
-#: ../lib/util.php:261
+#: ../lib/util.php:237
 #, 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)."
+"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 ""
-"Работи на [Laconica](http://laconi.ca/) �офтверот за микроблогирање, верзија "
-"%s, до�тапен пд [GNU Affero General Public License](http://www.fsf.org/"
-"licensing/licenses/agpl-3.0.html)."
+"Работи на [Laconica](http://laconi.ca/) �офтверот за "
+"микроблогирање, верзија %s, до�тапен пд [GNU "
+"Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:173
+#: ../actions/imsettings.php:164
 msgid "Jabber ID already belongs to another user."
 msgstr "Ова Jabber ID му припаќа на друг кори�ник."
 
-#: ../actions/imsettings.php:62
+#: ../actions/imsettings.php:63
 #, 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 ""
-"Jabber или GTalk адре�а како „ime@example.org“. �о прво додајте го %s во "
-"Вашата контакт ли�та во Вашиот IM клиент или GTalk."
-
-#: ../actions/profilesettings.php:57
-msgid "Language"
-msgstr ""
+"Jabber или GTalk адре�а како „ime@example.org“. �о "
+"прво додајте го %s во Вашата контакт ли�та во Вашиот IM клиент или GTalk."
 
-#: ../actions/profilesettings.php:113
-#, fuzzy
-msgid "Language is too long (max 50 chars)."
-msgstr "Локацијата е предолга (мак�имумот е 255 знаци)."
-
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: ../actions/profilesettings.php:55
 msgid "Location"
 msgstr "Локација"
 
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108
+#: ../actions/profilesettings.php:96 ../actions/updateprofile.php:107
 msgid "Location is too long (max 255 chars)."
 msgstr "Локацијата е предолга (мак�имумот е 255 знаци)."
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310
+#: ../actions/login.php:93 ../actions/login.php:102
+#: ../actions/openidlogin.php:68 ../lib/util.php:286
 msgid "Login"
 msgstr "Пријави �е"
 
@@ -959,38 +633,25 @@ msgstr "Пријави �е"
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Пријавете �е �о [OpenID](%%doc.openid%%) �метка."
 
-#: ../actions/login.php:126
+#: ../actions/login.php:122
 #, 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%"
-"%). "
+"Login with your username and password. Don't have a username yet? "
+"[Register](%%action.register%%) a new account, or try "
+"[OpenID](%%action.openidlogin%%). "
 msgstr ""
-"Пријавете �е �о кори�ничко име и лозинка. �емате? [Реги�трирајте](%%action."
-"register%%) нова �метка или пробајте [OpenID](%%action.openidlogin%%). "
+"Пријавете �е �о кори�ничко име и лозинка. "
+"�емате? [Реги�трирајте](%%action.register%%) нова �метка или пробајте [OpenID](%%action.openidlogin%%). "
 
-#: ../lib/util.php:308
+#: ../lib/util.php:284
 msgid "Logout"
 msgstr "Одјави �е"
 
-#: ../actions/register.php:166
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
-
-#: ../actions/login.php:110
+#: ../actions/login.php:106
 msgid "Lost or forgotten password?"
 msgstr "Загубена или заборавена лозинка?"
 
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr ""
-
-#: ../actions/showstream.php:300
+#: ../actions/showstream.php:281
 msgid "Member since"
 msgstr "Член од"
 
@@ -999,59 +660,38 @@ msgstr "Член од"
 msgid "Microblog by %s"
 msgstr "Микроблог на %s"
 
-#: ../actions/smssettings.php:304
-#, php-format
-msgid ""
-"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
-"email but isn't listed here, send email to let us know at %s."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
 msgid "My text and files are available under "
 msgstr "Мојот тек�т и датотеки �е до�тапни под"
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-msgid "New"
-msgstr ""
-
-#: ../lib/mail.php:144
-#, fuzzy, php-format
-msgid "New email address for posting to %s"
-msgstr "�ема реги�трирана адре�а за е-пошта за тој кори�ник."
-
-#: ../actions/emailsettings.php:297
-#, fuzzy
-msgid "New incoming email address added."
-msgstr "�еправилна адре�а за е-пошта."
-
 #: ../actions/finishopenidlogin.php:71
 msgid "New nickname"
 msgstr "�ов прекар"
 
-#: ../actions/newnotice.php:87
+#: ../actions/newnotice.php:100
 msgid "New notice"
 msgstr "�ово изве�тување"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
+#: ../actions/password.php:41 ../actions/recoverpassword.php:164
 msgid "New password"
 msgstr "�ова лозинка"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:275
 msgid "New password successfully saved. You are now logged in."
 msgstr "�овата лозинка у�пешно е �нимена. Сега �те пријавени."
 
-#: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151
+#: ../actions/login.php:97 ../actions/profilesettings.php:41
+#: ../actions/register.php:175
 msgid "Nickname"
 msgstr "Прекар"
 
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69
+#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:99
+#: ../actions/register.php:59
 msgid "Nickname already in use. Try another one."
 msgstr "Тој прекар е во употреба. Одберете друг."
 
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:67 ../actions/updateprofile.php:77
+#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:80
+#: ../actions/register.php:57 ../actions/updateprofile.php:76
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Прекарот мора да има �амо мали букви и бројки и да нема празни ме�та."
 
@@ -1063,53 +703,30 @@ msgstr "Тој прекар не е дозволен."
 msgid "Nickname of the user you want to follow"
 msgstr "Прекар на кори�никот што �акате да го �ледите."
 
-#: ../actions/recoverpassword.php:162
+#: ../actions/recoverpassword.php:147
 msgid "Nickname or email"
 msgstr "Прекар или е-пошта"
 
-#: ../actions/deletenotice.php:59
-msgid "No"
-msgstr ""
-
-#: ../actions/imsettings.php:156
+#: ../actions/imsettings.php:147
 msgid "No Jabber ID."
 msgstr "�ема JabberID."
 
-#: ../actions/userauthorization.php:129
+#: ../actions/userauthorization.php:128
 msgid "No authorization request!"
 msgstr "�ема барање за проверка!"
 
-#: ../actions/smssettings.php:181
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316
-#, fuzzy
-msgid "No code entered"
-msgstr "�ема �одржина!"
-
 #: ../actions/confirmaddress.php:33
 msgid "No confirmation code."
 msgstr "�ема код за потврда."
 
-#: ../actions/newnotice.php:44
+#: ../actions/newnotice.php:49
 msgid "No content!"
 msgstr "�ема �одржина!"
 
-#: ../actions/emailsettings.php:174
-#, fuzzy
-msgid "No email address."
-msgstr "�дре�а за е-пошта"
-
-#: ../actions/userbyid.php:32
+#: ../actions/userbyid.php:27
 msgid "No id."
 msgstr "�ема id."
 
-#: ../actions/emailsettings.php:271
-#, fuzzy
-msgid "No incoming email address."
-msgstr "�еправилна адре�а за е-пошта."
-
 #: ../actions/finishremotesubscribe.php:65
 msgid "No nickname provided by remote server."
 msgstr "Серверот не до�тави прекар."
@@ -1118,25 +735,19 @@ msgstr "Серверот не до�тави прекар."
 msgid "No nickname."
 msgstr "�ема прекар."
 
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229
+#: ../actions/imsettings.php:197
 msgid "No pending confirmation to cancel."
 msgstr "�ема потврди кои може да �е откажат."
 
-#: ../actions/smssettings.php:176
-#, fuzzy
-msgid "No phone number."
-msgstr "�ема таков кори�ник."
-
 #: ../actions/finishremotesubscribe.php:72
 msgid "No profile URL returned by server."
 msgstr "Серверот не до�тави URL за профилот."
 
-#: ../actions/recoverpassword.php:226
+#: ../actions/recoverpassword.php:189
 msgid "No registered email address for that user."
 msgstr "�ема реги�трирана адре�а за е-пошта за тој кори�ник."
 
-#: ../actions/userauthorization.php:49
+#: ../actions/userauthorization.php:48
 msgid "No request found!"
 msgstr "�е е пронаједено барање."
 
@@ -1148,14 +759,6 @@ msgstr "�ема резултати"
 msgid "No size."
 msgstr "�ема големина."
 
-#: ../actions/twitapistatuses.php:595
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555
-msgid "No status with that ID found."
-msgstr ""
-
 #: ../actions/openidsettings.php:135
 msgid "No such OpenID."
 msgstr "�ема таков OpenID."
@@ -1164,8 +767,7 @@ msgstr "�ема таков OpenID."
 msgid "No such document."
 msgstr "�ема таков документ."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30
+#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
 msgid "No such notice."
 msgstr "�ема такво изве�тување."
 
@@ -1178,21 +780,16 @@ msgid "No such subscription"
 msgstr "�ема таква претплата"
 
 #: ../actions/all.php:34 ../actions/allrss.php:35
-#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
-#: ../actions/remotesubscribe.php:84 ../actions/remotesubscribe.php:91
-#: ../actions/replies.php:57 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:110 ../actions/userbyid.php:36
-#: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
-#: ../lib/subs.php:33 ../lib/subs.php:82
+#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:36
+#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
+#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
+#: ../actions/showstream.php:95 ../actions/subscribe.php:43
+#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
+#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
 msgid "No such user."
 msgstr "�ема таков кори�ник."
 
-#: ../actions/recoverpassword.php:211
-#, fuzzy
-msgid "No user with that email address or username."
-msgstr "�ема реги�трирана адре�а за е-пошта за тој кори�ник."
-
-#: ../lib/gallery.php:80
+#: ../lib/gallery.php:76
 msgid "Nobody to show!"
 msgstr "�ема никој!"
 
@@ -1200,18 +797,7 @@ msgstr "�ема никој!"
 msgid "Not a recovery code."
 msgstr "Ова не е код за �па�ување."
 
-#: ../scripts/maildaemon.php:50
-#, fuzzy
-msgid "Not a registered user."
-msgstr "Ова не е код за �па�ување."
-
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332
-#, fuzzy
-msgid "Not a supported data format."
-msgstr "�еподдржан фомрат на �лики."
-
-#: ../actions/imsettings.php:167
+#: ../actions/imsettings.php:158
 msgid "Not a valid Jabber ID"
 msgstr "�еправилен JabberID"
 
@@ -1219,24 +805,19 @@ msgstr "�еправилен JabberID"
 msgid "Not a valid OpenID."
 msgstr "�еправилен OpenID."
 
-#: ../actions/emailsettings.php:185
-#, fuzzy
-msgid "Not a valid email address"
-msgstr "�еправилна адре�а за е-пошта."
-
-#: ../actions/register.php:63
+#: ../actions/profilesettings.php:75 ../actions/register.php:53
 msgid "Not a valid email address."
 msgstr "�еправилна адре�а за е-пошта."
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
+#: ../actions/profilesettings.php:83 ../actions/register.php:61
 msgid "Not a valid nickname."
 msgstr "�еправилен прекар."
 
-#: ../actions/remotesubscribe.php:120
+#: ../actions/remotesubscribe.php:118
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "�еправилно URL на профил (неточен �ерви�)."
 
-#: ../actions/remotesubscribe.php:113
+#: ../actions/remotesubscribe.php:111
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "�еправилно URL на профил (нема дефиниран XRDS)."
 
@@ -1256,27 +837,16 @@ msgstr "�е е одобрено."
 msgid "Not expecting this response!"
 msgstr "Овој одговор не беше очекуван!"
 
-#: ../actions/twitapistatuses.php:422
-#, fuzzy
-msgid "Not found"
-msgstr "�е е пронаједено барање."
-
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:28
-#: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
-#: ../lib/settingsaction.php:27
+#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
+#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
+#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
 msgid "Not logged in."
 msgstr "�е �те пријавени."
 
-#: ../lib/subs.php:91
+#: ../actions/unsubscribe.php:43
 msgid "Not subscribed!."
 msgstr "�е �те претплатени!"
 
-#: ../actions/opensearch.php:35
-#, fuzzy
-msgid "Notice Search"
-msgstr "Барај"
-
 #: ../actions/showstream.php:82
 #, php-format
 msgid "Notice feed for %s"
@@ -1286,20 +856,15 @@ msgstr "Канал �о изве�тувања на %s"
 msgid "Notice has no profile"
 msgstr "Изве�тувањето нема профил"
 
-#: ../actions/showstream.php:316
+#: ../actions/showstream.php:297
 msgid "Notices"
 msgstr "Изве�тувања"
 
-#: ../actions/tag.php:35 ../actions/tag.php:81
-#, fuzzy, php-format
-msgid "Notices tagged with %s"
-msgstr "Канал �о изве�тувања на %s"
-
 #: ../actions/password.php:39
 msgid "Old password"
 msgstr "Стара лозинка"
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314
+#: ../lib/util.php:288
 msgid "OpenID"
 msgstr "OpenID"
 
@@ -1342,104 +907,73 @@ msgstr "OpenID-то е от�трането"
 msgid "OpenID settings"
 msgstr "По�тавки за OpenID"
 
-#: ../actions/invite.php:135
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
 #: ../actions/avatar.php:84
 msgid "Partial upload."
 msgstr "Парцијално товарање"
 
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
-#: ../actions/register.php:153 ../lib/settingsaction.php:93
+#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
+#: ../actions/register.php:177
 msgid "Password"
 msgstr "Лозинка"
 
-#: ../actions/recoverpassword.php:288
+#: ../actions/recoverpassword.php:249
 msgid "Password and confirmation do not match."
 msgstr "Двете лозинки не �е �овпаѓаат."
 
-#: ../actions/recoverpassword.php:284
+#: ../actions/recoverpassword.php:245
 msgid "Password must be 6 chars or more."
 msgstr "Лозинката мора да биде од најмалку 6 знаци."
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
 msgid "Password recovery requested"
 msgstr "Побарано е пронаоѓање на лозинката"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: ../actions/password.php:89 ../actions/recoverpassword.php:274
 msgid "Password saved."
 msgstr "Лозинката е �нимена."
 
-#: ../actions/password.php:61 ../actions/register.php:88
+#: ../actions/password.php:61 ../actions/register.php:65
 msgid "Passwords don't match."
 msgstr "Лозинките не �е �овпаѓаат."
 
-#: ../lib/searchaction.php:100
-#, fuzzy
-msgid "People"
-msgstr "Пребарување на луѓе"
-
-#: ../actions/opensearch.php:33
-#, fuzzy
-msgid "People Search"
-msgstr "Пребарување на луѓе"
-
 #: ../actions/peoplesearch.php:33
 msgid "People search"
 msgstr "Пребарување на луѓе"
 
-#: ../lib/stream.php:50
+#: ../lib/stream.php:44
 msgid "Personal"
 msgstr "Личен"
 
-#: ../actions/invite.php:133
-#, fuzzy
-msgid "Personal message"
-msgstr "Личен"
-
-#: ../actions/smssettings.php:69
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "1-64 мали букви или бројки. Без интерпукци�ки знаци и празни ме�та."
-
-#: ../actions/userauthorization.php:78
+#: ../actions/userauthorization.php:77
 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 \"Cancel\"."
 msgstr ""
-"Проверете ги овие детали ако �акате да �е претплатите на изве�тувањата на "
-"овој кори�ник. �ко не �акате да �е претплатите, кликнете на „Откажи“."
+"Проверете ги овие детали ако �акате да �е "
+"претплатите на изве�тувањата на овој кори�ник. �ко не �акате да �е претплатите, кликнете на „Откажи“."
 
-#: ../actions/imsettings.php:73
+#: ../actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "И�прати изве�тување кога мојот �тату� на Jabber/GTalk ќе �е �мени."
 
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94
+#: ../actions/imsettings.php:68
 msgid "Preferences"
 msgstr "Преференции"
 
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163
+#: ../actions/imsettings.php:135
 msgid "Preferences saved."
 msgstr "Преференциите �е �нимени."
 
-#: ../actions/profilesettings.php:57
-#, fuzzy
-msgid "Preferred language"
-msgstr "Преференции"
-
-#: ../lib/util.php:328
+#: ../lib/util.php:300
 msgid "Privacy"
 msgstr "Приватно�т"
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106
+#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
 msgid "Problem saving notice."
 msgstr "Проблем во �нимањето на изве�тувањето."
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60
+#: ../lib/stream.php:54
 msgid "Profile"
 msgstr "Профил"
 
@@ -1451,10 +985,14 @@ msgstr "URL на профилот"
 msgid "Profile settings"
 msgstr "По�тавки на профилот"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
 msgid "Profile unknown"
 msgstr "�епознат профил"
 
+#: ../lib/util.php:276
+msgid "Public"
+msgstr "Јавен"
+
 #: ../actions/public.php:54
 msgid "Public Stream Feed"
 msgstr "Јавен канал"
@@ -1463,25 +1001,11 @@ msgstr "Јавен канал"
 msgid "Public timeline"
 msgstr "Јавна и�торија"
 
-#: ../actions/imsettings.php:79
-#, fuzzy
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Моментално потврдена Jabber/GTalk адре�а."
-
-#: ../actions/emailsettings.php:94
-#, fuzzy
-msgid "Publish a MicroID for my email address."
-msgstr "Вне�ете прекар или е-пошта"
-
-#: ../actions/tag.php:75 ../actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
-
-#: ../actions/recoverpassword.php:166
+#: ../actions/recoverpassword.php:151
 msgid "Recover"
 msgstr "Пронајди"
 
-#: ../actions/recoverpassword.php:156
+#: ../actions/recoverpassword.php:141
 msgid "Recover password"
 msgstr "Пронаоѓање на лозинка"
 
@@ -1489,28 +1013,19 @@ msgstr "Пронаоѓање на лозинка"
 msgid "Recovery code for unknown user."
 msgstr "Код за пронаоѓање за непознат кори�ник."
 
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: ../actions/register.php:171 ../actions/register.php:195 ../lib/util.php:287
 msgid "Register"
 msgstr "Реги�трирај �е"
 
-#: ../actions/register.php:28
-#, fuzzy
-msgid "Registration not allowed."
-msgstr "Тој прекар не е дозволен."
-
-#: ../actions/register.php:200
-msgid "Registration successful"
-msgstr ""
-
-#: ../actions/userauthorization.php:120
+#: ../actions/userauthorization.php:119
 msgid "Reject"
 msgstr "Одбиј"
 
-#: ../actions/login.php:103 ../actions/register.php:176
+#: ../actions/login.php:99 ../actions/register.php:183
 msgid "Remember me"
 msgstr "Запамети ме"
 
-#: ../actions/updateprofile.php:70
+#: ../actions/updateprofile.php:69
 msgid "Remote profile with no matching profile"
 msgstr "Оддалечениот профил нема одговарачки профил"
 
@@ -1518,9 +1033,7 @@ msgstr "Оддалечениот профил нема одговарачки п
 msgid "Remote subscribe"
 msgstr "Оддалечена претплата"
 
-#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
-#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
 msgid "Remove"
 msgstr "От�трани"
 
@@ -1533,59 +1046,35 @@ 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."
+"�ко го о�траните Вашето един�твено OpenID, "
+"тогаш нема да можете да �е пријавите. �ко треба да го от�траните, прво додајте друг OpenID."
 
-#: ../lib/stream.php:55
+#: ../lib/stream.php:49
 msgid "Replies"
 msgstr "Одговори"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
 #, php-format
 msgid "Replies to %s"
 msgstr "Одговори и�пратени до %s"
 
-#: ../actions/recoverpassword.php:183
+#: ../actions/recoverpassword.php:168
 msgid "Reset"
 msgstr "Ре�етирај"
 
-#: ../actions/recoverpassword.php:173
+#: ../actions/recoverpassword.php:158
 msgid "Reset password"
 msgstr "Ре�тетирај ја лозинката"
 
-#: ../lib/settingsaction.php:99
-msgid "SMS"
-msgstr ""
-
-#: ../actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
-
-#: ../actions/smssettings.php:33
-#, fuzzy
-msgid "SMS Settings"
-msgstr "По�тавки за IM"
-
-#: ../lib/mail.php:219
-#, fuzzy
-msgid "SMS confirmation"
-msgstr "�ема код за потврда."
-
-#: ../actions/recoverpassword.php:182
+#: ../actions/recoverpassword.php:167 ../actions/register.php:180
 msgid "Same as password above"
 msgstr "И�то како лозинката погоре"
 
-#: ../actions/register.php:156
-#, fuzzy
-msgid "Same as password above. Required."
-msgstr "И�то како лозинката погоре"
-
-#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
-#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
+#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
 msgid "Save"
 msgstr "Сними"
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300
+#: ../lib/searchaction.php:73 ../lib/util.php:277
 msgid "Search"
 msgstr "Барај"
 
@@ -1599,8 +1088,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
@@ -1608,53 +1097,25 @@ 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 знаци."
-
-#: ../actions/smssettings.php:296
-msgid "Select a carrier"
-msgstr ""
+"Барајте луѓе на %%site.name%% �поред нивното "
+"име, локација или интере�и. Термините одделете ги �о празни ме�та. �ајмала должина е 3 знаци."
 
-#: ../actions/invite.php:137 ../lib/util.php:1172
+#: ../lib/util.php:982
 msgid "Send"
 msgstr "И�прати"
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
-msgstr ""
-
-#: ../actions/emailsettings.php:88
-#, fuzzy
-msgid "Send me notices of new subscriptions through email."
-msgstr "И�праќај ми изве�тувања преку Jabber/GTalk."
-
-#: ../actions/imsettings.php:70
+#: ../actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
 msgstr "И�праќај ми изве�тувања преку Jabber/GTalk."
 
-#: ../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
-#, fuzzy
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr "И�праќај ми изве�тувања преку Jabber/GTalk."
-
-#: ../lib/util.php:304
+#: ../lib/util.php:282
 msgid "Settings"
 msgstr "По�тавки"
 
-#: ../actions/profilesettings.php:192
+#: ../actions/profilesettings.php:183
 msgid "Settings saved."
 msgstr "По�тавките �е �нимени."
 
-#: ../actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
 #: ../actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr "�екој друг веќе го кори�ти ова OpenID."
@@ -1663,45 +1124,36 @@ msgstr "�екој друг веќе го кори�ти ова OpenID."
 msgid "Something weird happened."
 msgstr "�ешто чудно �е �лучи."
 
-#: ../scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54
-#, fuzzy
-msgid "Sorry, that is not your incoming email address."
-msgstr "Ова е погрешната IM адре�а."
-
-#: ../lib/util.php:330
+#: ../lib/util.php:302
 msgid "Source"
 msgstr "Изворен код"
 
-#: ../actions/showstream.php:296
+#: ../actions/showstream.php:277
 msgid "Statistics"
 msgstr "Стати�тика"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
 msgid "Stored OpenID not found."
 msgstr "Зачуваниот OpenID не е пронајден."
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197
+#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
+#: ../actions/showstream.php:181
 msgid "Subscribe"
 msgstr "Претплати �е"
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: ../actions/showstream.php:294 ../actions/subscribers.php:27
 msgid "Subscribers"
 msgstr "Претплатници"
 
-#: ../actions/userauthorization.php:310
+#: ../actions/userauthorization.php:309
 msgid "Subscription authorized"
 msgstr "Претплатата е одобрена"
 
-#: ../actions/userauthorization.php:320
+#: ../actions/userauthorization.php:319
 msgid "Subscription rejected"
 msgstr "Претплатата е одбиена"
 
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
+#: ../actions/showstream.php:212 ../actions/showstream.php:288
 #: ../actions/subscriptions.php:27
 msgid "Subscriptions"
 msgstr "Претплати"
@@ -1710,14 +1162,6 @@ msgstr "Претплати"
 msgid "System error uploading file."
 msgstr "Си�тем�ка грешка при товарањето на датотеката."
 
-#: ../actions/tag.php:41 ../lib/util.php:301
-msgid "Tags"
-msgstr ""
-
-#: ../lib/searchaction.php:104
-msgid "Text"
-msgstr ""
-
 #: ../actions/noticesearch.php:34
 msgid "Text search"
 msgstr "Тек�туално пребарување"
@@ -1734,94 +1178,53 @@ msgstr "Оваа адре�а веќе е потврдена."
 msgid "That confirmation code is not for you!"
 msgstr "Овој код за потврда не е за Ва�!"
 
-#: ../actions/emailsettings.php:191
-#, fuzzy
-msgid "That email address already belongs to another user."
-msgstr "Ова Jabber ID му припаќа на друг кори�ник."
-
 #: ../actions/avatar.php:80
 msgid "That file is too big."
 msgstr "Датотеката е преголема."
 
-#: ../actions/imsettings.php:170
+#: ../actions/imsettings.php:161
 msgid "That is already your Jabber ID."
 msgstr "Ова веќе е Вашиот Jabber ID."
 
-#: ../actions/emailsettings.php:188
-#, fuzzy
-msgid "That is already your email address."
-msgstr "Ова веќе е Вашиот Jabber ID."
-
-#: ../actions/smssettings.php:188
-#, fuzzy
-msgid "That is already your phone number."
-msgstr "Ова веќе е Вашиот Jabber ID."
-
-#: ../actions/imsettings.php:233
+#: ../actions/imsettings.php:224
 msgid "That is not your Jabber ID."
 msgstr "Ова не е Вашиот Jabber ID."
 
-#: ../actions/emailsettings.php:249
-#, fuzzy
-msgid "That is not your email address."
-msgstr "Ова е погрешната IM адре�а."
-
-#: ../actions/smssettings.php:257
-#, fuzzy
-msgid "That is not your phone number."
-msgstr "Ова не е Вашиот Jabber ID."
-
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
+#: ../actions/imsettings.php:201
 msgid "That is the wrong IM address."
 msgstr "Ова е погрешната IM адре�а."
 
-#: ../actions/smssettings.php:233
-#, fuzzy
-msgid "That is the wrong confirmation number."
-msgstr "Ова е погрешната IM адре�а."
-
-#: ../actions/smssettings.php:191
-#, fuzzy
-msgid "That phone number already belongs to another user."
-msgstr "Ова Jabber ID му припаќа на друг кори�ник."
-
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: ../actions/newnotice.php:52
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "Ова е предолго. Мак�ималната должина е 140 знаци."
 
-#: ../actions/twitapiaccount.php:74
-#, fuzzy
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "Ова е предолго. Мак�ималната должина е 140 знаци."
-
-#: ../actions/confirmaddress.php:92
+#: ../actions/confirmaddress.php:86
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "�дре�ата  \"%s\" е потврдена за Вашата �метка."
 
-#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274
+#: ../actions/imsettings.php:241
 msgid "The address was removed."
 msgstr "�дре�ата е от�транета."
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:311
 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 ""
-"Претплатата е одобрена, но нема вратено URL. Проверете ги ин�трукциите за "
-"ме�тото за да видите како да ја одобрите претплатата. Вашиот белег за "
-"претплата е:"
+"Претплатата е одобрена, но нема вратено "
+"URL. Проверете ги ин�трукциите за ме�тото "
+"за да видите како да ја одобрите претплатата. Вашиот белег за претплата е:"
 
-#: ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:321
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site's instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
-"Претплатата е одбиена, но нема вратено URL. Проверете ги ин�трукциите за "
-"ме�тото за да видите како цело�но да ја одбиете претплатата."
+"Претплатата е одбиена, но нема вратено URL. "
+"Проверете ги ин�трукциите за ме�тото за да видите како цело�но да ја одбиете претплатата."
 
 #: ../actions/subscribers.php:35
 #, php-format
@@ -1841,12 +1244,7 @@ msgstr "Ова �е луѓето чии изве�тувања ги �леди %
 msgid "These are the people whose notices you listen to."
 msgstr "Ова �е луѓето чии изве�тувања ги �ледите."
 
-#: ../actions/invite.php:89
-msgid ""
-"These people are already users and you were automatically subscribed to them:"
-msgstr ""
-
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:87
 msgid "This confirmation code is too old. Please start again."
 msgstr "Овој код за потврда е премногу �тар. Почнете од почеток."
 
@@ -1855,8 +1253,8 @@ msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr ""
-"Овој формулар треба автомат�ки да �е и�прати. �ко тоа не �е �лучи, кликнете "
-"на копчето „И�прати“ за да одите до Вашиот OpenID �набдувач."
+"Овој формулар треба автомат�ки да �е "
+"и�прати. �ко тоа не �е �лучи, кликнете на копчето „И�прати“ за да одите до Вашиот OpenID �набдувач."
 
 #: ../actions/finishopenidlogin.php:56
 #, php-format
@@ -1865,48 +1263,28 @@ 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 �о локална �метка. Можете да креирате нова �метка или да �е поврзете "
-"�о тековната �метка - ако ја имате."
-
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-msgid "This method requires a POST or DELETE."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381
-msgid "This method requires a POST."
-msgstr ""
+"Ова е прв пат како �е пријавивте на %s и "
+"затоа морам да го поврземе Вашиот OpenID �о "
+"локална �метка. Можете да креирате нова �метка или да �е поврзете �о тековната �метка - ако ја имате."
 
-#: ../lib/util.php:164
+#: ../lib/util.php:147
 msgid "This page is not available in a media type you accept"
 msgstr "Оваа �траница не е до�тапна во форматот кој Вие го прифаќате."
 
-#: ../actions/profilesettings.php:63
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107
-msgid "Timezone not selected."
-msgstr ""
-
 #: ../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 ""
-"За да �е претплатите, може да �е [пријавите](%%action.login%%) или  да �е "
-"[реги�трирате](%%action.register%%). �ко имате �метка на [компатибилно ме�то "
-"за микро блогирање](%%doc.openmublog%%), вне�ете го URL-то на Вашиот профил "
-"подолу."
-
-#: ../actions/twitapifriendships.php:163
-msgid "Two user ids or screen_names must be supplied."
+"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 ""
+"За да �е претплатите, може да �е "
+"[пријавите](%%action.login%%) или  да �е "
+"[реги�трирате](%%action.register%%). �ко имате "
+"�метка на [компатибилно ме�то за микро блогирање](%%doc.openmublog%%), вне�ете го URL-то на Вашиот профил подолу."
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: ../actions/profilesettings.php:51
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL на Вашата домашна �траница, блог или профил на друго ме�то."
 
@@ -1914,41 +1292,36 @@ msgstr "URL на Вашата домашна Ñ�траница, блог или Ð
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL на Вашиот профил на друго компатибилно ме�то за микроблогирање."
 
-#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
-#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
 msgid "Unexpected form submission."
 msgstr "�еочекувано и�праќање на формулар."
 
-#: ../actions/recoverpassword.php:276
+#: ../actions/recoverpassword.php:237
 msgid "Unexpected password reset."
 msgstr "�еочекувано ре�етирање на лозинка."
 
-#: ../index.php:57
-msgid "Unknown action"
-msgstr ""
-
 #: ../actions/finishremotesubscribe.php:58
 msgid "Unknown version of OMB protocol."
 msgstr "�епозната верзија на протоколот OMB."
 
-#: ../lib/util.php:269
+#: ../lib/util.php:245
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
 msgstr ""
-"О�вен ако не е поинаку назначено, �одржината на ова ме�то е автор�ко право "
-"на придоне�увачите и е до�тапна под"
+"О�вен ако не е поинаку назначено, "
+"�одржината на ова ме�то е автор�ко право на придоне�увачите и е до�тапна под"
 
 #: ../actions/confirmaddress.php:48
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr "�епознат тип на адре�а %s"
 
-#: ../actions/showstream.php:209
+#: ../actions/showstream.php:193
 msgid "Unsubscribe"
 msgstr "Откажи ја претплатата"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
 msgid "Unsupported OMB version"
 msgstr "�еподдржнана верзија на ОМВ"
 
@@ -1956,24 +1329,6 @@ msgstr "�еподдржнана верзија на ОМВ"
 msgid "Unsupported image file format."
 msgstr "�еподдржан фомрат на �лики."
 
-#: ../lib/settingsaction.php:100
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:241
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:341
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
 #: ../actions/avatar.php:68
 msgid "Upload"
 msgstr "Товари"
@@ -1985,22 +1340,12 @@ msgid ""
 "site license, also. Use a picture that belongs to you and that you want to "
 "share."
 msgstr ""
-"Тука можете да по�тавите нов „аватар“ (ко�иничка �лика). �е можете да ја "
-"менувате �ликата откако ќе ја товарите, па затоа погрижете �е да личи на "
-"квадрат. Сликата мора да биде под и�тата лиценца како ова ме�то. Кори�тете "
-"�лика која е Ваша и која �акате да ја �поделите."
-
-#: ../lib/settingsaction.php:91
-#, fuzzy
-msgid "Upload a new profile image"
-msgstr "Информациите за новиот профил не може да �е �нимат"
-
-#: ../actions/invite.php:114
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
-msgstr ""
+"Тука можете да по�тавите нов „аватар“ "
+"(ко�иничка �лика). �е можете да ја "
+"менувате �ликата откако ќе ја товарите, "
+"па затоа погрижете �е да личи на квадрат. Сликата мора да биде под и�тата лиценца како ова ме�то. Кори�тете �лика која е Ваша и која �акате да ја �поделите."
 
-#: ../actions/register.php:159 ../actions/register.php:162
+#: ../actions/profilesettings.php:48 ../actions/register.php:182
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Се кори�ти �амо за надградби, објави и пронаоѓање на лозинка."
 
@@ -2009,10 +1354,8 @@ msgid "User being listened to doesn't exist."
 msgstr "Кори�никот кој го �ледите не по�тои."
 
 #: ../actions/all.php:41 ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:47 ../actions/replies.php:41
-#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
-#: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
-#: ../actions/twitapiusers.php:82
+#: ../actions/foaf.php:43 ../actions/replies.php:41
+#: ../actions/showstream.php:44
 msgid "User has no profile."
 msgstr "Кори�никот нема профил."
 
@@ -2020,137 +1363,79 @@ msgstr "Кори�никот нема профил."
 msgid "User nickname"
 msgstr "Прекар на кори�никот"
 
-#: ../actions/twitapiusers.php:75
-#, fuzzy
-msgid "User not found."
-msgstr "Зачуваниот OpenID не е пронајден."
-
-#: ../actions/profilesettings.php:63
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../lib/util.php:1159
+#: ../lib/util.php:969
 #, php-format
 msgid "What's up, %s?"
 msgstr "Што има %s?"
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: ../actions/profilesettings.php:57
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Каде �е наоѓате, на пр. „Град, Држава“."
 
-#: ../actions/updateprofile.php:128
+#: ../actions/updateprofile.php:127
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Погрешен тип на �лика за '%s'"
 
-#: ../actions/updateprofile.php:123
+#: ../actions/updateprofile.php:122
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Погрешна големина на �лика на '%s'"
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-msgid "Yes"
-msgstr ""
-
 #: ../actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr "Веќе го имате овој OpenID!"
 
-#: ../actions/deletenotice.php:37
-msgid ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
-msgstr ""
-
 #: ../actions/recoverpassword.php:31
 msgid "You are already logged in!"
 msgstr "Веќе �те пријавени!"
 
-#: ../actions/invite.php:81
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr ""
-
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
 msgstr "Овде можете да ја промените лозинката. Одберете добра лозинка!"
 
-#: ../actions/register.php:135
+#: ../actions/register.php:164
 msgid "You can create a new account to start posting notices."
 msgstr "Можете да креирате нова �метка за да и�праќате изве�тувања."
 
-#: ../actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
-"Можте да от�траните OpenID од Вашата �метка �о кликање на копчето „От�трани“."
+"Можте да от�траните OpenID од Вашата �метка "
+"�о кликање на копчето „От�трани“."
 
 #: ../actions/imsettings.php:28
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/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."
+"You can update your personal profile info here so people know more about "
+"you."
 msgstr ""
-"Во Вашиот личен профил може да дополните информации за луѓето да знаат "
-"повеќе за Ва�."
+"Во Вашиот личен профил може да дополните "
+"информации за луѓето да знаат повеќе за Ва�."
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
 msgid "You can use the local subscription!"
 msgstr "Може да ја кори�тите локалната претплата."
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
 msgid "You can't register if you don't agree to the license."
 msgstr "�е може да �е реги�трирате ако не ја прифаќате лиценцата."
 
-#: ../actions/updateprofile.php:63
+#: ../actions/updateprofile.php:62
 msgid "You did not send us that profile"
 msgstr "�е ни го и�пративте тој профил."
 
-#: ../lib/mail.php:147
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
-"Send email to %2$s to post new messages.\n"
-"\n"
-"More email instructions at %3$s.\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:612
-msgid "You may not delete another user's status."
-msgstr ""
-
-#: ../actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr ""
-
-#: ../actions/invite.php:103
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
-
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:134
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Идентификувани �те. Подолу можете да вне�ете нова лозинка."
 
@@ -2158,11 +1443,11 @@ msgstr "Идентификувани �те. Подолу можете да вн
 msgid "Your OpenID URL"
 msgstr "Вашето URL за OpenID"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:149
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
-"Вашиот прекар на овој �ервер или адре�ата за е-пошта �о која �е "
-"реги�триравте."
+"Вашиот прекар на овој �ервер или адре�ата "
+"за е-пошта �о која �е реги�триравте."
 
 #: ../actions/openidsettings.php:28
 #, php-format
@@ -2170,65 +1455,61 @@ msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
-"[OpenID](%%doc.openid%%) Ви овозможува да �е пријавувате на многу ме�та �о "
-"и�тата кори�ничка �метка. Овде можете да ги уредите Вашите поврзани OpenID-"
-"ја."
+"[OpenID](%%doc.openid%%) Ви овозможува да �е "
+"пријавувате на многу ме�та �о и�тата "
+"кори�ничка �метка. Овде можете да ги уредите Вашите поврзани OpenID-ја."
 
-#: ../lib/util.php:943
+#: ../lib/util.php:814
 msgid "a few seconds ago"
 msgstr "пред неколку �екунди"
 
-#: ../lib/util.php:955
+#: ../lib/util.php:826
 #, php-format
 msgid "about %d days ago"
 msgstr "пред %d денови"
 
-#: ../lib/util.php:951
+#: ../lib/util.php:822
 #, php-format
 msgid "about %d hours ago"
 msgstr "пред %d ча�а"
 
-#: ../lib/util.php:947
+#: ../lib/util.php:818
 #, php-format
 msgid "about %d minutes ago"
 msgstr "пред %d минути"
 
-#: ../lib/util.php:959
+#: ../lib/util.php:830
 #, php-format
 msgid "about %d months ago"
 msgstr "пред %d ме�еци"
 
-#: ../lib/util.php:953
+#: ../lib/util.php:824
 msgid "about a day ago"
 msgstr "пред еден ден"
 
-#: ../lib/util.php:945
+#: ../lib/util.php:816
 msgid "about a minute ago"
 msgstr "пред една минута"
 
-#: ../lib/util.php:957
+#: ../lib/util.php:828
 msgid "about a month ago"
 msgstr "пред еден ме�ец"
 
-#: ../lib/util.php:961
+#: ../lib/util.php:832
 msgid "about a year ago"
 msgstr "пред една година"
 
-#: ../lib/util.php:949
+#: ../lib/util.php:820
 msgid "about an hour ago"
 msgstr "пред еден ча�"
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-msgid "delete"
-msgstr ""
-
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117
+#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
+#: ../lib/stream.php:101
 msgid "in reply to..."
 msgstr "во одговор на..."
 
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124
+#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
+#: ../lib/stream.php:108
 msgid "reply"
 msgstr "одговор"
 
@@ -2236,23 +1517,1311 @@ msgstr "одговор"
 msgid "same as password above"
 msgstr "и�то како лозинката погоре"
 
-#: ../actions/twitapistatuses.php:755
-#, fuzzy
-msgid "unsupported file type"
-msgstr "�еподдржан фомрат на �лики."
-
-#: ../lib/util.php:1309
+#: ../lib/util.php:1127
 msgid "« After"
 msgstr "« Следни"
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "�дре�ата за е-пошта неможе да �е потврди."
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+msgid " from "
+msgstr ""
 
-#~ msgid "Couldn't create subscription."
-#~ msgstr "�е може да �е креира претплатата"
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Грешка во вне�увањето на изве�тувањето"
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
 
-#~ msgid "Public"
-#~ msgstr "Јавен"
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
+
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#, php-format
+msgid "%s public timeline"
+msgstr ""
+
+#: ../lib/mail.php:206 lib/mail.php:212
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/register.php:154 actions/register.php:168
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55
+msgid "API method not found!"
+msgstr ""
+
+#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
+#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
+#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
+#: ../actions/twitapidirect_messages.php:49
+#: ../actions/twitapidirect_messages.php:56
+#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
+#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
+#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
+#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
+#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
+#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
+#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
+#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
+#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
+#: actions/twitapistatuses.php:690
+msgid "API method under construction."
+msgstr ""
+
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
+
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for "
+"non-humans)"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
+
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr ""
+
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+msgid "Change email handling"
+msgstr ""
+
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+msgid "Change your profile settings"
+msgstr ""
+
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+msgid "Could not follow user: User not found."
+msgstr ""
+
+#: ../lib/subs.php:54 lib/subs.php:61
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: ../lib/subs.php:46 lib/subs.php:46
+msgid "Could not subscribe."
+msgstr ""
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+msgid "Couldn't update user record."
+msgstr ""
+
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr ""
+
+#: ../classes/Notice.php:72 classes/Notice.php:86
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr ""
+
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr ""
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr ""
+
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: ../actions/tag.php:55 actions/tag.php:55
+#, php-format
+msgid "Feed for tag %s"
+msgstr ""
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr ""
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr ""
+
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+msgid "I want to post notices by email."
+msgstr ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+msgid "IM"
+msgstr ""
+
+#: ../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
+msgid "Incoming email"
+msgstr ""
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+msgid "Incoming email address removed."
+msgstr ""
+
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Language"
+msgstr ""
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+msgid "Language is too long (max 50 chars)."
+msgstr ""
+
+#: ../actions/register.php:166 actions/register.php:180
+msgid "Longer name, preferably your \"real\" name"
+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 ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr ""
+
+#: ../lib/mail.php:144 lib/mail.php:144
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+msgid "New incoming email address added."
+msgstr ""
+
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+msgid "No"
+msgstr ""
+
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr ""
+
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+msgid "No email address."
+msgstr ""
+
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+msgid "No incoming email address."
+msgstr ""
+
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+msgid "No status with that ID found."
+msgstr ""
+
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+msgid "Not a registered user."
+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
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+msgid "Not found"
+msgstr ""
+
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr ""
+
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
+
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr ""
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr ""
+
+#: ../actions/invite.php:133 actions/invite.php:141
+msgid "Personal message"
+msgstr ""
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Preferred language"
+msgstr ""
+
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/register.php:28 actions/register.php:28
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+msgid "Registration successful"
+msgstr ""
+
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/register.php:156 actions/register.php:170
+msgid "Same as password above. Required."
+msgstr ""
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr ""
+
+#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
+#: actions/emailsettings.php:74 actions/smssettings.php:82
+msgid "Send email to this address to post new notices."
+msgstr ""
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../actions/tag.php:60 actions/tag.php:60
+msgid "Showing most popular tags from the last week"
+msgstr ""
+
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317
+msgid "Tags"
+msgstr ""
+
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
+msgid "Text"
+msgstr ""
+
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+msgid "That is not your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+msgid "That is not your phone number."
+msgstr ""
+
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/invite.php:89 actions/invite.php:96
+msgid ""
+"These people are already users and you were automatically subscribed to "
+"them:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511
+msgid "This method requires a POST or 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
+msgid "This method requires a POST."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+msgid "Timezone not selected."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+msgid "Two user ids or screen_names must be supplied."
+msgstr ""
+
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this "
+"service."
+msgstr ""
+
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+msgid "Yes"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+msgid "You are not friends with the specified user."
+msgstr ""
+
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr ""
+
+#: ../actions/invite.php:103 actions/invite.php:110
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
+msgstr ""
+
+#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99
+msgid "delete"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+msgid "unsupported file type"
+msgstr ""
+
+#: actions/deletenotice.php:74 actions/disfavor.php:43
+#: actions/emailsettings.php:127 actions/favor.php:45
+#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
+#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
+#: actions/openidsettings.php:123 actions/profilesettings.php:47
+#: actions/recoverpassword.php:282 actions/register.php:42
+#: actions/remotesubscribe.php:40 actions/smssettings.php:124
+#: actions/subscribe.php:44 actions/twittersettings.php:97
+#: actions/unsubscribe.php:41 actions/userauthorization.php:35
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/disfavor.php:55
+msgid "This notice is not a favorite!"
+msgstr ""
+
+#: actions/disfavor.php:63
+msgid "Could not delete favorite."
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Favor"
+msgstr ""
+
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+
+#: actions/emailsettings.php:95
+msgid "Send me email when someone sends me a private message."
+msgstr ""
+
+#: actions/favor.php:53 actions/twitapifavorites.php:142
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132
+msgid "Could not create favorite."
+msgstr ""
+
+#: actions/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#, php-format
+msgid "%s favorite notices"
+msgstr ""
+
+#: actions/favoritesrss.php:64
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr ""
+
+#: actions/inbox.php:28
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+
+#: actions/invite.php:178
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+msgstr ""
+
+#: actions/login.php:104
+msgid "Automatically login in the future; "
+msgstr ""
+
+#: actions/login.php:122
+msgid "For security reasons, please re-enter your "
+msgstr ""
+
+#: actions/login.php:126
+msgid "Login with your username and password. "
+msgstr ""
+
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+msgid "That's too long. Max message size is 140 chars."
+msgstr ""
+
+#: actions/newmessage.php:65
+msgid "No recipient specified."
+msgstr ""
+
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206
+msgid "You can't send a message to this user."
+msgstr ""
+
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly "
+"instead."
+msgstr ""
+
+#: actions/newmessage.php:108
+msgid "No such user"
+msgstr ""
+
+#: actions/newmessage.php:117
+msgid "New message"
+msgstr ""
+
+#: actions/noticesearch.php:95
+msgid "Notice without matching profile"
+msgstr ""
+
+#: actions/openidsettings.php:28
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr ""
+
+#: actions/openidsettings.php:46
+msgid "If you want to add an OpenID to your account, "
+msgstr ""
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr ""
+
+#: actions/openidsettings.php:87
+msgid "You can remove an OpenID from your account "
+msgstr ""
+
+#: actions/outbox.php:28
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr ""
+
+#: actions/outbox.php:30
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#: actions/outbox.php:53
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+
+#: actions/peoplesearch.php:28
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+msgstr ""
+
+#: actions/profilesettings.php:27
+msgid "You can update your personal profile info here "
+msgstr ""
+
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+msgid "User without matching profile"
+msgstr ""
+
+#: actions/recoverpassword.php:91
+msgid "This confirmation code is too old. "
+msgstr ""
+
+#: actions/recoverpassword.php:141
+msgid "If you've forgotten or lost your"
+msgstr ""
+
+#: actions/recoverpassword.php:154
+msgid "You've been identified. Enter a "
+msgstr ""
+
+#: actions/recoverpassword.php:169
+msgid "Your nickname on this server, "
+msgstr ""
+
+#: actions/recoverpassword.php:271
+msgid "Instructions for recovering your password "
+msgstr ""
+
+#: actions/recoverpassword.php:327
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95
+msgid "Password must be 6 or more characters."
+msgstr ""
+
+#: actions/register.php:216
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
+msgstr ""
+
+#: actions/register.php:227
+msgid "(You should receive a message by email momentarily, with "
+msgstr ""
+
+#: actions/remotesubscribe.php:51
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
+msgstr ""
+
+#: actions/showfavorites.php:61
+#, php-format
+msgid "Feed for favorites of %s"
+msgstr ""
+
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+msgid "Could not retrieve favorite notices."
+msgstr ""
+
+#: actions/showmessage.php:33
+msgid "No such message."
+msgstr ""
+
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
+msgstr ""
+
+#: actions/showmessage.php:61
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr ""
+
+#: actions/showmessage.php:66
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr ""
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr ""
+
+#: actions/smssettings.php:312
+#, php-format
+msgid "Mobile carrier for your phone. "
+msgstr ""
+
+#: actions/twitapidirect_messages.php:76
+#, php-format
+msgid "Direct messages to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:77
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:81
+msgid "Direct Messages You've Sent"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:82
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:128
+msgid "No message text!"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:138
+msgid "Recipient user not found."
+msgstr ""
+
+#: actions/twitapidirect_messages.php:141
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
+#: actions/twitapifavorites.php:92
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr ""
+
+#: actions/twitapifavorites.php:95
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr ""
+
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#, php-format
+msgid "%s added your notice as a favorite"
+msgstr ""
+
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+msgstr ""
+
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+msgstr ""
+
+#: actions/twittersettings.php:41
+msgid "Twitter settings"
+msgstr ""
+
+#: actions/twittersettings.php:48
+msgid "Twitter Account"
+msgstr ""
+
+#: actions/twittersettings.php:56
+msgid "Current verified Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr ""
+
+#: actions/twittersettings.php:65
+msgid "No spaces, please."
+msgstr ""
+
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr ""
+
+#: actions/twittersettings.php:72
+msgid "Automatically send my notices to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:75
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:78
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+
+#: actions/twittersettings.php:128
+msgid "Could not verify your Twitter credentials!"
+msgstr ""
+
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+msgid "Unable to save your Twitter settings!"
+msgstr ""
+
+#: actions/twittersettings.php:174
+msgid "Twitter settings saved."
+msgstr ""
+
+#: actions/twittersettings.php:192
+msgid "That is not your Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+msgid "Couldn't remove Twitter user."
+msgstr ""
+
+#: actions/twittersettings.php:212
+msgid "Twitter account removed."
+msgstr ""
+
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+msgid "Couldn't save Twitter preferences."
+msgstr ""
+
+#: actions/twittersettings.php:245
+msgid "Twitter preferences saved."
+msgstr ""
+
+#: actions/userauthorization.php:84
+msgid "Please check these details to make sure "
+msgstr ""
+
+#: actions/userauthorization.php:324
+msgid "The subscription has been authorized, but no "
+msgstr ""
+
+#: actions/userauthorization.php:334
+msgid "The subscription has been rejected, but no "
+msgstr ""
+
+#: classes/Channel.php:113
+msgid "Command results"
+msgstr ""
+
+#: classes/Channel.php:148
+msgid "Command complete"
+msgstr ""
+
+#: classes/Channel.php:158
+msgid "Command failed"
+msgstr ""
+
+#: classes/Command.php:39
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: classes/Command.php:96
+#, php-format
+msgid "Subscriptions: %1$s\n"
+msgstr ""
+
+#: classes/Command.php:125 classes/Command.php:242
+msgid "User has no last notice"
+msgstr ""
+
+#: classes/Command.php:146
+msgid "Notice marked as fave."
+msgstr ""
+
+#: classes/Command.php:166
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr ""
+
+#: classes/Command.php:169
+#, php-format
+msgid "Fullname: %s"
+msgstr ""
+
+#: classes/Command.php:172
+#, php-format
+msgid "Location: %s"
+msgstr ""
+
+#: classes/Command.php:175
+#, php-format
+msgid "Homepage: %s"
+msgstr ""
+
+#: classes/Command.php:178
+#, php-format
+msgid "About: %s"
+msgstr ""
+
+#: classes/Command.php:200
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
+
+#: classes/Command.php:214
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
+
+#: classes/Command.php:216
+msgid "Error sending direct message."
+msgstr ""
+
+#: classes/Command.php:263
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: classes/Command.php:270
+#, php-format
+msgid "Subscribed to %s"
+msgstr ""
+
+#: classes/Command.php:288
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
+
+#: classes/Command.php:295
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr ""
+
+#: classes/Command.php:310 classes/Command.php:330
+msgid "Command not yet implemented."
+msgstr ""
+
+#: classes/Command.php:313
+msgid "Notification off."
+msgstr ""
+
+#: classes/Command.php:315
+msgid "Can't turn off notification."
+msgstr ""
+
+#: classes/Command.php:333
+msgid "Notification on."
+msgstr ""
+
+#: classes/Command.php:335
+msgid "Can't turn on notification."
+msgstr ""
+
+#: classes/Command.php:344
+msgid "Commands:\n"
+msgstr ""
+
+#: classes/Message.php:53
+msgid "Could not insert message."
+msgstr ""
+
+#: classes/Message.php:63
+msgid "Could not update message with new URI."
+msgstr ""
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr ""
+
+#: lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:249
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:253
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+msgstr ""
+
+#: lib/mailbox.php:43
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/openid.php:195
+msgid "This form should automatically submit itself. "
+msgstr ""
+
+#: lib/personal.php:65
+msgid "Favorites"
+msgstr ""
+
+#: lib/personal.php:66
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
+#: lib/personal.php:66
+msgid "User"
+msgstr ""
+
+#: lib/personal.php:75
+msgid "Inbox"
+msgstr ""
+
+#: lib/personal.php:76
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personal.php:80
+msgid "Outbox"
+msgstr ""
+
+#: lib/personal.php:81
+msgid "Your sent messages"
+msgstr ""
+
+#: lib/settingsaction.php:99
+msgid "Twitter"
+msgstr ""
+
+#: lib/settingsaction.php:100
+msgid "Twitter integration options"
+msgstr ""
+
+#: lib/util.php:1718
+msgid "To"
+msgstr ""
+
+#: scripts/maildaemon.php:45
+msgid "Could not parse message."
+msgstr ""
diff --git a/locale/nl_NL/LC_MESSAGES/laconica.mo b/locale/nl_NL/LC_MESSAGES/laconica.mo
index 9ee05dbe8..d53c052e4 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 df99c4201..68870c232 100644
--- a/locale/nl_NL/LC_MESSAGES/laconica.po
+++ b/locale/nl_NL/LC_MESSAGES/laconica.po
@@ -6,9 +6,20 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-27 14:57-0400\n"
+"POT-Creation-Date: 2008-07-14 21:07+1200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-10-13 21:07+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,64 +32,20 @@ msgstr ""
 msgid " Search Stream for \"%s\""
 msgstr "Doorzoek de stroom naar \"%s\""
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
 msgid ""
-" except this private data: password, email address, IM address, phone number."
+" except this private data: password, email address, IM address, phone "
+"number."
 msgstr ""
 " behalve de volgende privégegevens: wachtwoord, e-mailadres, IM-adres, "
 "telefoonnummer."
 
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-msgid " from "
-msgstr ""
-
-#: ../actions/twitapistatuses.php:478
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/invite.php:168
-#, fuzzy, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s volgt nu je berichten op %2$s."
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-
-#: ../lib/mail.php:124
+#: ../actions/subscribe.php:84
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s volgt nu je berichten op %2$s."
 
-#: ../lib/mail.php:126
+#: ../actions/subscribe.php:86
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -95,157 +62,78 @@ msgstr ""
 "Met vriendelijke groet,\n"
 "%4$s.\n"
 
-#: ../actions/twitapistatuses.php:482
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-
 #: ../actions/shownotice.php:45
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s's status op %2$s"
 
-#: ../actions/invite.php:84 ../actions/invite.php:92
+#: ../actions/publicrss.php:60 ../actions/publicrss.php:62
+#: actions/publicrss.php:48
 #, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/publicrss.php:62
-#, fuzzy, php-format
+#, fuzzy
 msgid "%s Public Stream"
-msgstr "%s openbare stroom"
+msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"%s openbare stroom\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
-#: ../actions/all.php:47 ../actions/allrss.php:60
-#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51
+#: ../actions/all.php:47 ../actions/allrss.php:70 ../lib/stream.php:45
 #, php-format
 msgid "%s and friends"
 msgstr "%s en vrienden"
 
-#: ../actions/twitapistatuses.php:49
-#, fuzzy, php-format
-msgid "%s public timeline"
-msgstr "Openbare tijdlijn"
-
-#: ../lib/mail.php:206
-#, fuzzy, php-format
-msgid "%s status"
-msgstr "%1$s's status op %2$s"
-
-#: ../actions/twitapistatuses.php:338
-#, fuzzy, php-format
-msgid "%s timeline"
-msgstr "Openbare tijdlijn"
-
-#: ../actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:213
-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:233
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** is a microblogging service brought to you by "
+"[%%site.broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
-"**%%site.name%%** is een microbloggingdienst van [%%site.broughtby%%](%%site."
-"broughtbyurl%%). "
+"**%%site.name%%** is een microbloggingdienst van "
+"[%%site.broughtby%%](%%site.broughtbyurl%%). "
 
-#: ../lib/util.php:259
+#: ../lib/util.php:235
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** is een microbloggingdienst. "
 
-#: ../lib/util.php:274
+#: ../lib/util.php:250
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ""
 ". Van de oorspronkelijke auteurs dient de volledige naam of gebruikersnaam "
 "te worden vermeld."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
+#: ../actions/register.php:176
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties"
 
-#: ../actions/register.php:152
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties"
-
-#: ../actions/password.php:42
+#: ../actions/password.php:42 ../actions/register.php:178
 msgid "6 or more characters"
 msgstr "6 of meer tekens"
 
-#: ../actions/recoverpassword.php:180
+#: ../actions/recoverpassword.php:165
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 of meer tekens, en vergeet het niet!"
 
-#: ../actions/register.php:154
-#, fuzzy
-msgid "6 or more characters. Required."
-msgstr "6 of meer tekens"
-
-#: ../actions/imsettings.php:197
+#: ../actions/imsettings.php:188
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+"A confirmation code was sent to the IM address you added. You must approve "
+"%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."
 
-#: ../actions/emailsettings.php:213
-#, fuzzy
-msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
-msgstr ""
-"Een bevestigingscode is verstuurd naar het opgegeven IM-adres. Je moet ermee "
-"accoord gaan dat %s boodschappen aan jou stuurt."
-
-#: ../actions/smssettings.php:216
-#, fuzzy
-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 verstuurd naar het opgegeven IM-adres. Je moet ermee "
-"accoord gaan dat %s boodschappen aan jou stuurt."
-
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122
-msgid "API method not found!"
-msgstr ""
-
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-msgid "API method under construction."
-msgstr ""
-
 #  This would be appropriate for the footer menu link (actual context isn't clear!)
-#: ../lib/util.php:324
+#: ../lib/util.php:296
 msgid "About"
 msgstr "Over ons"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/userauthorization.php:118
 msgid "Accept"
 msgstr "Accepteer"
 
-#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
-#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
 msgid "Add"
 msgstr "Voeg toe"
 
@@ -253,25 +141,15 @@ msgstr "Voeg toe"
 msgid "Add OpenID"
 msgstr "Voeg OpenID toe"
 
-#: ../lib/settingsaction.php:97
-#, fuzzy
-msgid "Add or remove OpenIDs"
-msgstr "Verwijder OpenID"
-
-#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39
+#: ../actions/imsettings.php:39
 msgid "Address"
 msgstr "Adres"
 
-#: ../actions/invite.php:131
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../actions/showstream.php:273
+#: ../actions/showstream.php:254
 msgid "All subscriptions"
 msgstr "Alle abonnementen"
 
-#: ../actions/publicrss.php:64
+#: ../actions/publicrss.php:62
 #, php-format
 msgid "All updates for %s"
 msgstr "Alle updates voor %s"
@@ -281,33 +159,24 @@ msgstr "Alle updates voor %s"
 msgid "All updates matching search term \"%s\""
 msgstr "Alle updates die overeenkomen met de zoekterm \"%s\""
 
-#: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
-#: ../actions/openidlogin.php:29 ../actions/register.php:30
+#: ../actions/finishopenidlogin.php:29 ../actions/login.php:27
+#: ../actions/openidlogin.php:29 ../actions/register.php:28
 msgid "Already logged in."
 msgstr "Al ingelogd."
 
-#: ../lib/subs.php:42
+#: ../actions/subscribe.php:48
 msgid "Already subscribed!."
 msgstr "Al geabonneerd!"
 
-#: ../actions/deletenotice.php:54
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/userauthorization.php:77
+#: ../actions/userauthorization.php:76
 msgid "Authorize subscription"
 msgstr "Sta abonnement toe"
 
-#: ../actions/login.php:104 ../actions/register.php:178
+#: ../actions/login.php:100 ../actions/register.php:184
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Voortaan automatisch inloggen; niet voor gemeenschappelijke computers!"
 
-#: ../actions/profilesettings.php:65
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr ""
-
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: ../actions/avatar.php:32
 msgid "Avatar"
 msgstr "Avatar"
 
@@ -325,49 +194,28 @@ msgstr ""
 "een boodschap met nadere instructies. (Heb je %s aan je contactenlijst "
 "toegevoegd?)"
 
-#: ../actions/emailsettings.php:54
-#, fuzzy
-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 Jabber/GTalk account op "
-"een boodschap met nadere instructies. (Heb je %s aan je contactenlijst "
-"toegevoegd?)"
-
-#: ../actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
-
-#: ../lib/util.php:1318
+#: ../lib/util.php:1136
 msgid "Before »"
 msgstr "Eerder »"
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: ../actions/profilesettings.php:52
 msgid "Bio"
 msgstr "Biografie"
 
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103
+#: ../actions/profilesettings.php:93 ../actions/updateprofile.php:102
 msgid "Bio is too long (max 140 chars)."
 msgstr "Biografie is te lang (maximaal 140 tekens)"
 
-#: ../lib/deleteaction.php:41
-#, fuzzy
-msgid "Can't delete this notice."
-msgstr "Kon e-mailbevestiging niet verwijderen."
-
-#: ../actions/updateprofile.php:119
+#: ../actions/updateprofile.php:118
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Kan avatar-URL '%s' niet lezen"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
+#: ../actions/password.php:85 ../actions/recoverpassword.php:261
 msgid "Can't save new password."
 msgstr "Kan nieuw wachtwoord niet opslaan."
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62
+#: ../actions/imsettings.php:59
 msgid "Cancel"
 msgstr "Annuleer"
 
@@ -375,79 +223,35 @@ msgstr "Annuleer"
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Kan OpenID-consumerobject niet instantiëren."
 
-#: ../actions/imsettings.php:163
+#: ../actions/imsettings.php:154
 msgid "Cannot normalize that Jabber ID"
 msgstr "Kan die Jabber-ID niet normaliseren"
 
-#: ../actions/emailsettings.php:181
-#, fuzzy
-msgid "Cannot normalize that email address"
-msgstr "Kan die Jabber-ID niet normaliseren"
-
 #: ../actions/password.php:45
 msgid "Change"
 msgstr "Wijzig"
 
-#: ../lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
 #: ../actions/password.php:32
 msgid "Change password"
 msgstr "Wijzig wachtwoord"
 
-#: ../lib/settingsaction.php:94
-#, fuzzy
-msgid "Change your password"
-msgstr "Wijzig wachtwoord"
-
-#: ../lib/settingsaction.php:85
-#, fuzzy
-msgid "Change your profile settings"
-msgstr "Profielinstellingen"
-
-#: ../actions/password.php:43 ../actions/recoverpassword.php:181
-#: ../actions/register.php:155 ../actions/smssettings.php:65
+#: ../actions/password.php:43 ../actions/recoverpassword.php:166
+#: ../actions/register.php:179
 msgid "Confirm"
 msgstr "Bevestig"
 
-#: ../actions/confirmaddress.php:90
+#: ../actions/confirmaddress.php:84
 msgid "Confirm Address"
 msgstr "Bevestig adres"
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245
+#: ../actions/imsettings.php:213
 msgid "Confirmation cancelled."
 msgstr "Bevestiging geannuleerd."
 
-#: ../actions/smssettings.php:63
-#, fuzzy
-msgid "Confirmation code"
-msgstr "Geen bevestigingscode."
-
 #: ../actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr "Bevestigingscode niet gevonden."
 
-#: ../actions/register.php:202
-#, php-format
-msgid ""
-"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."
-msgstr ""
-
 #: ../actions/finishopenidlogin.php:91
 msgid "Connect"
 msgstr "Koppel"
@@ -456,75 +260,55 @@ msgstr "Koppel"
 msgid "Connect existing account"
 msgstr "Koppel bestaand account"
 
-#: ../lib/util.php:332
+#: ../lib/util.php:304
 msgid "Contact"
 msgstr "Contact"
 
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr ""
-
 #: ../lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Kon niet omleiden naar server: %s"
 
-#: ../actions/updateprofile.php:162
+#: ../actions/updateprofile.php:161
 msgid "Could not save avatar info"
 msgstr "Kon avatarinformatie niet opslaan"
 
-#: ../actions/updateprofile.php:155
+#: ../actions/updateprofile.php:154
 msgid "Could not save new profile info"
 msgstr "Kon de nieuwe profielinformatie niet opslaan"
 
-#: ../lib/subs.php:54
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../lib/subs.php:46
-#, fuzzy
-msgid "Could not subscribe."
-msgstr "Niet geabonneerd!"
-
-#: ../actions/recoverpassword.php:102
-#, fuzzy
-msgid "Could not update user with confirmed email address."
-msgstr "Kon bevestigingscode niet toevoegen"
+#: ../actions/profilesettings.php:146
+msgid "Couldn't confirm email."
+msgstr "Kon e-mail niet bevestigen."
 
 #: ../actions/finishremotesubscribe.php:99
+#: actions/finishremotesubscribe.php:101
 msgid "Couldn't convert request tokens to access tokens."
 msgstr ""
 
-#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
-#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#: ../actions/subscribe.php:59
+msgid "Couldn't create subscription."
+msgstr "Kon abonnement niet aanmaken."
+
+#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
 msgid "Couldn't delete email confirmation."
 msgstr "Kon e-mailbevestiging niet verwijderen."
 
-#: ../lib/subs.php:103
+#: ../actions/unsubscribe.php:56
 msgid "Couldn't delete subscription."
 msgstr "Kon abonnement niet verwijderen."
 
-#: ../actions/twitapistatuses.php:93
-#, fuzzy
-msgid "Couldn't find any statuses."
-msgstr "Kon gebruiker niet actualiseren."
-
-#: ../actions/remotesubscribe.php:127
+#: ../actions/remotesubscribe.php:125 ../actions/remotesubscribe.php:127
+#: actions/remotesubscribe.php:136
 msgid "Couldn't get a request token."
 msgstr ""
 
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206
+#: ../actions/imsettings.php:178
 msgid "Couldn't insert confirmation code."
 msgstr "Kon bevestigingscode niet toevoegen"
 
@@ -532,24 +316,12 @@ msgstr "Kon bevestigingscode niet toevoegen"
 msgid "Couldn't insert new subscription."
 msgstr "Kon nieuw abonnement niet toevoegen."
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: ../actions/profilesettings.php:175
 msgid "Couldn't save profile."
 msgstr "Kon profiel niet opslaan."
 
-#: ../actions/profilesettings.php:161
-#, fuzzy
-msgid "Couldn't update user for autosubscribe."
-msgstr "Kon gebruiker niet actualiseren."
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#, fuzzy
-msgid "Couldn't update user record."
-msgstr "Kon gebruiker niet actualiseren."
-
-#: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
-#: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
-#: ../actions/imsettings.php:243 ../actions/profilesettings.php:141
-#: ../actions/smssettings.php:157 ../actions/smssettings.php:269
+#: ../actions/confirmaddress.php:70 ../actions/imsettings.php:129
+#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
 msgid "Couldn't update user."
 msgstr "Kon gebruiker niet actualiseren."
 
@@ -575,83 +347,44 @@ msgstr ""
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Huidig bevestigd Jabber/GTalk adres."
 
-#: ../actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:44
-#, fuzzy
-msgid "Current confirmed email address."
-msgstr "Huidig bevestigd Jabber/GTalk adres."
-
-#: ../actions/showstream.php:356
+#: ../actions/showstream.php:337
 msgid "Currently"
 msgstr "Op dit moment"
 
-#: ../classes/Notice.php:72
-#, fuzzy, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "Database-fout bij toevoegen antwoord: %s"
-
-#: ../lib/util.php:1061
+#: ../lib/util.php:893
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Database-fout bij toevoegen antwoord: %s"
 
-#: ../actions/deletenotice.php:41
-#, fuzzy
-msgid "Delete notice"
-msgstr "Nieuw bericht"
-
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: ../actions/profilesettings.php:54
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Beschrijf jezelf en je interesses in 140 tekens"
 
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87
+#: ../actions/register.php:181
 msgid "Email"
 msgstr "E-mail"
 
-#: ../actions/emailsettings.php:59
-#, fuzzy
-msgid "Email Address"
+#: ../actions/profilesettings.php:46
+msgid "Email address"
 msgstr "E-mailadres"
 
-#: ../actions/emailsettings.php:32
-#, fuzzy
-msgid "Email Settings"
-msgstr "Instellingen"
-
-#: ../actions/register.php:73
+#: ../actions/profilesettings.php:102 ../actions/register.php:63
 msgid "Email address already exists."
 msgstr "E-mailadres bestaat al."
 
-#: ../lib/mail.php:90
+#: ../lib/mail.php:82
 msgid "Email address confirmation"
 msgstr "Bevestiging e-mailadres"
 
-#: ../actions/emailsettings.php:61
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/invite.php:129
-#, fuzzy
-msgid "Email addresses"
-msgstr "E-mailadres"
-
-#: ../actions/recoverpassword.php:191
+#: ../actions/recoverpassword.php:176
 msgid "Enter a nickname or email address."
 msgstr "Voer een gebruikersnaam of e-mailadres in"
 
-#: ../actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/userauthorization.php:137
+#: ../actions/userauthorization.php:136
 msgid "Error authorizing token"
 msgstr "Fout bij autoriseren token"
 
-#: ../actions/finishopenidlogin.php:253
+#: ../actions/finishopenidlogin.php:282
 msgid "Error connecting user to OpenID."
 msgstr "Fout bij koppelen gebruiker aan OpenID."
 
@@ -667,19 +400,23 @@ msgstr "Fout bij toevoegen avatar"
 msgid "Error inserting new profile"
 msgstr "Fout bij toevoegen nieuw profiel"
 
+#: ../actions/postnotice.php:88
+msgid "Error inserting notice"
+msgstr "Fout bij toevoegen bericht"
+
 #: ../actions/finishremotesubscribe.php:167
 msgid "Error inserting remote profile"
 msgstr "Fout bij toevoegen profiel op afstand"
 
-#: ../actions/recoverpassword.php:240
+#: ../actions/recoverpassword.php:201
 msgid "Error saving address confirmation."
 msgstr "Fout bij opslaan adresbevestiging."
 
-#: ../actions/userauthorization.php:140
+#: ../actions/userauthorization.php:139
 msgid "Error saving remote profile"
 msgstr "Fout bij opslaan profiel op afstand"
 
-#: ../lib/openid.php:226
+#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
 msgid "Error saving the profile."
 msgstr "Fout bij opslaan van het profiel."
 
@@ -691,11 +428,18 @@ msgstr "Fout bij opslaan van de gebruiker."
 msgid "Error saving user; invalid."
 msgstr "Fout bij opslaan gebruiker; ongeldig."
 
+#: ../actions/login.php:43 ../actions/login.php:69
+#: ../actions/recoverpassword.php:268 ../actions/register.php:73
 #: ../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
 #, fuzzy
 msgid "Error setting user."
-msgstr "Fout bij vastleggen gebruiker."
+msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Fout bij vastleggen gebruiker.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
 #: ../actions/finishaddopenid.php:83
 msgid "Error updating profile"
@@ -705,7 +449,7 @@ msgstr "Fout bij actualiseren profiel"
 msgid "Error updating remote profile"
 msgstr "Fout bij actualiseren profiel op afstand"
 
-#: ../actions/recoverpassword.php:80
+#: ../actions/recoverpassword.php:79
 msgid "Error with confirmation code."
 msgstr "Fout bij bevestigingscode."
 
@@ -713,7 +457,7 @@ msgstr "Fout bij bevestigingscode."
 msgid "Existing nickname"
 msgstr "Gebruikersnaam bestaat al"
 
-#: ../lib/util.php:326
+#: ../lib/util.php:298
 msgid "FAQ"
 msgstr "Veelgestelde vragen"
 
@@ -721,30 +465,17 @@ msgstr "Veelgestelde vragen"
 msgid "Failed updating avatar."
 msgstr "Actualiseren avatar niet gelukt."
 
-#: ../actions/all.php:61 ../actions/allrss.php:64
+#: ../actions/all.php:61 ../actions/allrss.php:74
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Feed voor vrienden van %s"
 
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: ../actions/replies.php:61 ../actions/repliesrss.php:80
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Feed voor antwoorden aan %s"
 
-#: ../actions/tag.php:55
-#, fuzzy, php-format
-msgid "Feed for tag %s"
-msgstr "Feed voor antwoorden aan %s"
-
-#: ../lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/login.php:122
+#: ../actions/login.php:118
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -752,40 +483,31 @@ msgstr ""
 "Om veiligheidsredenen vragen we je je gebruikersnaam en wachtwoord nogmaals "
 "in te voeren alvorens je instellingen te veranderen."
 
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: ../actions/profilesettings.php:44
 msgid "Full name"
 msgstr "Volledige naam"
 
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93
+#: ../actions/profilesettings.php:90 ../actions/updateprofile.php:92
 msgid "Full name is too long (max 255 chars)."
 msgstr "Volledige naam is te lang (maximaal 255 tekens)"
 
-#: ../lib/util.php:322
+#: ../lib/util.php:279
 msgid "Help"
 msgstr "Help"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:274
 msgid "Home"
 msgstr "Home"
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: ../actions/profilesettings.php:49
 msgid "Homepage"
 msgstr "Homepage"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: ../actions/profilesettings.php:87
 msgid "Homepage is not a valid URL."
 msgstr "Homepage is geen geldige URL"
 
-#: ../actions/emailsettings.php:91
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102
-msgid "IM"
-msgstr ""
-
-#: ../actions/imsettings.php:60
+#: ../actions/imsettings.php:61
 msgid "IM Address"
 msgstr "IM-adres"
 
@@ -809,56 +531,41 @@ msgstr ""
 "Als je een OpenID aan je account wilt toevoegen, vul het dan in het veld "
 "hieronder in en klik op \"Voeg toe\"."
 
-#: ../actions/recoverpassword.php:137
-#, fuzzy
+#: ../actions/recoverpassword.php:122
 msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
+"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 ""
 "Als je je wachtwoord vergeten of kwijt bent, kan een nieuw wachtwoord worden "
 "opgestuurd naar het e-mailadres dat je in je account hebt vastgelegd."
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283
-#, fuzzy
-msgid "Incoming email address removed."
-msgstr "Het adres was verwijderd."
-
 #: ../actions/password.php:69
 msgid "Incorrect old password"
 msgstr "Incorrect oud wachtwoord"
 
-#: ../actions/login.php:67
+#: ../actions/login.php:63
 msgid "Incorrect username or password."
 msgstr "Incorrecte gebruikersnaam of wachtwoord."
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:226
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
-"Instructies om je wachtwoord te herstellen zijn verstuurd naar het e-"
-"mailadres dat voor je account is geregistreerd."
+"Instructies om je wachtwoord te herstellen zijn verstuurd naar het "
+"e-mailadres dat voor je account is geregistreerd."
 
-#: ../actions/updateprofile.php:114
+#: ../actions/updateprofile.php:113
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "Ongeldige avatar-URL '%s'"
 
-#: ../actions/invite.php:55
-#, fuzzy, php-format
-msgid "Invalid email address: %s"
-msgstr "Geen geldig e-mailadres."
-
-#: ../actions/updateprofile.php:98
+#: ../actions/updateprofile.php:97
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Ongeldige homepage '%s'"
 
-#: ../actions/updateprofile.php:82
+#: ../actions/updateprofile.php:81
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "Ongeldige licentie-URL '%s'"
@@ -875,7 +582,7 @@ msgstr "Ongeldige bericht-URI"
 msgid "Invalid notice url"
 msgstr "Ongeldige bericht-URL"
 
-#: ../actions/updateprofile.php:87
+#: ../actions/updateprofile.php:86
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "Ongeldige profiel-URL '%s'."
@@ -892,43 +599,27 @@ msgstr "Ongeldige profiel-URL teruggestuurd door de server."
 msgid "Invalid size."
 msgstr "Ongeldige afmeting."
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111
+#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
+#: ../actions/register.php:84
 msgid "Invalid username or password."
 msgstr "Ongeldige gebruikersnaam of wachtwoord."
 
-#: ../actions/invite.php:79
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123
-msgid "Invite new users"
-msgstr ""
-
-#: ../lib/util.php:261
+#: ../lib/util.php:237
 #, 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)."
+"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 ""
-"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 the [GNU Affero General Public "
+"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:173
+#: ../actions/imsettings.php:164
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber-ID al in gebruik bij een andere gebruiker"
 
-#: ../actions/imsettings.php:62
+#: ../actions/imsettings.php:63
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -937,26 +628,16 @@ msgstr ""
 "Jabber of GTalk adres, zoals \"JouwNaam@example.org\". Zorg ervoor dat je "
 "eerst % aan je contactenlijst in je IM-programma of in GTalk toevoegt."
 
-#: ../actions/profilesettings.php:57
-msgid "Language"
-msgstr ""
-
-#: ../actions/profilesettings.php:113
-#, fuzzy
-msgid "Language is too long (max 50 chars)."
-msgstr "Locatie is te lang (maximaal 255 tekens)."
-
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: ../actions/profilesettings.php:55
 msgid "Location"
 msgstr "Locatie"
 
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108
+#: ../actions/profilesettings.php:96 ../actions/updateprofile.php:107
 msgid "Location is too long (max 255 chars)."
 msgstr "Locatie is te lang (maximaal 255 tekens)."
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310
+#: ../actions/login.php:93 ../actions/login.php:102
+#: ../actions/openidlogin.php:68 ../lib/util.php:286
 msgid "Login"
 msgstr "Inloggen"
 
@@ -965,40 +646,27 @@ msgstr "Inloggen"
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Log in met een [OpenID](%%doc.openid%%) account."
 
-#: ../actions/login.php:126
+#: ../actions/login.php:122
 #, 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%"
-"%). "
+"Login with your username and password. Don't have a username yet? "
+"[Register](%%action.register%%) a new account, or try "
+"[OpenID](%%action.openidlogin%%). "
 msgstr ""
 "Log in met je gebruikersnaam en wachtwoord. Heb je nog geen gebruikersnaam? "
-"[Registreer](%%action.register%%) dan een nieuw account, of probeer [OpenID]"
-"(%%action.openidlogin%%)."
+"[Registreer](%%action.register%%) dan een nieuw account, of probeer "
+"[OpenID](%%action.openidlogin%%)."
 
-#: ../lib/util.php:308
+#: ../lib/util.php:284
 msgid "Logout"
 msgstr "Uitloggen"
 
-#: ../actions/register.php:166
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
-
-#: ../actions/login.php:110
+#: ../actions/login.php:106
 msgid "Lost or forgotten password?"
 msgstr "Wachtwoord kwijt of vergeten?"
 
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr ""
-
 #  String should contain a variable token for since 'when'
-#: ../actions/showstream.php:300
+#: ../actions/showstream.php:281
 msgid "Member since"
 msgstr "Lid sinds"
 
@@ -1007,59 +675,38 @@ msgstr "Lid sinds"
 msgid "Microblog by %s"
 msgstr "Microblog van %s"
 
-#: ../actions/smssettings.php:304
-#, php-format
-msgid ""
-"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
-"email but isn't listed here, send email to let us know at %s."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
 msgid "My text and files are available under "
 msgstr "Mijn tekst en bestanden zijn beschikbaar onder"
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-msgid "New"
-msgstr ""
-
-#: ../lib/mail.php:144
-#, fuzzy, php-format
-msgid "New email address for posting to %s"
-msgstr "Geen geregistreerd e-mailadres voor die gebruiker."
-
-#: ../actions/emailsettings.php:297
-#, fuzzy
-msgid "New incoming email address added."
-msgstr "Geen geldig e-mailadres."
-
 #: ../actions/finishopenidlogin.php:71
 msgid "New nickname"
 msgstr "Nieuwe gebruikersnaam"
 
-#: ../actions/newnotice.php:87
+#: ../actions/newnotice.php:100
 msgid "New notice"
 msgstr "Nieuw bericht"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
+#: ../actions/password.php:41 ../actions/recoverpassword.php:164
 msgid "New password"
 msgstr "Nieuw wachtwoord"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:275
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nieuw wachtwoord is opgeslagen. Je bent nu ingelogd."
 
-#: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151
+#: ../actions/login.php:97 ../actions/profilesettings.php:41
+#: ../actions/register.php:175
 msgid "Nickname"
 msgstr "Gebruikersnaam"
 
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69
+#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:99
+#: ../actions/register.php:59
 msgid "Nickname already in use. Try another one."
 msgstr "Gebruikersnaam al in gebruik. Probeer een andere."
 
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:67 ../actions/updateprofile.php:77
+#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:80
+#: ../actions/register.php:57 ../actions/updateprofile.php:76
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "Gebruikersnaam moet bestaan uit alleen kleine letters en cijfers en geen "
@@ -1073,53 +720,30 @@ msgstr "Gebruikersnaam niet toegestaan."
 msgid "Nickname of the user you want to follow"
 msgstr "Gebruikersnaam van de gebruiker die je wilt volgen"
 
-#: ../actions/recoverpassword.php:162
+#: ../actions/recoverpassword.php:147
 msgid "Nickname or email"
 msgstr "Gebruikersnaam of e-mail"
 
-#: ../actions/deletenotice.php:59
-msgid "No"
-msgstr ""
-
-#: ../actions/imsettings.php:156
+#: ../actions/imsettings.php:147
 msgid "No Jabber ID."
 msgstr "Geen Jabber-ID."
 
-#: ../actions/userauthorization.php:129
+#: ../actions/userauthorization.php:128
 msgid "No authorization request!"
 msgstr "Geen autorisatieverzoek!"
 
-#: ../actions/smssettings.php:181
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316
-#, fuzzy
-msgid "No code entered"
-msgstr "Geen inhoud!"
-
 #: ../actions/confirmaddress.php:33
 msgid "No confirmation code."
 msgstr "Geen bevestigingscode."
 
-#: ../actions/newnotice.php:44
+#: ../actions/newnotice.php:49
 msgid "No content!"
 msgstr "Geen inhoud!"
 
-#: ../actions/emailsettings.php:174
-#, fuzzy
-msgid "No email address."
-msgstr "E-mailadres"
-
-#: ../actions/userbyid.php:32
+#: ../actions/userbyid.php:27
 msgid "No id."
 msgstr "Geen ID."
 
-#: ../actions/emailsettings.php:271
-#, fuzzy
-msgid "No incoming email address."
-msgstr "Geen geldig e-mailadres."
-
 #: ../actions/finishremotesubscribe.php:65
 msgid "No nickname provided by remote server."
 msgstr "Geen gebruikersnaam verschaft door de server op afstand."
@@ -1128,29 +752,24 @@ msgstr "Geen gebruikersnaam verschaft door de server op afstand."
 msgid "No nickname."
 msgstr "Geen gebruikersnaam."
 
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229
+#: ../actions/imsettings.php:197
 msgid "No pending confirmation to cancel."
 msgstr "Geen bevestiging in behandeling om te annuleren."
 
-#: ../actions/smssettings.php:176
-#, fuzzy
-msgid "No phone number."
-msgstr "Onbekende gebruiker."
-
 #: ../actions/finishremotesubscribe.php:72
 msgid "No profile URL returned by server."
 msgstr "Geen profiel-URL teruggestuurd door de server."
 
-#: ../actions/recoverpassword.php:226
+#: ../actions/recoverpassword.php:189
 msgid "No registered email address for that user."
 msgstr "Geen geregistreerd e-mailadres voor die gebruiker."
 
-#: ../actions/userauthorization.php:49
+#: ../actions/userauthorization.php:48
 msgid "No request found!"
 msgstr "Geen verzoek gevonden!"
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
+#: actions/noticesearch.php:69 actions/peoplesearch.php:69
 msgid "No results"
 msgstr ""
 
@@ -1158,14 +777,6 @@ msgstr ""
 msgid "No size."
 msgstr "Geen afmeting."
 
-#: ../actions/twitapistatuses.php:595
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555
-msgid "No status with that ID found."
-msgstr ""
-
 #: ../actions/openidsettings.php:135
 msgid "No such OpenID."
 msgstr "Die OpenID is niet bekend."
@@ -1174,8 +785,7 @@ msgstr "Die OpenID is niet bekend."
 msgid "No such document."
 msgstr "Onbekend document."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30
+#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
 msgid "No such notice."
 msgstr "Onbekend bericht."
 
@@ -1188,21 +798,16 @@ msgid "No such subscription"
 msgstr "Onbekend abonnement"
 
 #: ../actions/all.php:34 ../actions/allrss.php:35
-#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
-#: ../actions/remotesubscribe.php:84 ../actions/remotesubscribe.php:91
-#: ../actions/replies.php:57 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:110 ../actions/userbyid.php:36
-#: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
-#: ../lib/subs.php:33 ../lib/subs.php:82
+#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:36
+#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
+#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
+#: ../actions/showstream.php:95 ../actions/subscribe.php:43
+#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
+#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
 msgid "No such user."
 msgstr "Onbekende gebruiker."
 
-#: ../actions/recoverpassword.php:211
-#, fuzzy
-msgid "No user with that email address or username."
-msgstr "Geen geregistreerd e-mailadres voor die gebruiker."
-
-#: ../lib/gallery.php:80
+#: ../lib/gallery.php:76
 msgid "Nobody to show!"
 msgstr "Niemand te tonen!"
 
@@ -1210,18 +815,7 @@ msgstr "Niemand te tonen!"
 msgid "Not a recovery code."
 msgstr "Geen geldige herstelcode."
 
-#: ../scripts/maildaemon.php:50
-#, fuzzy
-msgid "Not a registered user."
-msgstr "Geen geldige herstelcode."
-
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332
-#, fuzzy
-msgid "Not a supported data format."
-msgstr "Niet ondersteund beeldbestandsformaat."
-
-#: ../actions/imsettings.php:167
+#: ../actions/imsettings.php:158
 msgid "Not a valid Jabber ID"
 msgstr "Geen geldige Jabber-ID"
 
@@ -1229,24 +823,19 @@ msgstr "Geen geldige Jabber-ID"
 msgid "Not a valid OpenID."
 msgstr "Geen geldige OpenID."
 
-#: ../actions/emailsettings.php:185
-#, fuzzy
-msgid "Not a valid email address"
-msgstr "Geen geldig e-mailadres."
-
-#: ../actions/register.php:63
+#: ../actions/profilesettings.php:75 ../actions/register.php:53
 msgid "Not a valid email address."
 msgstr "Geen geldig e-mailadres."
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
+#: ../actions/profilesettings.php:83 ../actions/register.php:61
 msgid "Not a valid nickname."
 msgstr "Geen geldige gebruikersnaam."
 
-#: ../actions/remotesubscribe.php:120
+#: ../actions/remotesubscribe.php:118
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "Geen geldige profiel-URL (ongeldige diensten)."
 
-#: ../actions/remotesubscribe.php:113
+#: ../actions/remotesubscribe.php:111
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "Geen geldige profiel-URL (geen XRDS gedefinieerd)."
 
@@ -1266,27 +855,16 @@ msgstr "Niet geautoriseerd."
 msgid "Not expecting this response!"
 msgstr "Onverwacht antwoord!"
 
-#: ../actions/twitapistatuses.php:422
-#, fuzzy
-msgid "Not found"
-msgstr "Geen verzoek gevonden!"
-
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:28
-#: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
-#: ../lib/settingsaction.php:27
+#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
+#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
+#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
 msgid "Not logged in."
 msgstr "Niet ingelogd."
 
-#: ../lib/subs.php:91
+#: ../actions/unsubscribe.php:43
 msgid "Not subscribed!."
 msgstr "Niet geabonneerd!"
 
-#: ../actions/opensearch.php:35
-#, fuzzy
-msgid "Notice Search"
-msgstr "Zoeken"
-
 #: ../actions/showstream.php:82
 #, php-format
 msgid "Notice feed for %s"
@@ -1296,20 +874,15 @@ msgstr "Berichten-feed voor %s"
 msgid "Notice has no profile"
 msgstr "Bericht heeft geen profiel"
 
-#: ../actions/showstream.php:316
+#: ../actions/showstream.php:297
 msgid "Notices"
 msgstr "Berichten"
 
-#: ../actions/tag.php:35 ../actions/tag.php:81
-#, fuzzy, php-format
-msgid "Notices tagged with %s"
-msgstr "Berichten-feed voor %s"
-
 #: ../actions/password.php:39
 msgid "Old password"
 msgstr "Oud wachtwoord"
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314
+#: ../lib/util.php:288
 msgid "OpenID"
 msgstr "OpenID"
 
@@ -1317,7 +890,7 @@ msgstr "OpenID"
 msgid "OpenID Account Setup"
 msgstr "OpenID-account instellen"
 
-#: ../lib/openid.php:180
+#: ../lib/openid.php:180 lib/openid.php:180
 msgid "OpenID Auto-Submit"
 msgstr ""
 
@@ -1352,68 +925,44 @@ msgstr "OpenID verwijderd."
 msgid "OpenID settings"
 msgstr "OpenID-instellingen."
 
-#: ../actions/invite.php:135
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
 #: ../actions/avatar.php:84
 msgid "Partial upload."
 msgstr "Onvolledige upload."
 
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
-#: ../actions/register.php:153 ../lib/settingsaction.php:93
+#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
+#: ../actions/register.php:177
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: ../actions/recoverpassword.php:288
+#: ../actions/recoverpassword.php:249
 msgid "Password and confirmation do not match."
 msgstr "Wachtwoord en bevestiging komen niet overeen."
 
-#: ../actions/recoverpassword.php:284
+#: ../actions/recoverpassword.php:245
 msgid "Password must be 6 chars or more."
 msgstr "Wachtwoord moet uit 6 of meer tekens bestaan."
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
 msgid "Password recovery requested"
 msgstr "Wachtwoordherstel aangevraagd"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: ../actions/password.php:89 ../actions/recoverpassword.php:274
 msgid "Password saved."
 msgstr "Wachtwoord opgeslagen."
 
-#: ../actions/password.php:61 ../actions/register.php:88
+#: ../actions/password.php:61 ../actions/register.php:65
 msgid "Passwords don't match."
 msgstr "Wachtwoorden komen niet overeen."
 
-#: ../lib/searchaction.php:100
-#, fuzzy
-msgid "People"
-msgstr "Personen zoeken"
-
-#: ../actions/opensearch.php:33
-#, fuzzy
-msgid "People Search"
-msgstr "Personen zoeken"
-
 #: ../actions/peoplesearch.php:33
 msgid "People search"
 msgstr "Personen zoeken"
 
-#: ../lib/stream.php:50
+#: ../lib/stream.php:44
 msgid "Personal"
 msgstr "Persoonlijk"
 
-#: ../actions/invite.php:133
-#, fuzzy
-msgid "Personal message"
-msgstr "Persoonlijk"
-
-#: ../actions/smssettings.php:69
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties"
-
-#: ../actions/userauthorization.php:78
+#: ../actions/userauthorization.php:77
 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, "
@@ -1424,34 +973,27 @@ msgstr ""
 "aangegeven je op iemand's berichten te willen abonneren, klik dan op "
 "\"Annuleer\"."
 
-#: ../actions/imsettings.php:73
+#: ../actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Plaats een bericht als mijn Jabber/GTalk-status verandert."
 
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94
+#: ../actions/imsettings.php:68
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163
+#: ../actions/imsettings.php:135
 msgid "Preferences saved."
 msgstr "Voorkeuren opgeslagen."
 
-#: ../actions/profilesettings.php:57
-#, fuzzy
-msgid "Preferred language"
-msgstr "Voorkeuren"
-
-#: ../lib/util.php:328
+#: ../lib/util.php:300
 msgid "Privacy"
 msgstr "Privacy"
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106
+#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
 msgid "Problem saving notice."
 msgstr "Probleem bij opslaan bericht."
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60
+#: ../lib/stream.php:54
 msgid "Profile"
 msgstr "Profiel"
 
@@ -1463,10 +1005,14 @@ msgstr "Profiel-URL"
 msgid "Profile settings"
 msgstr "Profielinstellingen"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
 msgid "Profile unknown"
 msgstr "Profiel onbekend"
 
+#: ../lib/util.php:276
+msgid "Public"
+msgstr "Openbaar"
+
 #: ../actions/public.php:54
 msgid "Public Stream Feed"
 msgstr "Openbare stream-feed"
@@ -1475,25 +1021,11 @@ msgstr "Openbare stream-feed"
 msgid "Public timeline"
 msgstr "Openbare tijdlijn"
 
-#: ../actions/imsettings.php:79
-#, fuzzy
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Huidig bevestigd Jabber/GTalk adres."
-
-#: ../actions/emailsettings.php:94
-#, fuzzy
-msgid "Publish a MicroID for my email address."
-msgstr "Voer een gebruikersnaam of e-mailadres in"
-
-#: ../actions/tag.php:75 ../actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
-
-#: ../actions/recoverpassword.php:166
+#: ../actions/recoverpassword.php:151
 msgid "Recover"
 msgstr "Herstellen"
 
-#: ../actions/recoverpassword.php:156
+#: ../actions/recoverpassword.php:141
 msgid "Recover password"
 msgstr "Wachtwoord herstellen"
 
@@ -1501,28 +1033,19 @@ msgstr "Wachtwoord herstellen"
 msgid "Recovery code for unknown user."
 msgstr "Herstelcode voor onbekende gebruiker."
 
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: ../actions/register.php:171 ../actions/register.php:195 ../lib/util.php:287
 msgid "Register"
 msgstr "Registreer"
 
-#: ../actions/register.php:28
-#, fuzzy
-msgid "Registration not allowed."
-msgstr "Gebruikersnaam niet toegestaan."
-
-#: ../actions/register.php:200
-msgid "Registration successful"
-msgstr ""
-
-#: ../actions/userauthorization.php:120
+#: ../actions/userauthorization.php:119
 msgid "Reject"
 msgstr "Afwijzen"
 
-#: ../actions/login.php:103 ../actions/register.php:176
+#: ../actions/login.php:99 ../actions/register.php:183
 msgid "Remember me"
 msgstr "Onthoud mij"
 
-#: ../actions/updateprofile.php:70
+#: ../actions/updateprofile.php:69
 msgid "Remote profile with no matching profile"
 msgstr "Profiel op afstand zonder overeenkomend profiel"
 
@@ -1530,9 +1053,7 @@ msgstr "Profiel op afstand zonder overeenkomend profiel"
 msgid "Remote subscribe"
 msgstr "Abonneren op afstand"
 
-#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
-#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
 msgid "Remove"
 msgstr "Verwijderen"
 
@@ -1548,56 +1069,32 @@ msgstr ""
 "Verwijderen van je enige OpenID zou het onmogelijk maken in te loggen! Als "
 "je het moet verwijderen, voeg dan eerst een ander OpenID toe."
 
-#: ../lib/stream.php:55
+#: ../lib/stream.php:49
 msgid "Replies"
 msgstr "Antwoorden"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
 #, php-format
 msgid "Replies to %s"
 msgstr "Antwoorden aan %s"
 
-#: ../actions/recoverpassword.php:183
+#: ../actions/recoverpassword.php:168
 msgid "Reset"
 msgstr "Terugstellen"
 
-#: ../actions/recoverpassword.php:173
+#: ../actions/recoverpassword.php:158
 msgid "Reset password"
 msgstr "Wachtwoord terugstellen"
 
-#: ../lib/settingsaction.php:99
-msgid "SMS"
-msgstr ""
-
-#: ../actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
-
-#: ../actions/smssettings.php:33
-#, fuzzy
-msgid "SMS Settings"
-msgstr "IM-instellingen"
-
-#: ../lib/mail.php:219
-#, fuzzy
-msgid "SMS confirmation"
-msgstr "Geen bevestigingscode."
-
-#: ../actions/recoverpassword.php:182
+#: ../actions/recoverpassword.php:167 ../actions/register.php:180
 msgid "Same as password above"
 msgstr "Gelijk aan wachtwoord hierboven"
 
-#: ../actions/register.php:156
-#, fuzzy
-msgid "Same as password above. Required."
-msgstr "Gelijk aan wachtwoord hierboven"
-
-#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
-#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
+#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
 msgid "Save"
 msgstr "Opslaan"
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300
+#: ../lib/searchaction.php:73 ../lib/util.php:277
 msgid "Search"
 msgstr "Zoeken"
 
@@ -1624,50 +1121,22 @@ msgstr ""
 "interesses. Scheid de zoektermen met spaties; ze moeten uit 3 of meer tekens "
 "bestaan."
 
-#: ../actions/smssettings.php:296
-msgid "Select a carrier"
-msgstr ""
-
-#: ../actions/invite.php:137 ../lib/util.php:1172
+#: ../lib/util.php:982
 msgid "Send"
 msgstr "Verstuur"
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
-msgstr ""
-
-#: ../actions/emailsettings.php:88
-#, fuzzy
-msgid "Send me notices of new subscriptions through email."
-msgstr "Stuur mij berichten via Jabber/GTalk."
-
-#: ../actions/imsettings.php:70
+#: ../actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Stuur mij berichten via Jabber/GTalk."
 
-#: ../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
-#, fuzzy
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr "Stuur mij berichten via Jabber/GTalk."
-
-#: ../lib/util.php:304
+#: ../lib/util.php:282
 msgid "Settings"
 msgstr "Instellingen"
 
-#: ../actions/profilesettings.php:192
+#: ../actions/profilesettings.php:183
 msgid "Settings saved."
 msgstr "Instellingen opgeslagen."
 
-#: ../actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
 #: ../actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr "Iemand anders heeft die OpenID al."
@@ -1676,45 +1145,36 @@ msgstr "Iemand anders heeft die OpenID al."
 msgid "Something weird happened."
 msgstr "Er is iets eigenaardigs gebeurd."
 
-#: ../scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54
-#, fuzzy
-msgid "Sorry, that is not your incoming email address."
-msgstr "Dat is het verkeerde IM-adres."
-
-#: ../lib/util.php:330
+#: ../lib/util.php:302 ../lib/util.php:330 lib/util.php:346
 msgid "Source"
 msgstr ""
 
-#: ../actions/showstream.php:296
+#: ../actions/showstream.php:277
 msgid "Statistics"
 msgstr "Statistieken"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
 msgid "Stored OpenID not found."
 msgstr "Opgeslagen OpenID niet gevonden."
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197
+#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
+#: ../actions/showstream.php:181
 msgid "Subscribe"
 msgstr "Abonneren"
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: ../actions/showstream.php:294 ../actions/subscribers.php:27
 msgid "Subscribers"
 msgstr "Abonnees"
 
-#: ../actions/userauthorization.php:310
+#: ../actions/userauthorization.php:309
 msgid "Subscription authorized"
 msgstr "Abonnement geautoriseerd"
 
-#: ../actions/userauthorization.php:320
+#: ../actions/userauthorization.php:319
 msgid "Subscription rejected"
 msgstr "Abonnement afgewezen"
 
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
+#: ../actions/showstream.php:212 ../actions/showstream.php:288
 #: ../actions/subscriptions.php:27
 msgid "Subscriptions"
 msgstr "Abonnementen"
@@ -1723,14 +1183,6 @@ msgstr "Abonnementen"
 msgid "System error uploading file."
 msgstr "Systeemfout bij uploaden bestand."
 
-#: ../actions/tag.php:41 ../lib/util.php:301
-msgid "Tags"
-msgstr ""
-
-#: ../lib/searchaction.php:104
-msgid "Text"
-msgstr ""
-
 #: ../actions/noticesearch.php:34
 msgid "Text search"
 msgstr "Tekst doorzoeken"
@@ -1747,77 +1199,36 @@ msgstr "Dat adres is al bevestigd."
 msgid "That confirmation code is not for you!"
 msgstr "Die bevestigingscode is niet voor jou!"
 
-#: ../actions/emailsettings.php:191
-#, fuzzy
-msgid "That email address already belongs to another user."
-msgstr "Jabber-ID al in gebruik bij een andere gebruiker"
-
 #: ../actions/avatar.php:80
 msgid "That file is too big."
 msgstr "Dat bestand is te groot."
 
-#: ../actions/imsettings.php:170
+#: ../actions/imsettings.php:161
 msgid "That is already your Jabber ID."
 msgstr "Dat is al je Jabber-ID."
 
-#: ../actions/emailsettings.php:188
-#, fuzzy
-msgid "That is already your email address."
-msgstr "Dat is al je Jabber-ID."
-
-#: ../actions/smssettings.php:188
-#, fuzzy
-msgid "That is already your phone number."
-msgstr "Dat is al je Jabber-ID."
-
-#: ../actions/imsettings.php:233
+#: ../actions/imsettings.php:224
 msgid "That is not your Jabber ID."
 msgstr "Dat is niet je Jabber-ID."
 
-#: ../actions/emailsettings.php:249
-#, fuzzy
-msgid "That is not your email address."
-msgstr "Dat is het verkeerde IM-adres."
-
-#: ../actions/smssettings.php:257
-#, fuzzy
-msgid "That is not your phone number."
-msgstr "Dat is niet je Jabber-ID."
-
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
+#: ../actions/imsettings.php:201
 msgid "That is the wrong IM address."
 msgstr "Dat is het verkeerde IM-adres."
 
-#: ../actions/smssettings.php:233
-#, fuzzy
-msgid "That is the wrong confirmation number."
-msgstr "Dat is het verkeerde IM-adres."
-
-#: ../actions/smssettings.php:191
-#, fuzzy
-msgid "That phone number already belongs to another user."
-msgstr "Jabber-ID al in gebruik bij een andere gebruiker"
-
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: ../actions/newnotice.php:52
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "Dat is te lang. Maximale berichtlengte is 140 tekens."
 
-#: ../actions/twitapiaccount.php:74
-#, fuzzy
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "Dat is te lang. Maximale berichtlengte is 140 tekens."
-
-#: ../actions/confirmaddress.php:92
+#: ../actions/confirmaddress.php:86
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Het adres \"%s\" is voor je account bevestigd."
 
-#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274
+#: ../actions/imsettings.php:241
 msgid "The address was removed."
 msgstr "Het adres was verwijderd."
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:311
 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 "
@@ -1827,7 +1238,7 @@ msgstr ""
 "Loop de instructies van de site na voor details over hoe het abonnement te "
 "autoriseren. Je abonnement-token is:"
 
-#: ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:321
 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 "
@@ -1855,12 +1266,7 @@ msgstr "Dit zijn de mensen van wie %s de berichten volgt."
 msgid "These are the people whose notices you listen to."
 msgstr "Dit zijn de mensen van wie jij de berichten volgt."
 
-#: ../actions/invite.php:89
-msgid ""
-"These people are already users and you were automatically subscribed to them:"
-msgstr ""
-
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:87
 msgid "This confirmation code is too old. Please start again."
 msgstr "Deze bevestigingscode is te oud. Begin alsjeblieft opnieuw."
 
@@ -1883,44 +1289,24 @@ msgstr ""
 "koppelen aan een lokaal account. Je kunt ofwel een nieuw account aanmaken, "
 "ofwel koppelen aan je bestaande account, als je er al een hebt."
 
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-msgid "This method requires a POST or DELETE."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381
-msgid "This method requires a POST."
-msgstr ""
-
-#: ../lib/util.php:164
+#: ../lib/util.php:147
 msgid "This page is not available in a media type you accept"
 msgstr "Deze pagina is niet beschikbaar in een mediatype dat jij accepteert"
 
-#: ../actions/profilesettings.php:63
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107
-msgid "Timezone not selected."
-msgstr ""
-
 #: ../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."
+"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 ""
 "Om je te abonneren kun je [inloggen](%%action.login%%), of een nieuw account "
 "[registreren](%%action.register%%). Als je al een account op een "
 "[compatibele microblogging-site](%%doc.openmublog%%) hebt, voer dan "
 "hieronder je profiel-URL in."
 
-#: ../actions/twitapifriendships.php:163
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
-
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: ../actions/profilesettings.php:51
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL van je homepage, blog, of profiel op een andere site"
 
@@ -1928,24 +1314,19 @@ msgstr "URL van je homepage, blog, of profiel op een andere site"
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL van je profiel op een andere, compatibele microbloggingdienst"
 
-#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
-#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
 msgid "Unexpected form submission."
 msgstr "Formulier onverwacht ingezonden."
 
-#: ../actions/recoverpassword.php:276
+#: ../actions/recoverpassword.php:237
 msgid "Unexpected password reset."
 msgstr "Wachtwoord onverwacht teruggesteld."
 
-#: ../index.php:57
-msgid "Unknown action"
-msgstr ""
-
 #: ../actions/finishremotesubscribe.php:58
 msgid "Unknown version of OMB protocol."
 msgstr "Onbekende versie van het OMB-protocol."
 
-#: ../lib/util.php:269
+#: ../lib/util.php:245
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
@@ -1953,16 +1334,16 @@ msgstr ""
 "Tenzij anders gespecificeerd valt de inhoud van deze site onder het "
 "copyright van de auteurs en is beschikbaar onder de"
 
-#: ../actions/confirmaddress.php:48
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr ""
 
-#: ../actions/showstream.php:209
+#: ../actions/showstream.php:193
 msgid "Unsubscribe"
 msgstr "Abonnement opheffen"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
 msgid "Unsupported OMB version"
 msgstr "Niet ondersteunde OMB-versie"
 
@@ -1970,24 +1351,6 @@ msgstr "Niet ondersteunde OMB-versie"
 msgid "Unsupported image file format."
 msgstr "Niet ondersteund beeldbestandsformaat."
 
-#: ../lib/settingsaction.php:100
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:241
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:341
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
 #: ../actions/avatar.php:68
 msgid "Upload"
 msgstr "Uploaden"
@@ -2004,17 +1367,7 @@ msgstr ""
 "vierkant is. Het moet ook onder site licentie vallen. Gebruik een afbeelding "
 "die je eigendom is en die je wilt delen."
 
-#: ../lib/settingsaction.php:91
-#, fuzzy
-msgid "Upload a new profile image"
-msgstr "Kon de nieuwe profielinformatie niet opslaan"
-
-#: ../actions/invite.php:114
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
-msgstr ""
-
-#: ../actions/register.php:159 ../actions/register.php:162
+#: ../actions/profilesettings.php:48 ../actions/register.php:182
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Alleen gebruikt voor updates, aankondigingen en wachtwoordherstel"
 
@@ -2023,10 +1376,8 @@ msgid "User being listened to doesn't exist."
 msgstr "Gebruiker waarnaar geluisterd wordt betaat niet."
 
 #: ../actions/all.php:41 ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:47 ../actions/replies.php:41
-#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
-#: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
-#: ../actions/twitapiusers.php:82
+#: ../actions/foaf.php:43 ../actions/replies.php:41
+#: ../actions/showstream.php:44
 msgid "User has no profile."
 msgstr "Gebruiker heeft geen profiel."
 
@@ -2034,73 +1385,41 @@ msgstr "Gebruiker heeft geen profiel."
 msgid "User nickname"
 msgstr "Gebruikersnaam"
 
-#: ../actions/twitapiusers.php:75
-#, fuzzy
-msgid "User not found."
-msgstr "Opgeslagen OpenID niet gevonden."
-
-#: ../actions/profilesettings.php:63
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../lib/util.php:1159
+#: ../lib/util.php:969
 #, php-format
 msgid "What's up, %s?"
 msgstr "Hoe staat het ermee, %s?"
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: ../actions/profilesettings.php:57
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Waar je bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\""
 
-#: ../actions/updateprofile.php:128
+#: ../actions/updateprofile.php:127
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Foutief beeldbestandstype voor '%s'"
 
-#: ../actions/updateprofile.php:123
+#: ../actions/updateprofile.php:122
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Verkeerde afmeting van afbeelding bij '%s'"
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-msgid "Yes"
-msgstr ""
-
 #: ../actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr "Je hebt die OpenID al!"
 
-#: ../actions/deletenotice.php:37
-msgid ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
-msgstr ""
-
 #: ../actions/recoverpassword.php:31
 msgid "You are already logged in!"
 msgstr "Je bent al aangemeld!"
 
-#: ../actions/invite.php:81
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr ""
-
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
 msgstr "Hier kun je je wachtwoord wijzigen. Kies een goede!"
 
-#: ../actions/register.php:135
+#: ../actions/register.php:164
 msgid "You can create a new account to start posting notices."
 msgstr "Je kunt een nieuw account aanmaken om berichten te gaan plaatsen."
 
-#: ../actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
@@ -2109,18 +1428,22 @@ msgstr ""
 "Je kunt een OpenID van je account verwijderen door op de knop \"Verwijder\" "
 "te klikken."
 
-#: ../actions/imsettings.php:28
-#, fuzzy, php-format
+#: ../actions/imsettings.php:28 actions/imsettings.php:28
+#, php-format
+#, fuzzy
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
-"Je kunt berichten verzenden en ontvangen via Jabber/GTalk [instant messages]"
-"(%%doc.im%%). Configureer je adres en instellingen hieronder."
+"#-#-#-#-#  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"
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about you."
+"You can update your personal profile info here so people know more about "
+"you."
 msgstr ""
 "Je kunt hier je persoonlijke profielinformatie bijwerken zodat mensen meer "
 "over je weten."
@@ -2129,43 +1452,15 @@ msgstr ""
 msgid "You can use the local subscription!"
 msgstr "Je kunt het lokale abonnement gebruiken!"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
 msgid "You can't register if you don't agree to the license."
 msgstr "Je kunt niet registreren als je niet met de licentie akkoord gaat."
 
-#: ../actions/updateprofile.php:63
+#: ../actions/updateprofile.php:62
 msgid "You did not send us that profile"
 msgstr "Je hebt dat profiel niet ingezonden"
 
-#: ../lib/mail.php:147
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
-"Send email to %2$s to post new messages.\n"
-"\n"
-"More email instructions at %3$s.\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:612
-msgid "You may not delete another user's status."
-msgstr ""
-
-#: ../actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr ""
-
-#: ../actions/invite.php:103
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
-
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:134
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Je bent geïdentificeerd. Vul hieronder een nieuw wachtwoord in."
 
@@ -2173,7 +1468,7 @@ msgstr "Je bent geïdentificeerd. Vul hieronder een nieuw wachtwoord in."
 msgid "Your OpenID URL"
 msgstr "Je OpenID-URL"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:149
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Je gebruikersnaam op deze server, of je geregistreerde e-mailadres."
 
@@ -2184,63 +1479,60 @@ msgid ""
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
 "Met [OpenID](%%doc.openid%%) kun je op vele sites inloggen met hetzelfde "
-"gebruikersaccount. Hier kun je de aan je account gekoppelde OpenID's beheren."
+"gebruikersaccount. Hier kun je de aan je account gekoppelde OpenID's "
+"beheren."
 
-#: ../lib/util.php:943
+#: ../lib/util.php:814
 msgid "a few seconds ago"
 msgstr "een paar seconden geleden"
 
-#: ../lib/util.php:955
+#: ../lib/util.php:826
 #, php-format
 msgid "about %d days ago"
 msgstr "ongeveer %d dagen geleden"
 
-#: ../lib/util.php:951
+#: ../lib/util.php:822
 #, php-format
 msgid "about %d hours ago"
 msgstr "ongeveer %d uur geleden"
 
-#: ../lib/util.php:947
+#: ../lib/util.php:818
 #, php-format
 msgid "about %d minutes ago"
 msgstr "ongeveer %d minuten geleden"
 
-#: ../lib/util.php:959
+#: ../lib/util.php:830
 #, php-format
 msgid "about %d months ago"
 msgstr "ongeveer %d maanden geleden"
 
-#: ../lib/util.php:953
+#: ../lib/util.php:824
 msgid "about a day ago"
 msgstr "ongeveer een dag geleden"
 
-#: ../lib/util.php:945
+#: ../lib/util.php:816
 msgid "about a minute ago"
 msgstr "ongeveer een minuut geleden"
 
-#: ../lib/util.php:957
+#: ../lib/util.php:828
 msgid "about a month ago"
 msgstr "ongeveer een maand geleden"
 
-#: ../lib/util.php:961
+#: ../lib/util.php:832
 msgid "about a year ago"
 msgstr "ongeveer een jaar geleden"
 
-#: ../lib/util.php:949
+#: ../lib/util.php:820
 msgid "about an hour ago"
 msgstr "ongeveer een uur geleden"
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-msgid "delete"
-msgstr ""
-
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117
+#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
+#: ../lib/stream.php:101
 msgid "in reply to..."
 msgstr "in antwoord op..."
 
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124
+#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
+#: ../lib/stream.php:108
 msgid "reply"
 msgstr "antwoord"
 
@@ -2248,23 +1540,1311 @@ msgstr "antwoord"
 msgid "same as password above"
 msgstr "gelijk aan wachtwoord hierboven"
 
-#: ../actions/twitapistatuses.php:755
-#, fuzzy
-msgid "unsupported file type"
-msgstr "Niet ondersteund beeldbestandsformaat."
-
-#: ../lib/util.php:1309
+#: ../lib/util.php:1127
 msgid "« After"
 msgstr "« Later"
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "Kon e-mail niet bevestigen."
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+msgid " from "
+msgstr ""
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
+
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#, php-format
+msgid "%s public timeline"
+msgstr ""
+
+#: ../lib/mail.php:206 lib/mail.php:212
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/register.php:154 actions/register.php:168
+msgid "6 or more characters. Required."
+msgstr ""
 
-#~ msgid "Couldn't create subscription."
-#~ msgstr "Kon abonnement niet aanmaken."
+#: ../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 ""
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Fout bij toevoegen bericht"
+#: ../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 ""
 
-#~ msgid "Public"
-#~ msgstr "Openbaar"
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55
+msgid "API method not found!"
+msgstr ""
+
+#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
+#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
+#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
+#: ../actions/twitapidirect_messages.php:49
+#: ../actions/twitapidirect_messages.php:56
+#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
+#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
+#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
+#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
+#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
+#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
+#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
+#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
+#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
+#: actions/twitapistatuses.php:690
+msgid "API method under construction."
+msgstr ""
+
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
+
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for "
+"non-humans)"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
+
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr ""
+
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+msgid "Change email handling"
+msgstr ""
+
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+msgid "Change your profile settings"
+msgstr ""
+
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+msgid "Could not follow user: User not found."
+msgstr ""
+
+#: ../lib/subs.php:54 lib/subs.php:61
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: ../lib/subs.php:46 lib/subs.php:46
+msgid "Could not subscribe."
+msgstr ""
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+msgid "Couldn't update user record."
+msgstr ""
+
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr ""
+
+#: ../classes/Notice.php:72 classes/Notice.php:86
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr ""
+
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr ""
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr ""
+
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: ../actions/tag.php:55 actions/tag.php:55
+#, php-format
+msgid "Feed for tag %s"
+msgstr ""
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr ""
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr ""
+
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+msgid "I want to post notices by email."
+msgstr ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+msgid "IM"
+msgstr ""
+
+#: ../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
+msgid "Incoming email"
+msgstr ""
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+msgid "Incoming email address removed."
+msgstr ""
+
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Language"
+msgstr ""
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+msgid "Language is too long (max 50 chars)."
+msgstr ""
+
+#: ../actions/register.php:166 actions/register.php:180
+msgid "Longer name, preferably your \"real\" name"
+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 ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr ""
+
+#: ../lib/mail.php:144 lib/mail.php:144
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+msgid "New incoming email address added."
+msgstr ""
+
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+msgid "No"
+msgstr ""
+
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr ""
+
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+msgid "No email address."
+msgstr ""
+
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+msgid "No incoming email address."
+msgstr ""
+
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+msgid "No status with that ID found."
+msgstr ""
+
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+msgid "Not a registered user."
+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
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+msgid "Not found"
+msgstr ""
+
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr ""
+
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
+
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr ""
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr ""
+
+#: ../actions/invite.php:133 actions/invite.php:141
+msgid "Personal message"
+msgstr ""
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Preferred language"
+msgstr ""
+
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/register.php:28 actions/register.php:28
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+msgid "Registration successful"
+msgstr ""
+
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/register.php:156 actions/register.php:170
+msgid "Same as password above. Required."
+msgstr ""
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr ""
+
+#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
+#: actions/emailsettings.php:74 actions/smssettings.php:82
+msgid "Send email to this address to post new notices."
+msgstr ""
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../actions/tag.php:60 actions/tag.php:60
+msgid "Showing most popular tags from the last week"
+msgstr ""
+
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317
+msgid "Tags"
+msgstr ""
+
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
+msgid "Text"
+msgstr ""
+
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+msgid "That is not your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+msgid "That is not your phone number."
+msgstr ""
+
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/invite.php:89 actions/invite.php:96
+msgid ""
+"These people are already users and you were automatically subscribed to "
+"them:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511
+msgid "This method requires a POST or 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
+msgid "This method requires a POST."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+msgid "Timezone not selected."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+msgid "Two user ids or screen_names must be supplied."
+msgstr ""
+
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this "
+"service."
+msgstr ""
+
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+msgid "Yes"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+msgid "You are not friends with the specified user."
+msgstr ""
+
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr ""
+
+#: ../actions/invite.php:103 actions/invite.php:110
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
+msgstr ""
+
+#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99
+msgid "delete"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+msgid "unsupported file type"
+msgstr ""
+
+#: actions/deletenotice.php:74 actions/disfavor.php:43
+#: actions/emailsettings.php:127 actions/favor.php:45
+#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
+#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
+#: actions/openidsettings.php:123 actions/profilesettings.php:47
+#: actions/recoverpassword.php:282 actions/register.php:42
+#: actions/remotesubscribe.php:40 actions/smssettings.php:124
+#: actions/subscribe.php:44 actions/twittersettings.php:97
+#: actions/unsubscribe.php:41 actions/userauthorization.php:35
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/disfavor.php:55
+msgid "This notice is not a favorite!"
+msgstr ""
+
+#: actions/disfavor.php:63
+msgid "Could not delete favorite."
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Favor"
+msgstr ""
+
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+
+#: actions/emailsettings.php:95
+msgid "Send me email when someone sends me a private message."
+msgstr ""
+
+#: actions/favor.php:53 actions/twitapifavorites.php:142
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132
+msgid "Could not create favorite."
+msgstr ""
+
+#: actions/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#, php-format
+msgid "%s favorite notices"
+msgstr ""
+
+#: actions/favoritesrss.php:64
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr ""
+
+#: actions/inbox.php:28
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+
+#: actions/invite.php:178
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+msgstr ""
+
+#: actions/login.php:104
+msgid "Automatically login in the future; "
+msgstr ""
+
+#: actions/login.php:122
+msgid "For security reasons, please re-enter your "
+msgstr ""
+
+#: actions/login.php:126
+msgid "Login with your username and password. "
+msgstr ""
+
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+msgid "That's too long. Max message size is 140 chars."
+msgstr ""
+
+#: actions/newmessage.php:65
+msgid "No recipient specified."
+msgstr ""
+
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206
+msgid "You can't send a message to this user."
+msgstr ""
+
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly "
+"instead."
+msgstr ""
+
+#: actions/newmessage.php:108
+msgid "No such user"
+msgstr ""
+
+#: actions/newmessage.php:117
+msgid "New message"
+msgstr ""
+
+#: actions/noticesearch.php:95
+msgid "Notice without matching profile"
+msgstr ""
+
+#: actions/openidsettings.php:28
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr ""
+
+#: actions/openidsettings.php:46
+msgid "If you want to add an OpenID to your account, "
+msgstr ""
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr ""
+
+#: actions/openidsettings.php:87
+msgid "You can remove an OpenID from your account "
+msgstr ""
+
+#: actions/outbox.php:28
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr ""
+
+#: actions/outbox.php:30
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#: actions/outbox.php:53
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+
+#: actions/peoplesearch.php:28
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+msgstr ""
+
+#: actions/profilesettings.php:27
+msgid "You can update your personal profile info here "
+msgstr ""
+
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+msgid "User without matching profile"
+msgstr ""
+
+#: actions/recoverpassword.php:91
+msgid "This confirmation code is too old. "
+msgstr ""
+
+#: actions/recoverpassword.php:141
+msgid "If you've forgotten or lost your"
+msgstr ""
+
+#: actions/recoverpassword.php:154
+msgid "You've been identified. Enter a "
+msgstr ""
+
+#: actions/recoverpassword.php:169
+msgid "Your nickname on this server, "
+msgstr ""
+
+#: actions/recoverpassword.php:271
+msgid "Instructions for recovering your password "
+msgstr ""
+
+#: actions/recoverpassword.php:327
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95
+msgid "Password must be 6 or more characters."
+msgstr ""
+
+#: actions/register.php:216
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
+msgstr ""
+
+#: actions/register.php:227
+msgid "(You should receive a message by email momentarily, with "
+msgstr ""
+
+#: actions/remotesubscribe.php:51
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
+msgstr ""
+
+#: actions/showfavorites.php:61
+#, php-format
+msgid "Feed for favorites of %s"
+msgstr ""
+
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+msgid "Could not retrieve favorite notices."
+msgstr ""
+
+#: actions/showmessage.php:33
+msgid "No such message."
+msgstr ""
+
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
+msgstr ""
+
+#: actions/showmessage.php:61
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr ""
+
+#: actions/showmessage.php:66
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr ""
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr ""
+
+#: actions/smssettings.php:312
+#, php-format
+msgid "Mobile carrier for your phone. "
+msgstr ""
+
+#: actions/twitapidirect_messages.php:76
+#, php-format
+msgid "Direct messages to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:77
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:81
+msgid "Direct Messages You've Sent"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:82
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:128
+msgid "No message text!"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:138
+msgid "Recipient user not found."
+msgstr ""
+
+#: actions/twitapidirect_messages.php:141
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
+#: actions/twitapifavorites.php:92
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr ""
+
+#: actions/twitapifavorites.php:95
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr ""
+
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#, php-format
+msgid "%s added your notice as a favorite"
+msgstr ""
+
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+msgstr ""
+
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+msgstr ""
+
+#: actions/twittersettings.php:41
+msgid "Twitter settings"
+msgstr ""
+
+#: actions/twittersettings.php:48
+msgid "Twitter Account"
+msgstr ""
+
+#: actions/twittersettings.php:56
+msgid "Current verified Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr ""
+
+#: actions/twittersettings.php:65
+msgid "No spaces, please."
+msgstr ""
+
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr ""
+
+#: actions/twittersettings.php:72
+msgid "Automatically send my notices to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:75
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:78
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+
+#: actions/twittersettings.php:128
+msgid "Could not verify your Twitter credentials!"
+msgstr ""
+
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+msgid "Unable to save your Twitter settings!"
+msgstr ""
+
+#: actions/twittersettings.php:174
+msgid "Twitter settings saved."
+msgstr ""
+
+#: actions/twittersettings.php:192
+msgid "That is not your Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+msgid "Couldn't remove Twitter user."
+msgstr ""
+
+#: actions/twittersettings.php:212
+msgid "Twitter account removed."
+msgstr ""
+
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+msgid "Couldn't save Twitter preferences."
+msgstr ""
+
+#: actions/twittersettings.php:245
+msgid "Twitter preferences saved."
+msgstr ""
+
+#: actions/userauthorization.php:84
+msgid "Please check these details to make sure "
+msgstr ""
+
+#: actions/userauthorization.php:324
+msgid "The subscription has been authorized, but no "
+msgstr ""
+
+#: actions/userauthorization.php:334
+msgid "The subscription has been rejected, but no "
+msgstr ""
+
+#: classes/Channel.php:113
+msgid "Command results"
+msgstr ""
+
+#: classes/Channel.php:148
+msgid "Command complete"
+msgstr ""
+
+#: classes/Channel.php:158
+msgid "Command failed"
+msgstr ""
+
+#: classes/Command.php:39
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: classes/Command.php:96
+#, php-format
+msgid "Subscriptions: %1$s\n"
+msgstr ""
+
+#: classes/Command.php:125 classes/Command.php:242
+msgid "User has no last notice"
+msgstr ""
+
+#: classes/Command.php:146
+msgid "Notice marked as fave."
+msgstr ""
+
+#: classes/Command.php:166
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr ""
+
+#: classes/Command.php:169
+#, php-format
+msgid "Fullname: %s"
+msgstr ""
+
+#: classes/Command.php:172
+#, php-format
+msgid "Location: %s"
+msgstr ""
+
+#: classes/Command.php:175
+#, php-format
+msgid "Homepage: %s"
+msgstr ""
+
+#: classes/Command.php:178
+#, php-format
+msgid "About: %s"
+msgstr ""
+
+#: classes/Command.php:200
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
+
+#: classes/Command.php:214
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
+
+#: classes/Command.php:216
+msgid "Error sending direct message."
+msgstr ""
+
+#: classes/Command.php:263
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: classes/Command.php:270
+#, php-format
+msgid "Subscribed to %s"
+msgstr ""
+
+#: classes/Command.php:288
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
+
+#: classes/Command.php:295
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr ""
+
+#: classes/Command.php:310 classes/Command.php:330
+msgid "Command not yet implemented."
+msgstr ""
+
+#: classes/Command.php:313
+msgid "Notification off."
+msgstr ""
+
+#: classes/Command.php:315
+msgid "Can't turn off notification."
+msgstr ""
+
+#: classes/Command.php:333
+msgid "Notification on."
+msgstr ""
+
+#: classes/Command.php:335
+msgid "Can't turn on notification."
+msgstr ""
+
+#: classes/Command.php:344
+msgid "Commands:\n"
+msgstr ""
+
+#: classes/Message.php:53
+msgid "Could not insert message."
+msgstr ""
+
+#: classes/Message.php:63
+msgid "Could not update message with new URI."
+msgstr ""
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr ""
+
+#: lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:249
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:253
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+msgstr ""
+
+#: lib/mailbox.php:43
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/openid.php:195
+msgid "This form should automatically submit itself. "
+msgstr ""
+
+#: lib/personal.php:65
+msgid "Favorites"
+msgstr ""
+
+#: lib/personal.php:66
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
+#: lib/personal.php:66
+msgid "User"
+msgstr ""
+
+#: lib/personal.php:75
+msgid "Inbox"
+msgstr ""
+
+#: lib/personal.php:76
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personal.php:80
+msgid "Outbox"
+msgstr ""
+
+#: lib/personal.php:81
+msgid "Your sent messages"
+msgstr ""
+
+#: lib/settingsaction.php:99
+msgid "Twitter"
+msgstr ""
+
+#: lib/settingsaction.php:100
+msgid "Twitter integration options"
+msgstr ""
+
+#: lib/util.php:1718
+msgid "To"
+msgstr ""
+
+#: scripts/maildaemon.php:45
+msgid "Could not parse message."
+msgstr ""
diff --git a/locale/no_NB/LC_MESSAGES/laconica.mo b/locale/no_NB/LC_MESSAGES/laconica.mo
index 2c6d505b3..f7886ee2a 100644
--- a/locale/no_NB/LC_MESSAGES/laconica.mo
+++ b/locale/no_NB/LC_MESSAGES/laconica.mo
diff --git a/locale/no_NB/LC_MESSAGES/laconica.po b/locale/no_NB/LC_MESSAGES/laconica.po
index d55be3a0e..8bdc44b68 100644
--- a/locale/no_NB/LC_MESSAGES/laconica.po
+++ b/locale/no_NB/LC_MESSAGES/laconica.po
@@ -1,8 +1,16 @@
+# #-#-#-#-#  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.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  laconica.po  #-#-#-#-#\n"
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-27 14:57-0400\n"
+"POT-Creation-Date: 2008-07-29 20:02+1200\n"
 "PO-Revision-Date: 2008-08-01 17:38+0100\n"
 "Last-Translator: forteller <forteller@gmail.com>\n"
 "Language-Team: \n"
@@ -11,68 +19,51 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Norwegian Bokmal\n"
 "X-Poedit-Country: NORWAY\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
-msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr ""
+#: ../actions/tag.php:139
+msgid " by "
+msgstr "av"
 
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-msgid " from "
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:255
+#: ../actions/register.php:191 actions/finishopenidlogin.php:88
+#: actions/register.php:205
+msgid ""
+" except this private data: password, email address, IM address, phone "
+"number."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:478
+#: ../actions/twitapistatuses.php:469 ../actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:412
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr ""
 
-#: ../actions/invite.php:168
+#: ../actions/tag.php:127
 #, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
+msgid "%1$s Notices recently tagged with %2$s"
 msgstr ""
 
-#: ../lib/mail.php:124
+#: ../lib/mail.php:120 ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr ""
 
-#: ../lib/mail.php:126
+#: ../lib/mail.php:122 ../lib/mail.php:126
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -83,79 +74,79 @@ msgid ""
 "%4$s.\n"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:482
+#: ../actions/twitapistatuses.php:473 ../actions/twitapistatuses.php:482
+#: actions/twitapistatuses.php:415
 #, 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:45
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr ""
 
-#: ../actions/invite.php:84 ../actions/invite.php:92
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:60 ../actions/publicrss.php:62
+#: actions/publicrss.php:48
 #, php-format
 msgid "%s Public Stream"
 msgstr ""
 
 #: ../actions/all.php:47 ../actions/allrss.php:60
-#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51
+#: ../actions/twitapistatuses.php:235 ../lib/stream.php:51
 #, php-format
 msgid "%s and friends"
 msgstr "%s og venner"
 
-#: ../actions/twitapistatuses.php:49
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
 #, php-format
 msgid "%s public timeline"
 msgstr ""
 
-#: ../lib/mail.php:206
+#: ../lib/mail.php:202 ../lib/mail.php:206 lib/mail.php:212
 #, php-format
 msgid "%s status"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:338
+#: ../actions/twitapistatuses.php:335 ../actions/twitapistatuses.php:338
+#: actions/twitapistatuses.php:265
 #, php-format
 msgid "%s timeline"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:52
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
-#: ../actions/register.php:213
+#: ../actions/register.php:277 ../actions/register.php:213
 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:244 ../lib/util.php:257 lib/util.php:273
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** is a microblogging service brought to you by "
+"[%%site.broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
 
-#: ../lib/util.php:259
+#: ../lib/util.php:246 ../lib/util.php:259 lib/util.php:275
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr ""
 
-#: ../lib/util.php:274
+#: ../lib/util.php:261 ../lib/util.php:274 lib/util.php:290
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 
-#: ../actions/register.php:152
+#: ../actions/register.php:221 ../actions/register.php:152
+#: actions/register.php:166
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 
@@ -163,53 +154,36 @@ msgstr ""
 msgid "6 or more characters"
 msgstr "6 eller flere tegn"
 
-#: ../actions/recoverpassword.php:180
+#: ../actions/recoverpassword.php:165 ../actions/recoverpassword.php:180
+#: actions/recoverpassword.php:186
 msgid "6 or more characters, and don't forget it!"
 msgstr ""
 
-#: ../actions/register.php:154
+#: ../actions/register.php:223 ../actions/register.php:154
+#: actions/register.php:168
 msgid "6 or more characters. Required."
 msgstr ""
 
-#: ../actions/imsettings.php:197
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+"A confirmation code was sent to the IM address you added. You must approve "
+"%s for sending messages to you."
 msgstr ""
 
-#: ../actions/emailsettings.php:213
+#: ../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 ""
 
-#: ../actions/smssettings.php:216
+#: ../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 ""
 
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122
-msgid "API method not found!"
-msgstr ""
-
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-msgid "API method under construction."
-msgstr ""
-
-#: ../lib/util.php:324
+#: ../lib/util.php:310
 msgid "About"
 msgstr "Om"
 
@@ -226,30 +200,21 @@ msgstr "Legg til"
 msgid "Add OpenID"
 msgstr "Legg til OpenID"
 
-#: ../lib/settingsaction.php:97
-#, fuzzy
-msgid "Add or remove OpenIDs"
-msgstr "Fjern OpenID"
-
 #: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
 #: ../actions/smssettings.php:39
 msgid "Address"
 msgstr "Adresse"
 
-#: ../actions/invite.php:131
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
 #: ../actions/showstream.php:273
 msgid "All subscriptions"
 msgstr "Alle abonnementer"
 
-#: ../actions/publicrss.php:64
+#: ../actions/publicrss.php:62
 #, php-format
 msgid "All updates for %s"
 msgstr "Alle oppdateringer for %s"
 
-#: ../actions/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr ""
@@ -259,11 +224,11 @@ msgstr ""
 msgid "Already logged in."
 msgstr "Allerede logget inn."
 
-#: ../lib/subs.php:42
+#: ../actions/subscribe.php:49 ../lib/subs.php:42 lib/subs.php:42
 msgid "Already subscribed!."
 msgstr ""
 
-#: ../actions/deletenotice.php:54
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
 msgid "Are you sure you want to delete this notice?"
 msgstr ""
 
@@ -271,17 +236,19 @@ msgstr ""
 msgid "Authorize subscription"
 msgstr "Autoriser abonnementet"
 
-#: ../actions/login.php:104 ../actions/register.php:178
+#: ../actions/login.php:104 ../actions/register.php:242
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
-"Logg inn automatisk i framtiden. Ikke for datamaskiner du deler med andre!"
+"Logg inn automatisk i framtiden. Ikke for datamaskiner du deler med "
+"andre!"
 
 #: ../actions/profilesettings.php:65
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for "
+"non-humans)"
 msgstr "Abonner "
 
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: ../actions/avatar.php:32
 msgid "Avatar"
 msgstr "Avatar"
 
@@ -289,14 +256,14 @@ msgstr "Avatar"
 msgid "Avatar updated."
 msgstr "Avataren har blitt oppdatert."
 
-#: ../actions/imsettings.php:55
+#: ../actions/imsettings.php:55 actions/imsettings.php:56
 #, 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 ""
 
-#: ../actions/emailsettings.php:54
+#: ../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."
@@ -306,29 +273,29 @@ msgstr ""
 msgid "Awaiting confirmation on this phone number."
 msgstr "Venter på bekreftelse på dette telefonnummeret"
 
-#: ../lib/util.php:1318
+#: ../lib/util.php:1290
 msgid "Before »"
 msgstr "Tidligere »"
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: ../actions/profilesettings.php:49 ../actions/register.php:234
 msgid "Bio"
 msgstr "Bio"
 
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
+#: ../actions/profilesettings.php:101 ../actions/register.php:78
 #: ../actions/updateprofile.php:103
 msgid "Bio is too long (max 140 chars)."
 msgstr "Bioen er for lang (max 140 tegn)"
 
-#: ../lib/deleteaction.php:41
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
 msgid "Can't delete this notice."
 msgstr ""
 
-#: ../actions/updateprofile.php:119
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr ""
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
+#: ../actions/password.php:85 ../actions/recoverpassword.php:261
 msgid "Can't save new password."
 msgstr "Klarer ikke å lagre det nye passordet"
 
@@ -337,15 +304,15 @@ msgstr "Klarer ikke å lagre det nye passordet"
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../lib/openid.php:121
+#: ../lib/openid.php:121 lib/openid.php:121
 msgid "Cannot instantiate OpenID consumer object."
 msgstr ""
 
-#: ../actions/imsettings.php:163
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
 msgid "Cannot normalize that Jabber ID"
 msgstr ""
 
-#: ../actions/emailsettings.php:181
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
 msgid "Cannot normalize that email address"
 msgstr ""
 
@@ -353,29 +320,16 @@ msgstr ""
 msgid "Change"
 msgstr "Endre"
 
-#: ../lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
 #: ../actions/password.php:32
 msgid "Change password"
 msgstr "Endre passord"
 
-#: ../lib/settingsaction.php:94
-#, fuzzy
-msgid "Change your password"
-msgstr "Endre passord"
-
-#: ../lib/settingsaction.php:85
-msgid "Change your profile settings"
-msgstr ""
-
-#: ../actions/password.php:43 ../actions/recoverpassword.php:181
-#: ../actions/register.php:155 ../actions/smssettings.php:65
+#: ../actions/password.php:43 ../actions/recoverpassword.php:166
+#: ../actions/register.php:224 ../actions/smssettings.php:65
 msgid "Confirm"
 msgstr "Bekreft"
 
-#: ../actions/confirmaddress.php:90
+#: ../actions/confirmaddress.php:86
 msgid "Confirm Address"
 msgstr "Bekreft Adresse"
 
@@ -388,11 +342,11 @@ msgstr "Bekreftelse avbrutt."
 msgid "Confirmation code"
 msgstr "Bekreftelseskode"
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr ""
 
-#: ../actions/register.php:202
+#: ../actions/register.php:266 ../actions/register.php:202
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -415,29 +369,25 @@ msgstr ""
 msgid "Connect"
 msgstr "Koble til"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
 msgid "Connect existing account"
 msgstr ""
 
-#: ../lib/util.php:332
+#: ../lib/util.php:318
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53
+#: ../actions/twitapifriendships.php:48 ../actions/twitapifriendships.php:53
+#: actions/twitapifriendships.php:53
 msgid "Could not follow user: User not found."
 msgstr ""
 
-#: ../lib/openid.php:160
+#: ../lib/openid.php:160 lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr ""
@@ -450,59 +400,58 @@ msgstr "Klarte ikke å lagre avatar-informasjonen"
 msgid "Could not save new profile info"
 msgstr "Klarte ikke å lagre den nye profil-informasjonen"
 
-#: ../lib/subs.php:54
+#: ../actions/subscribe.php:62 ../lib/subs.php:54 lib/subs.php:61
 msgid "Could not subscribe other to you."
 msgstr ""
 
-#: ../lib/subs.php:46
+#: ../actions/subscribe.php:54 ../lib/subs.php:46 lib/subs.php:46
 msgid "Could not subscribe."
 msgstr ""
 
-#: ../actions/recoverpassword.php:102
-#, fuzzy
-msgid "Could not update user with confirmed email address."
-msgstr "Nåværende bekreftede e-postadresse"
-
 #: ../actions/finishremotesubscribe.php:99
+#: actions/finishremotesubscribe.php:101
 msgid "Couldn't convert request tokens to access tokens."
 msgstr ""
 
-#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
+#: ../actions/confirmaddress.php:80 ../actions/emailsettings.php:234
 #: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#: ../actions/confirmaddress.php:84 actions/confirmaddress.php:84
+#: actions/emailsettings.php:252 actions/imsettings.php:226
+#: actions/smssettings.php:249
 msgid "Couldn't delete email confirmation."
 msgstr ""
 
-#: ../lib/subs.php:103
+#: ../actions/unsubscribe.php:57 ../lib/subs.php:103 lib/subs.php:116
 msgid "Couldn't delete subscription."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:93
-#, fuzzy
-msgid "Couldn't find any statuses."
-msgstr "Klarte ikke å oppdatere bruker."
-
-#: ../actions/remotesubscribe.php:127
+#: ../actions/remotesubscribe.php:125 ../actions/remotesubscribe.php:127
+#: actions/remotesubscribe.php:136
 msgid "Couldn't get a request token."
 msgstr ""
 
 #: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206
+#: ../actions/smssettings.php:206 actions/emailsettings.php:223
+#: actions/imsettings.php:195 actions/smssettings.php:214
 msgid "Couldn't insert confirmation code."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182
 msgid "Couldn't insert new subscription."
 msgstr ""
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: ../actions/profilesettings.php:181 ../actions/twitapiaccount.php:92
 msgid "Couldn't save profile."
 msgstr "Klarte ikke å lagre profil."
 
-#: ../actions/profilesettings.php:161
+#: ../actions/profilesettings.php:158 ../actions/profilesettings.php:161
+#: actions/profilesettings.php:276
 msgid "Couldn't update user for autosubscribe."
 msgstr ""
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
 msgid "Couldn't update user record."
 msgstr ""
 
@@ -513,7 +462,7 @@ msgstr ""
 msgid "Couldn't update user."
 msgstr "Klarte ikke å oppdatere bruker."
 
-#: ../actions/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
 msgid "Create"
 msgstr ""
 
@@ -525,7 +474,7 @@ msgstr "Lag en ny bruker med dette nicket."
 msgid "Create new account"
 msgstr "Opprett en ny konto"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
 msgid "Creating new account for OpenID that already has a user."
 msgstr ""
 
@@ -541,30 +490,29 @@ msgstr "Nåværende bekreftede telefonnummer med mulighet for å motta SMS."
 msgid "Current confirmed email address."
 msgstr "Nåværende bekreftede e-postadresse"
 
-#: ../actions/showstream.php:356
+#: ../actions/showstream.php:356 actions/showstream.php:367
 msgid "Currently"
 msgstr ""
 
-#: ../classes/Notice.php:72
+#: ../classes/Notice.php:72 classes/Notice.php:86
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: ../lib/util.php:1061
+#: ../lib/util.php:1033 ../lib/util.php:1061 lib/util.php:1110
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr ""
 
-#: ../actions/deletenotice.php:41
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
 msgid "Delete notice"
 msgstr ""
 
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: ../actions/profilesettings.php:51 ../actions/register.php:236
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Beskriv degselv og dine interesser med 140 tegn"
 
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87
+#: ../actions/register.php:226
 msgid "Email"
 msgstr "E-post"
 
@@ -576,89 +524,101 @@ msgstr "E-postadresse"
 msgid "Email Settings"
 msgstr "Innstillinger for e-post"
 
-#: ../actions/register.php:73
+#: ../actions/register.php:69 ../actions/register.php:73
+#: actions/register.php:80
 msgid "Email address already exists."
 msgstr ""
 
-#: ../lib/mail.php:90
+#: ../lib/mail.php:90 lib/mail.php:90
 msgid "Email address confirmation"
 msgstr ""
 
-#: ../actions/emailsettings.php:61
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 
-#: ../actions/invite.php:129
-#, fuzzy
-msgid "Email addresses"
-msgstr "E-postadresse"
-
-#: ../actions/recoverpassword.php:191
+#: ../actions/recoverpassword.php:176 ../actions/recoverpassword.php:191
+#: actions/recoverpassword.php:197
 msgid "Enter a nickname or email address."
 msgstr ""
 
-#: ../actions/smssettings.php:64
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
 msgid "Enter the code you received on your phone."
 msgstr ""
 
-#: ../actions/userauthorization.php:137
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 msgid "Error authorizing token"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:253
+#: ../actions/finishopenidlogin.php:282 ../actions/finishopenidlogin.php:253
+#: actions/finishopenidlogin.php:259
 msgid "Error connecting user to OpenID."
 msgstr ""
 
-#: ../actions/finishaddopenid.php:78
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
 msgid "Error connecting user."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153
 msgid "Error inserting avatar"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:143
+#: actions/finishremotesubscribe.php:145
 msgid "Error inserting new profile"
 msgstr ""
 
+#: ../actions/postnotice.php:89
+msgid "Error inserting notice"
+msgstr ""
+
 #: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169
 msgid "Error inserting remote profile"
 msgstr ""
 
-#: ../actions/recoverpassword.php:240
+#: ../actions/recoverpassword.php:201 ../actions/recoverpassword.php:240
+#: actions/recoverpassword.php:246
 msgid "Error saving address confirmation."
 msgstr ""
 
-#: ../actions/userauthorization.php:140
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
 msgid "Error saving remote profile"
 msgstr ""
 
-#: ../lib/openid.php:226
+#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
+#: lib/openid.php:226
 msgid "Error saving the profile."
 msgstr ""
 
-#: ../lib/openid.php:237
+#: ../lib/openid.php:237 lib/openid.php:237
 msgid "Error saving the user."
 msgstr ""
 
-#: ../actions/password.php:80
+#: ../actions/password.php:80 actions/profilesettings.php:399
 msgid "Error saving user; invalid."
 msgstr ""
 
 #: ../actions/login.php:47 ../actions/login.php:73
+#: ../actions/recoverpassword.php:268 ../actions/register.php:92
 #: ../actions/recoverpassword.php:307 ../actions/register.php:98
+#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
+#: actions/register.php:108
 msgid "Error setting user."
 msgstr ""
 
-#: ../actions/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
 msgid "Error updating profile"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:161
+#: actions/finishremotesubscribe.php:163
 msgid "Error updating remote profile"
 msgstr ""
 
-#: ../actions/recoverpassword.php:80
+#: ../actions/recoverpassword.php:79 ../actions/recoverpassword.php:80
+#: actions/recoverpassword.php:80
 msgid "Error with confirmation code."
 msgstr ""
 
@@ -666,11 +626,11 @@ msgstr ""
 msgid "Existing nickname"
 msgstr "Eksisterende nick"
 
-#: ../lib/util.php:326
+#: ../lib/util.php:312
 msgid "FAQ"
 msgstr "OSS/FAQ"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
 msgid "Failed updating avatar."
 msgstr ""
 
@@ -689,11 +649,11 @@ msgstr "Feed for svar til %s"
 msgid "Feed for tag %s"
 msgstr "Feed for taggen %s"
 
-#: ../lib/searchaction.php:105
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
 msgid "Find content of notices"
 msgstr ""
 
-#: ../lib/searchaction.php:101
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
 msgid "Find people on this site"
 msgstr ""
 
@@ -703,39 +663,37 @@ msgid ""
 "changing your settings."
 msgstr ""
 
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: ../actions/profilesettings.php:44 ../actions/register.php:228
 msgid "Full name"
 msgstr "Fullt navn"
 
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
+#: ../actions/profilesettings.php:98 ../actions/register.php:75
 #: ../actions/updateprofile.php:93
 msgid "Full name is too long (max 255 chars)."
 msgstr "Beklager, navnet er for langt (max 250 tegn)."
 
-#: ../lib/util.php:322
+#: ../lib/util.php:291
 msgid "Help"
 msgstr "Hjelp"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:285
 msgid "Home"
 msgstr "Hjem"
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: ../actions/profilesettings.php:46 ../actions/register.php:231
 msgid "Homepage"
 msgstr "Hjemmesiden"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: ../actions/profilesettings.php:95 ../actions/register.php:72
+#: ../actions/register.php:76 actions/profilesettings.php:210
+#: actions/register.php:83
 msgid "Homepage is not a valid URL."
 msgstr ""
 
-#: ../actions/emailsettings.php:91
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
 msgid "I want to post notices by email."
 msgstr ""
 
-#: ../lib/settingsaction.php:102
-msgid "IM"
-msgstr ""
-
 #: ../actions/imsettings.php:60
 msgid "IM Address"
 msgstr "IM-adresse"
@@ -744,7 +702,7 @@ msgstr "IM-adresse"
 msgid "IM Settings"
 msgstr "Innstillinger for IM"
 
-#: ../actions/finishopenidlogin.php:88
+#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -756,20 +714,17 @@ msgid ""
 "click \"Add\"."
 msgstr ""
 
-#: ../actions/recoverpassword.php:137
-#, fuzzy
+#: ../actions/recoverpassword.php:122
 msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
+"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 ""
-"Instruksjoner om hvordan du kan gjenopprette ditt passord har blitt sendt "
-"til din registrerte e-postadresse."
 
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 msgid "Incoming email"
 msgstr "innkommende e-post"
 
-#: ../actions/emailsettings.php:283
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
 msgid "Incoming email address removed."
 msgstr ""
 
@@ -781,7 +736,7 @@ msgstr "Feil gammelt passord"
 msgid "Incorrect username or password."
 msgstr "Feil brukernavn eller passord"
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:226
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
@@ -794,30 +749,25 @@ msgstr ""
 msgid "Invalid avatar URL '%s'"
 msgstr "Ugyldig avatar-URL '%s'"
 
-#: ../actions/invite.php:55
-#, fuzzy, php-format
-msgid "Invalid email address: %s"
-msgstr "Ugyldig e-postadresse"
-
 #: ../actions/updateprofile.php:98
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Ugyldig hjemmeside '%s'"
 
-#: ../actions/updateprofile.php:82
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr ""
 
-#: ../actions/postnotice.php:61
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
 msgid "Invalid notice content"
 msgstr ""
 
-#: ../actions/postnotice.php:67
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
 msgid "Invalid notice uri"
 msgstr ""
 
-#: ../actions/postnotice.php:72
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
 msgid "Invalid notice url"
 msgstr ""
 
@@ -826,11 +776,12 @@ msgstr ""
 msgid "Invalid profile URL '%s'."
 msgstr "Ugyldig profil-URL '%s'"
 
-#: ../actions/remotesubscribe.php:96
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
 msgid "Invalid profile URL (bad format)"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79
 msgid "Invalid profile URL returned by server."
 msgstr ""
 
@@ -838,40 +789,24 @@ msgstr ""
 msgid "Invalid size."
 msgstr "Ugyldig størrelse"
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111
+#: ../actions/finishopenidlogin.php:264 ../actions/register.php:87
+#: ../actions/register.php:103
 msgid "Invalid username or password."
 msgstr "Ugyldig brukernavn eller passord"
 
-#: ../actions/invite.php:79
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123
-msgid "Invite new users"
-msgstr ""
-
-#: ../lib/util.php:261
+#: ../lib/util.php:248 ../lib/util.php:261 lib/util.php:277
 #, 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)."
+"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 ""
 
-#: ../actions/imsettings.php:173
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
 msgid "Jabber ID already belongs to another user."
 msgstr ""
 
-#: ../actions/imsettings.php:62
+#: ../actions/imsettings.php:62 actions/imsettings.php:63
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -882,21 +817,29 @@ msgstr ""
 msgid "Language"
 msgstr "Språk"
 
-#: ../actions/profilesettings.php:113
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
 msgid "Language is too long (max 50 chars)."
 msgstr ""
 
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: ../actions/tag.php:133
+msgid "Last message posted: "
+msgstr ""
+
+#: ../actions/profilesettings.php:52 ../actions/register.php:237
+#: ../actions/register.php:173 actions/profilesettings.php:85
+#: actions/register.php:187
 msgid "Location"
 msgstr ""
 
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108
+#: ../actions/profilesettings.php:104 ../actions/register.php:81
+#: ../actions/updateprofile.php:108 ../actions/register.php:85
+#: actions/profilesettings.php:219 actions/register.php:92
+#: actions/updateprofile.php:109
 msgid "Location is too long (max 255 chars)."
 msgstr ""
 
 #: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310
+#: ../actions/openidlogin.php:68 ../lib/util.php:298
 msgid "Login"
 msgstr "Logg inn"
 
@@ -908,16 +851,16 @@ msgstr "Logg inn med en [OpenID](%%doc.openid%%)-konto."
 #: ../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%"
-"%). "
+"Login with your username and password. Don't have a username yet? "
+"[Register](%%action.register%%) a new account, or try "
+"[OpenID](%%action.openidlogin%%). "
 msgstr ""
 
-#: ../lib/util.php:308
+#: ../lib/util.php:296
 msgid "Logout"
 msgstr "Logg ut"
 
-#: ../actions/register.php:166
+#: ../actions/register.php:230
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Lengre navn, helst ditt \"ekte\" navn"
 
@@ -926,10 +869,11 @@ msgid "Lost or forgotten password?"
 msgstr "Mistet eller glemt passordet?"
 
 #: ../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 ""
 
-#: ../actions/emailsettings.php:27
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr ""
@@ -950,7 +894,9 @@ msgid ""
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:252
+#: ../actions/register.php:188 actions/finishopenidlogin.php:85
+#: actions/register.php:202
 msgid "My text and files are available under "
 msgstr ""
 
@@ -958,12 +904,12 @@ msgstr ""
 msgid "New"
 msgstr "Ny"
 
-#: ../lib/mail.php:144
+#: ../lib/mail.php:140 ../lib/mail.php:144 lib/mail.php:144
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
 
-#: ../actions/emailsettings.php:297
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
 msgid "New incoming email address added."
 msgstr ""
 
@@ -971,30 +917,34 @@ msgstr ""
 msgid "New nickname"
 msgstr "Nytt nick"
 
-#: ../actions/newnotice.php:87
+#: ../actions/newnotice.php:102 ../actions/newnotice.php:87
+#: actions/newnotice.php:96
 msgid "New notice"
 msgstr ""
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
+#: ../actions/password.php:41 ../actions/recoverpassword.php:164
 msgid "New password"
 msgstr "Nytt passord"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:275 ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
 #: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151
+#: ../actions/register.php:220
 msgid "Nickname"
 msgstr "Nick"
 
 #: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69
+#: ../actions/register.php:65
 msgid "Nickname already in use. Try another one."
 msgstr "Det nicket er allerede i bruk. Prøv et annet."
 
 #: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:67 ../actions/updateprofile.php:77
+#: ../actions/register.php:63 ../actions/updateprofile.php:77
+#: ../actions/register.php:67 actions/finishopenidlogin.php:171
+#: actions/profilesettings.php:203 actions/register.php:74
+#: actions/updateprofile.php:78
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 
@@ -1002,15 +952,15 @@ msgstr ""
 msgid "Nickname not allowed."
 msgstr "Dette nicket er ikke tillatt"
 
-#: ../actions/remotesubscribe.php:72
+#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
 msgid "Nickname of the user you want to follow"
 msgstr ""
 
-#: ../actions/recoverpassword.php:162
+#: ../actions/recoverpassword.php:147
 msgid "Nickname or email"
 msgstr "Nick eller e-postadresse"
 
-#: ../actions/deletenotice.php:59
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 msgid "No"
 msgstr ""
 
@@ -1018,23 +968,24 @@ msgstr ""
 msgid "No Jabber ID."
 msgstr "Ingen Jabber ID."
 
-#: ../actions/userauthorization.php:129
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
 msgid "No authorization request!"
 msgstr ""
 
-#: ../actions/smssettings.php:181
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
 msgid "No carrier selected."
 msgstr ""
 
-#: ../actions/smssettings.php:316
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
 msgid "No code entered"
 msgstr ""
 
-#: ../actions/confirmaddress.php:33
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 msgid "No confirmation code."
 msgstr ""
 
-#: ../actions/newnotice.php:44
+#: ../actions/newnotice.php:50 ../actions/newnotice.php:44
+#: actions/newmessage.php:53 actions/newnotice.php:44 classes/Command.php:197
 msgid "No content!"
 msgstr ""
 
@@ -1046,107 +997,102 @@ msgstr "Ingen e-postadresse."
 msgid "No id."
 msgstr "Ingen id."
 
-#: ../actions/emailsettings.php:271
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
 msgid "No incoming email address."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:65
+#: actions/finishremotesubscribe.php:67
 msgid "No nickname provided by remote server."
 msgstr ""
 
-#: ../actions/avatarbynickname.php:27
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 msgid "No nickname."
 msgstr ""
 
 #: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229
+#: ../actions/smssettings.php:229 actions/emailsettings.php:240
+#: actions/imsettings.php:214 actions/smssettings.php:237
 msgid "No pending confirmation to cancel."
 msgstr ""
 
-#: ../actions/smssettings.php:176
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
 msgid "No phone number."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:72
+#: actions/finishremotesubscribe.php:74
 msgid "No profile URL returned by server."
 msgstr ""
 
-#: ../actions/recoverpassword.php:226
+#: ../actions/recoverpassword.php:189 ../actions/recoverpassword.php:226
+#: actions/recoverpassword.php:232
 msgid "No registered email address for that user."
 msgstr ""
 
-#: ../actions/userauthorization.php:49
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
 msgid "No request found!"
 msgstr ""
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
+#: actions/noticesearch.php:69 actions/peoplesearch.php:69
 msgid "No results"
 msgstr ""
 
-#: ../actions/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
 msgid "No size."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:595
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555
-msgid "No status with that ID found."
-msgstr ""
-
-#: ../actions/openidsettings.php:135
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 msgid "No such OpenID."
 msgstr ""
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29
 msgid "No such document."
 msgstr ""
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30
+#: ../lib/deleteaction.php:30 actions/shownotice.php:32
+#: actions/shownotice.php:83 lib/deleteaction.php:30
 msgid "No such notice."
 msgstr ""
 
-#: ../actions/recoverpassword.php:56
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
 msgid "No such recovery code."
 msgstr ""
 
-#: ../actions/postnotice.php:56
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
 msgid "No such subscription"
 msgstr ""
 
 #: ../actions/all.php:34 ../actions/allrss.php:35
 #: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
-#: ../actions/remotesubscribe.php:84 ../actions/remotesubscribe.php:91
-#: ../actions/replies.php:57 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:110 ../actions/userbyid.php:36
-#: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
-#: ../lib/subs.php:33 ../lib/subs.php:82
+#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
+#: ../actions/remotesubscribe.php:91 ../actions/replies.php:57
+#: ../actions/repliesrss.php:35 ../actions/showstream.php:110
+#: ../actions/subscribe.php:44 ../actions/unsubscribe.php:39
+#: ../actions/userbyid.php:36 ../actions/userrss.php:35 ../actions/xrds.php:35
+#: ../lib/gallery.php:57 ../lib/subs.php:33 ../lib/subs.php:82
+#: actions/all.php:34 actions/allrss.php:35 actions/avatarbynickname.php:43
+#: actions/favoritesrss.php:35 actions/foaf.php:40 actions/ical.php:31
+#: actions/remotesubscribe.php:93 actions/remotesubscribe.php:100
+#: actions/replies.php:57 actions/repliesrss.php:35
+#: actions/showfavorites.php:34 actions/showstream.php:110
+#: actions/userbyid.php:36 actions/userrss.php:35 actions/xrds.php:35
+#: classes/Command.php:120 classes/Command.php:162 classes/Command.php:203
+#: classes/Command.php:237 lib/gallery.php:62 lib/mailbox.php:36
+#: lib/subs.php:33 lib/subs.php:95
 msgid "No such user."
 msgstr ""
 
-#: ../actions/recoverpassword.php:211
-msgid "No user with that email address or username."
-msgstr ""
-
-#: ../lib/gallery.php:80
+#: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
 msgstr ""
 
-#: ../actions/recoverpassword.php:60
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
 msgid "Not a recovery code."
 msgstr ""
 
-#: ../scripts/maildaemon.php:50
-msgid "Not a registered user."
-msgstr ""
-
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332
-msgid "Not a supported data format."
-msgstr ""
-
 #: ../actions/imsettings.php:167
 msgid "Not a valid Jabber ID"
 msgstr "Ugyldig Jabber ID"
@@ -1159,27 +1105,29 @@ msgstr "Ugyldig OpenID"
 msgid "Not a valid email address"
 msgstr "Ugyldig e-postadresse"
 
-#: ../actions/register.php:63
+#: ../actions/register.php:59
 msgid "Not a valid email address."
 msgstr "Ugyldig e-postadresse."
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
+#: ../actions/profilesettings.php:91 ../actions/register.php:67
 msgid "Not a valid nickname."
 msgstr "Ugyldig nick."
 
-#: ../actions/remotesubscribe.php:120
+#: ../actions/remotesubscribe.php:118 ../actions/remotesubscribe.php:120
+#: actions/remotesubscribe.php:129
 msgid "Not a valid profile URL (incorrect services)."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:113
+#: ../actions/remotesubscribe.php:111 ../actions/remotesubscribe.php:113
+#: actions/remotesubscribe.php:122
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:104
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
 msgid "Not a valid profile URL (no YADIS document)."
 msgstr ""
 
-#: ../actions/avatar.php:95
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
 msgid "Not an image or corrupt file."
 msgstr ""
 
@@ -1188,13 +1136,10 @@ msgid "Not authorized."
 msgstr "Ikke autorisert."
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38
 msgid "Not expecting this response!"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:422
-msgid "Not found"
-msgstr ""
-
 #: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
 #: ../actions/newnotice.php:29 ../actions/subscribe.php:28
 #: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
@@ -1202,28 +1147,29 @@ msgstr ""
 msgid "Not logged in."
 msgstr "Ikke logget inn."
 
-#: ../lib/subs.php:91
+#: ../actions/unsubscribe.php:44 ../lib/subs.php:91 lib/subs.php:104
 msgid "Not subscribed!."
 msgstr ""
 
-#: ../actions/opensearch.php:35
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
 msgid "Notice Search"
 msgstr ""
 
-#: ../actions/showstream.php:82
+#: ../actions/showstream.php:82 actions/showstream.php:82
 #, php-format
 msgid "Notice feed for %s"
 msgstr ""
 
-#: ../actions/shownotice.php:39
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
 msgid "Notice has no profile"
 msgstr ""
 
-#: ../actions/showstream.php:316
+#: ../actions/showstream.php:316 actions/showstream.php:331
 msgid "Notices"
 msgstr ""
 
-#: ../actions/tag.php:35 ../actions/tag.php:81
+#: ../actions/tag.php:35 ../actions/tag.php:81 ../actions/tag.php:124
+#: actions/tag.php:35 actions/tag.php:81
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
@@ -1232,39 +1178,46 @@ msgstr ""
 msgid "Old password"
 msgstr "Gammelt passord"
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314
+#: ../lib/util.php:302
 msgid "OpenID"
 msgstr "OpenID"
 
-#: ../actions/finishopenidlogin.php:61
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
 msgid "OpenID Account Setup"
 msgstr ""
 
-#: ../lib/openid.php:180
+#: ../lib/openid.php:180 lib/openid.php:180
 msgid "OpenID Auto-Submit"
 msgstr ""
 
 #: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60
+#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
+#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 msgid "OpenID Login"
 msgstr ""
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 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
 #, fuzzy
 msgid "OpenID authentication cancelled."
-msgstr "OpenID-autentifisering avbrutt."
+msgstr ""
+"#-#-#-#-#  laconica.po  #-#-#-#-#\n"
+"OpenID-autentifisering avbrutt.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr ""
 
-#: ../lib/openid.php:133
+#: ../lib/openid.php:133 lib/openid.php:133
 #, php-format
 msgid "OpenID failure: %s"
 msgstr ""
@@ -1277,48 +1230,49 @@ msgstr "OpenID fjernet"
 msgid "OpenID settings"
 msgstr "Innstillinger for OpenID"
 
-#: ../actions/invite.php:135
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
-#: ../actions/avatar.php:84
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
 msgid "Partial upload."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
-#: ../actions/register.php:153 ../lib/settingsaction.php:93
+#: ../actions/register.php:222
 msgid "Password"
 msgstr "Passord"
 
-#: ../actions/recoverpassword.php:288
+#: ../actions/recoverpassword.php:249 ../actions/recoverpassword.php:288
+#: actions/recoverpassword.php:301
 msgid "Password and confirmation do not match."
 msgstr ""
 
-#: ../actions/recoverpassword.php:284
+#: ../actions/recoverpassword.php:245
 msgid "Password must be 6 chars or more."
 msgstr "Passordet må bestå av 6 eller flere tegn."
 
+#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 msgid "Password recovery requested"
 msgstr ""
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: ../actions/password.php:89 ../actions/recoverpassword.php:274
 msgid "Password saved."
 msgstr "Passordet ble lagret"
 
-#: ../actions/password.php:61 ../actions/register.php:88
+#: ../actions/password.php:61 ../actions/register.php:84
+#: ../actions/register.php:88 actions/profilesettings.php:380
+#: actions/register.php:98
 msgid "Passwords don't match."
 msgstr ""
 
-#: ../lib/searchaction.php:100
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
 msgid "People"
 msgstr ""
 
-#: ../actions/opensearch.php:33
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
 msgid "People Search"
 msgstr ""
 
-#: ../actions/peoplesearch.php:33
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
 msgid "People search"
 msgstr ""
 
@@ -1326,12 +1280,7 @@ msgstr ""
 msgid "Personal"
 msgstr "Personlig"
 
-#: ../actions/invite.php:133
-#, fuzzy
-msgid "Personal message"
-msgstr "Personlig"
-
-#: ../actions/smssettings.php:69
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
@@ -1342,53 +1291,64 @@ msgid ""
 "click \"Cancel\"."
 msgstr ""
 
-#: ../actions/imsettings.php:73
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
 #: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94
+#: ../actions/smssettings.php:94 actions/emailsettings.php:86
+#: actions/imsettings.php:68 actions/smssettings.php:94
+#: actions/twittersettings.php:70
 msgid "Preferences"
 msgstr ""
 
 #: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163
+#: ../actions/smssettings.php:163 actions/emailsettings.php:180
+#: actions/imsettings.php:152 actions/smssettings.php:171
 msgid "Preferences saved."
 msgstr ""
 
-#: ../actions/profilesettings.php:57
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
 msgid "Preferred language"
 msgstr ""
 
-#: ../lib/util.php:328
+#: ../lib/util.php:314 ../lib/util.php:328 lib/util.php:344
 msgid "Privacy"
 msgstr ""
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106
+#: ../actions/newnotice.php:62 ../actions/newnotice.php:70
+#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
+#: classes/Notice.php:119
 msgid "Problem saving notice."
 msgstr ""
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60
+#: ../lib/stream.php:60
 msgid "Profile"
 msgstr "Profil"
 
-#: ../actions/remotesubscribe.php:73
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
 msgid "Profile URL"
 msgstr ""
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
 msgid "Profile settings"
 msgstr ""
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: actions/postnotice.php:52 actions/updateprofile.php:53
 msgid "Profile unknown"
 msgstr ""
 
-#: ../actions/public.php:54
+#: ../lib/util.php:287
+#, fuzzy
+msgid "Public"
+msgstr "Offentlig"
+
+#: ../actions/public.php:54 actions/public.php:54
 msgid "Public Stream Feed"
 msgstr ""
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33
 msgid "Public timeline"
 msgstr ""
 
@@ -1404,43 +1364,47 @@ msgstr "Publiser en MicroID for min e-postadresse."
 msgid "Recent Tags"
 msgstr "Nyeste Tagger"
 
-#: ../actions/recoverpassword.php:166
+#: ../actions/recoverpassword.php:151
 msgid "Recover"
 msgstr "Gjenopprett"
 
-#: ../actions/recoverpassword.php:156
+#: ../actions/recoverpassword.php:141 ../actions/recoverpassword.php:156
+#: actions/recoverpassword.php:161
 msgid "Recover password"
 msgstr ""
 
-#: ../actions/recoverpassword.php:67
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
 msgid "Recovery code for unknown user."
 msgstr ""
 
+#: ../actions/register.php:216 ../actions/register.php:257 ../lib/util.php:300
 #: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: actions/register.php:152 actions/register.php:207 lib/util.php:328
 msgid "Register"
 msgstr ""
 
-#: ../actions/register.php:28
+#: ../actions/register.php:28 actions/register.php:28
 msgid "Registration not allowed."
 msgstr ""
 
-#: ../actions/register.php:200
+#: ../actions/register.php:264 ../actions/register.php:200
+#: actions/register.php:214
 msgid "Registration successful"
 msgstr ""
 
-#: ../actions/userauthorization.php:120
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
 msgid "Reject"
 msgstr ""
 
-#: ../actions/login.php:103 ../actions/register.php:176
+#: ../actions/login.php:103 ../actions/register.php:240
 msgid "Remember me"
 msgstr "Husk meg"
 
-#: ../actions/updateprofile.php:70
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
 msgid "Remote profile with no matching profile"
 msgstr ""
 
-#: ../actions/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
 msgid "Remote subscribe"
 msgstr ""
 
@@ -1469,18 +1433,15 @@ msgstr "Svar"
 msgid "Replies to %s"
 msgstr "Svar til %s"
 
-#: ../actions/recoverpassword.php:183
+#: ../actions/recoverpassword.php:168
 msgid "Reset"
 msgstr "Nullstill"
 
-#: ../actions/recoverpassword.php:173
+#: ../actions/recoverpassword.php:158 ../actions/recoverpassword.php:173
+#: actions/recoverpassword.php:178
 msgid "Reset password"
 msgstr ""
 
-#: ../lib/settingsaction.php:99
-msgid "SMS"
-msgstr ""
-
 #: ../actions/smssettings.php:67
 msgid "SMS Phone number"
 msgstr "Telefonnummer for SMS"
@@ -1489,15 +1450,17 @@ msgstr "Telefonnummer for SMS"
 msgid "SMS Settings"
 msgstr "Innstillinger for SMS"
 
-#: ../lib/mail.php:219
+#: ../lib/mail.php:215 ../lib/mail.php:219 lib/mail.php:225
 msgid "SMS confirmation"
 msgstr ""
 
-#: ../actions/recoverpassword.php:182
+#: ../actions/recoverpassword.php:167 ../actions/recoverpassword.php:182
+#: actions/recoverpassword.php:188
 msgid "Same as password above"
 msgstr ""
 
-#: ../actions/register.php:156
+#: ../actions/register.php:225 ../actions/register.php:156
+#: actions/register.php:170
 msgid "Same as password above. Required."
 msgstr ""
 
@@ -1506,15 +1469,15 @@ msgstr ""
 msgid "Save"
 msgstr "Lagre"
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300
+#: ../lib/searchaction.php:84 ../lib/util.php:288
 msgid "Search"
 msgstr "Søk"
 
-#: ../actions/noticesearch.php:80
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
 msgid "Search Stream Feed"
 msgstr ""
 
-#: ../actions/noticesearch.php:30
+#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -1528,66 +1491,60 @@ msgid ""
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 
-#: ../actions/smssettings.php:296
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
 msgid "Select a carrier"
 msgstr ""
 
-#: ../actions/invite.php:137 ../lib/util.php:1172
+#: ../lib/util.php:1144
 msgid "Send"
 msgstr "Send"
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
+#: actions/emailsettings.php:74 actions/smssettings.php:82
 msgid "Send email to this address to post new notices."
 msgstr ""
 
-#: ../actions/emailsettings.php:88
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
-#: ../actions/imsettings.php:70
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
-#: ../actions/smssettings.php:97
+#: ../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:76 actions/imsettings.php:77
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: ../lib/util.php:304
+#: ../lib/util.php:294 ../lib/util.php:304 lib/util.php:320
 msgid "Settings"
 msgstr ""
 
-#: ../actions/profilesettings.php:192
+#: ../actions/profilesettings.php:189 ../actions/profilesettings.php:192
+#: actions/profilesettings.php:307
 msgid "Settings saved."
 msgstr ""
 
-#: ../actions/tag.php:60
+#: ../actions/tag.php:60 actions/tag.php:60
 msgid "Showing most popular tags from the last week"
 msgstr ""
 
-#: ../actions/finishaddopenid.php:66
+#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
+#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
 msgid "Something weird happened."
 msgstr ""
 
-#: ../scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54
-#, fuzzy
-msgid "Sorry, that is not your incoming email address."
-msgstr "Det er ikke din e-postadresse."
-
-#: ../lib/util.php:330
+#: ../lib/util.php:316
 msgid "Source"
 msgstr "Kilde"
 
@@ -1595,37 +1552,42 @@ msgstr "Kilde"
 msgid "Statistics"
 msgstr "Statistikk"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../actions/finishopenidlogin.php:246 actions/finishopenidlogin.php:188
+#: actions/finishopenidlogin.php:252
 msgid "Stored OpenID not found."
 msgstr ""
 
 #: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197
+#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
+#: actions/showstream.php:197 actions/showstream.php:206
 msgid "Subscribe"
 msgstr ""
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: actions/showstream.php:328 actions/subscribers.php:27
 msgid "Subscribers"
 msgstr ""
 
-#: ../actions/userauthorization.php:310
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
 msgid "Subscription authorized"
 msgstr ""
 
-#: ../actions/userauthorization.php:320
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
 msgid "Subscription rejected"
 msgstr ""
 
 #: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27
+#: ../actions/subscriptions.php:27 actions/showstream.php:240
+#: actions/showstream.php:322 actions/subscriptions.php:27
 msgid "Subscriptions"
 msgstr ""
 
-#: ../actions/avatar.php:87
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
 msgid "System error uploading file."
 msgstr ""
 
-#: ../actions/tag.php:41 ../lib/util.php:301
+#: ../actions/tag.php:41 ../lib/util.php:289
 msgid "Tags"
 msgstr "Tagger"
 
@@ -1637,19 +1599,19 @@ msgstr "Tekst"
 msgid "Text search"
 msgstr "Tekst-søk"
 
-#: ../actions/openidsettings.php:140
+#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
 msgid "That OpenID does not belong to you."
 msgstr ""
 
-#: ../actions/confirmaddress.php:52
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
 msgid "That address has already been confirmed."
 msgstr ""
 
-#: ../actions/confirmaddress.php:43
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
 msgid "That confirmation code is not for you!"
 msgstr ""
 
-#: ../actions/emailsettings.php:191
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
 msgid "That email address already belongs to another user."
 msgstr ""
 
@@ -1685,29 +1647,29 @@ msgstr "Det er ikke ditt telefonnummer."
 msgid "That is the wrong IM address."
 msgstr "Det er feil IM-adresse."
 
-#: ../actions/smssettings.php:233
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
 msgid "That is the wrong confirmation number."
 msgstr ""
 
-#: ../actions/smssettings.php:191
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
 msgid "That phone number already belongs to another user."
 msgstr ""
 
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: ../actions/newnotice.php:53 ../actions/newnotice.php:49
+#: ../actions/twitapistatuses.php:408 actions/newnotice.php:49
+#: actions/twitapistatuses.php:330
 msgid "That's too long. Max notice size is 140 chars."
 msgstr ""
 
-#: ../actions/twitapiaccount.php:74
-msgid "That's too long. Max notice size is 255 chars."
-msgstr ""
-
-#: ../actions/confirmaddress.php:92
+#: ../actions/confirmaddress.php:88 ../actions/confirmaddress.php:92
+#: actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
 
 #: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274
+#: ../actions/smssettings.php:274 actions/emailsettings.php:282
+#: actions/imsettings.php:258 actions/smssettings.php:282
 msgid "The address was removed."
 msgstr ""
 
@@ -1725,30 +1687,25 @@ msgid ""
 "subscription."
 msgstr ""
 
-#: ../actions/subscribers.php:35
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr ""
 
-#: ../actions/subscribers.php:33
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
 msgid "These are the people who listen to your notices."
 msgstr ""
 
-#: ../actions/subscriptions.php:35
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr ""
 
-#: ../actions/subscriptions.php:33
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
 msgid "These are the people whose notices you listen to."
 msgstr ""
 
-#: ../actions/invite.php:89
-msgid ""
-"These people are already users and you were automatically subscribed to them:"
-msgstr ""
-
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:87 ../actions/recoverpassword.php:88
 msgid "This confirmation code is too old. Please start again."
 msgstr ""
 
@@ -1758,7 +1715,7 @@ msgid ""
 "button to go to your OpenID provider."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:56
+#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -1766,16 +1723,7 @@ msgid ""
 "your existing account, if you have one."
 msgstr ""
 
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-msgid "This method requires a POST or DELETE."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381
-msgid "This method requires a POST."
-msgstr ""
-
-#: ../lib/util.php:164
+#: ../lib/util.php:151 ../lib/util.php:164 lib/util.php:246
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
@@ -1783,84 +1731,86 @@ msgstr ""
 msgid "Timezone"
 msgstr "Tidssone"
 
-#: ../actions/profilesettings.php:107
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
 msgid "Timezone not selected."
 msgstr ""
 
 #: ../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."
+"To subscribe, you can [login](%%action.login%%), or "
+"[register](%%action.register%%) a new  account. If you already have an "
+"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
+"your profile URL below."
 msgstr ""
 
-#: ../actions/twitapifriendships.php:163
+#: ../actions/twitapifriendships.php:150 ../actions/twitapifriendships.php:163
+#: actions/twitapifriendships.php:167
 msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: ../actions/profilesettings.php:48 ../actions/register.php:233
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside."
 
-#: ../actions/remotesubscribe.php:74
+#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
 msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
 #: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
 #: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: actions/emailsettings.php:144 actions/imsettings.php:118
+#: actions/recoverpassword.php:39 actions/smssettings.php:143
+#: actions/twittersettings.php:108
 msgid "Unexpected form submission."
 msgstr ""
 
-#: ../actions/recoverpassword.php:276
+#: ../actions/recoverpassword.php:237 ../actions/recoverpassword.php:276
+#: actions/recoverpassword.php:289
 msgid "Unexpected password reset."
 msgstr ""
 
-#: ../index.php:57
-msgid "Unknown action"
-msgstr ""
-
 #: ../actions/finishremotesubscribe.php:58
+#: actions/finishremotesubscribe.php:60
 msgid "Unknown version of OMB protocol."
 msgstr ""
 
-#: ../lib/util.php:269
+#: ../lib/util.php:256 ../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 ""
 
-#: ../actions/confirmaddress.php:48
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr ""
 
-#: ../actions/showstream.php:209
+#: ../actions/showstream.php:209 actions/showstream.php:219
 msgid "Unsubscribe"
 msgstr ""
 
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: actions/postnotice.php:45 actions/updateprofile.php:46
 msgid "Unsupported OMB version"
 msgstr ""
 
-#: ../actions/avatar.php:105
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
 msgid "Unsupported image file format."
 msgstr ""
 
-#: ../lib/settingsaction.php:100
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103
-msgid "Updates by instant messenger (IM)"
+#: ../lib/twitterapi.php:257 ../lib/twitterapi.php:278
+msgid "Unsupported type"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:241
+#: ../actions/twitapistatuses.php:238 ../actions/twitapistatuses.php:241
+#: actions/twitapistatuses.php:158
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:341
+#: ../actions/twitapistatuses.php:338 ../actions/twitapistatuses.php:341
+#: actions/twitapistatuses.php:268
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
@@ -1877,59 +1827,57 @@ msgid ""
 "share."
 msgstr ""
 
-#: ../lib/settingsaction.php:91
-#, fuzzy
-msgid "Upload a new profile image"
-msgstr "Klarte ikke å lagre den nye profil-informasjonen"
-
-#: ../actions/invite.php:114
-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:227 ../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 ""
 
 #: ../actions/finishremotesubscribe.php:86
+#: actions/finishremotesubscribe.php:88
 msgid "User being listened to doesn't exist."
 msgstr ""
 
 #: ../actions/all.php:41 ../actions/avatarbynickname.php:48
 #: ../actions/foaf.php:47 ../actions/replies.php:41
-#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
-#: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
-#: ../actions/twitapiusers.php:82
+#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:78
+#: ../actions/twitapistatuses.php:316 ../actions/twitapistatuses.php:621
+#: ../actions/twitapiaccount.php:82 ../actions/twitapistatuses.php:319
+#: ../actions/twitapistatuses.php:685 ../actions/twitapiusers.php:82
+#: actions/all.php:41 actions/avatarbynickname.php:48 actions/foaf.php:47
+#: actions/replies.php:41 actions/showfavorites.php:41
+#: actions/showstream.php:44 actions/twitapiaccount.php:80
+#: actions/twitapifavorites.php:68 actions/twitapistatuses.php:235
+#: actions/twitapistatuses.php:609 actions/twitapiusers.php:87
+#: lib/mailbox.php:50
 msgid "User has no profile."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
 msgid "User nickname"
 msgstr ""
 
-#: ../actions/twitapiusers.php:75
-msgid "User not found."
-msgstr ""
-
-#: ../actions/profilesettings.php:63
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
 msgid "What timezone are you normally in?"
 msgstr ""
 
-#: ../lib/util.php:1159
+#: ../lib/util.php:1131 ../lib/util.php:1159 lib/util.php:1293
 #, php-format
 msgid "What's up, %s?"
 msgstr ""
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: ../actions/profilesettings.php:54 ../actions/register.php:239
+#: ../actions/register.php:175 actions/profilesettings.php:87
+#: actions/register.php:189
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
-#: ../actions/updateprofile.php:128
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr ""
 
-#: ../actions/updateprofile.php:123
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr ""
@@ -1938,11 +1886,11 @@ msgstr ""
 msgid "Yes"
 msgstr "Ja"
 
-#: ../actions/finishaddopenid.php:64
+#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr ""
 
-#: ../actions/deletenotice.php:37
+#: ../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."
@@ -1952,11 +1900,8 @@ msgstr ""
 msgid "You are already logged in!"
 msgstr "Du er allerede logget inn!"
 
-#: ../actions/invite.php:81
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:128
+#: ../actions/twitapifriendships.php:115 ../actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:128
 msgid "You are not friends with the specified user."
 msgstr ""
 
@@ -1964,11 +1909,12 @@ msgstr ""
 msgid "You can change your password here. Choose a good one!"
 msgstr ""
 
-#: ../actions/register.php:135
+#: ../actions/register.php:209 ../actions/register.php:135
+#: actions/register.php:145
 msgid "You can create a new account to start posting notices."
 msgstr ""
 
-#: ../actions/smssettings.php:28
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
@@ -1979,31 +1925,35 @@ msgid ""
 "\"Remove\"."
 msgstr ""
 
-#: ../actions/imsettings.php:28
+#: ../actions/imsettings.php:28 actions/imsettings.php:28
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about you."
+"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
 msgid "You can use the local subscription!"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:57
+#: ../actions/register.php:61 actions/finishopenidlogin.php:38
+#: actions/register.php:68
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 
-#: ../actions/updateprofile.php:63
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
 msgid "You did not send us that profile"
 msgstr ""
 
-#: ../lib/mail.php:147
+#: ../lib/mail.php:143 ../lib/mail.php:147
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -2016,30 +1966,15 @@ msgid ""
 "%4$s"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:612
-msgid "You may not delete another user's status."
-msgstr ""
-
-#: ../actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr ""
-
-#: ../actions/invite.php:103
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
-
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:134 ../actions/recoverpassword.php:149
 msgid "You've been identified. Enter a  new password below. "
 msgstr ""
 
-#: ../actions/openidlogin.php:67
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
 msgid "Your OpenID URL"
 msgstr ""
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:149 ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 
@@ -2050,79 +1985,930 @@ msgid ""
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
 
-#: ../lib/util.php:943
+#: ../lib/util.php:919
 msgid "a few seconds ago"
 msgstr "noen få sekunder siden"
 
-#: ../lib/util.php:955
+#: ../lib/util.php:931
 #, php-format
 msgid "about %d days ago"
 msgstr "omtrent %d dager siden"
 
-#: ../lib/util.php:951
+#: ../lib/util.php:927
 #, php-format
 msgid "about %d hours ago"
 msgstr "omtrent %d timer siden"
 
-#: ../lib/util.php:947
+#: ../lib/util.php:923
 #, php-format
 msgid "about %d minutes ago"
 msgstr "omtrent %d minutter siden"
 
-#: ../lib/util.php:959
+#: ../lib/util.php:935
 #, php-format
 msgid "about %d months ago"
 msgstr "omtrent %d måneder siden"
 
-#: ../lib/util.php:953
+#: ../lib/util.php:929
 msgid "about a day ago"
 msgstr "omtrent én dag siden"
 
-#: ../lib/util.php:945
+#: ../lib/util.php:921
 msgid "about a minute ago"
 msgstr "omtrent ett minutt siden"
 
-#: ../lib/util.php:957
+#: ../lib/util.php:933
 msgid "about a month ago"
 msgstr "omtrent én måned siden"
 
-#: ../lib/util.php:961
+#: ../lib/util.php:937
 msgid "about a year ago"
 msgstr "omtrent ett år siden"
 
-#: ../lib/util.php:949
+#: ../lib/util.php:925
 msgid "about an hour ago"
 msgstr "omtrent én time siden"
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: ../actions/showstream.php:424 ../lib/stream.php:130
 msgid "delete"
 msgstr "slett"
 
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117
+#: ../actions/noticesearch.php:126 ../actions/showstream.php:408
+#: ../lib/stream.php:114 ../actions/noticesearch.php:130 ../lib/stream.php:117
+#: actions/noticesearch.php:136 actions/showstream.php:426 lib/stream.php:84
 msgid "in reply to..."
 msgstr ""
 
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124
+#: ../lib/twitterapi.php:363
+msgid "not a supported data format"
+msgstr ""
+
+#: ../actions/noticesearch.php:133 ../actions/showstream.php:415
+#: ../lib/stream.php:121
 msgid "reply"
 msgstr "svar"
 
-#: ../actions/password.php:44
+#: ../actions/password.php:44 actions/profilesettings.php:183
 msgid "same as password above"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:755
+#: ../actions/twitapistatuses.php:691 ../actions/twitapistatuses.php:755
+#: actions/twitapistatuses.php:678
 msgid "unsupported file type"
 msgstr ""
 
-#: ../lib/util.php:1309
+#: ../lib/util.php:1281 ../lib/util.php:1309 lib/util.php:1443
 msgid "« After"
 msgstr ""
 
-#~ msgid " by "
-#~ msgstr "av"
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+msgid " from "
+msgstr ""
 
-#, fuzzy
-#~ msgid "Public"
-#~ msgstr "Offentlig"
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55
+msgid "API method not found!"
+msgstr ""
+
+#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
+#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
+#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
+#: ../actions/twitapidirect_messages.php:49
+#: ../actions/twitapidirect_messages.php:56
+#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
+#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
+#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
+#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
+#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
+#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
+#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
+#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
+#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
+#: actions/twitapistatuses.php:690
+msgid "API method under construction."
+msgstr ""
+
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+msgid "Change email handling"
+msgstr ""
+
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+msgid "Change your profile settings"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr ""
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+msgid "IM"
+msgstr ""
+
+#: ../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/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+msgid "No status with that ID found."
+msgstr ""
+
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+msgid "Not a registered user."
+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
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+msgid "Not found"
+msgstr ""
+
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../actions/invite.php:133 actions/invite.php:141
+msgid "Personal message"
+msgstr ""
+
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+msgid "SMS"
+msgstr ""
+
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/invite.php:89 actions/invite.php:96
+msgid ""
+"These people are already users and you were automatically subscribed to "
+"them:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511
+msgid "This method requires a POST or 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
+msgid "This method requires a POST."
+msgstr ""
+
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this "
+"service."
+msgstr ""
+
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr ""
+
+#: ../actions/invite.php:103 actions/invite.php:110
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
+msgstr ""
+
+#: actions/deletenotice.php:74 actions/disfavor.php:43
+#: actions/emailsettings.php:127 actions/favor.php:45
+#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
+#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
+#: actions/openidsettings.php:123 actions/profilesettings.php:47
+#: actions/recoverpassword.php:282 actions/register.php:42
+#: actions/remotesubscribe.php:40 actions/smssettings.php:124
+#: actions/subscribe.php:44 actions/twittersettings.php:97
+#: actions/unsubscribe.php:41 actions/userauthorization.php:35
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/disfavor.php:55
+msgid "This notice is not a favorite!"
+msgstr ""
+
+#: actions/disfavor.php:63
+msgid "Could not delete favorite."
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Favor"
+msgstr ""
+
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+
+#: actions/emailsettings.php:95
+msgid "Send me email when someone sends me a private message."
+msgstr ""
+
+#: actions/favor.php:53 actions/twitapifavorites.php:142
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132
+msgid "Could not create favorite."
+msgstr ""
+
+#: actions/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#, php-format
+msgid "%s favorite notices"
+msgstr ""
+
+#: actions/favoritesrss.php:64
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr ""
+
+#: actions/inbox.php:28
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+
+#: actions/invite.php:178
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+msgstr ""
+
+#: actions/login.php:104
+msgid "Automatically login in the future; "
+msgstr ""
+
+#: actions/login.php:122
+msgid "For security reasons, please re-enter your "
+msgstr ""
+
+#: actions/login.php:126
+msgid "Login with your username and password. "
+msgstr ""
+
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+msgid "That's too long. Max message size is 140 chars."
+msgstr ""
+
+#: actions/newmessage.php:65
+msgid "No recipient specified."
+msgstr ""
+
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206
+msgid "You can't send a message to this user."
+msgstr ""
+
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly "
+"instead."
+msgstr ""
+
+#: actions/newmessage.php:108
+msgid "No such user"
+msgstr ""
+
+#: actions/newmessage.php:117
+msgid "New message"
+msgstr ""
+
+#: actions/noticesearch.php:95
+msgid "Notice without matching profile"
+msgstr ""
+
+#: actions/openidsettings.php:28
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr ""
+
+#: actions/openidsettings.php:46
+msgid "If you want to add an OpenID to your account, "
+msgstr ""
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr ""
+
+#: actions/openidsettings.php:87
+msgid "You can remove an OpenID from your account "
+msgstr ""
+
+#: actions/outbox.php:28
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr ""
+
+#: actions/outbox.php:30
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#: actions/outbox.php:53
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+
+#: actions/peoplesearch.php:28
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+msgstr ""
+
+#: actions/profilesettings.php:27
+msgid "You can update your personal profile info here "
+msgstr ""
+
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+msgid "User without matching profile"
+msgstr ""
+
+#: actions/recoverpassword.php:91
+msgid "This confirmation code is too old. "
+msgstr ""
+
+#: actions/recoverpassword.php:141
+msgid "If you've forgotten or lost your"
+msgstr ""
+
+#: actions/recoverpassword.php:154
+msgid "You've been identified. Enter a "
+msgstr ""
+
+#: actions/recoverpassword.php:169
+msgid "Your nickname on this server, "
+msgstr ""
+
+#: actions/recoverpassword.php:271
+msgid "Instructions for recovering your password "
+msgstr ""
+
+#: actions/recoverpassword.php:327
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95
+msgid "Password must be 6 or more characters."
+msgstr ""
+
+#: actions/register.php:216
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
+msgstr ""
+
+#: actions/register.php:227
+msgid "(You should receive a message by email momentarily, with "
+msgstr ""
+
+#: actions/remotesubscribe.php:51
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
+msgstr ""
+
+#: actions/showfavorites.php:61
+#, php-format
+msgid "Feed for favorites of %s"
+msgstr ""
+
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+msgid "Could not retrieve favorite notices."
+msgstr ""
+
+#: actions/showmessage.php:33
+msgid "No such message."
+msgstr ""
+
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
+msgstr ""
+
+#: actions/showmessage.php:61
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr ""
+
+#: actions/showmessage.php:66
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr ""
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr ""
+
+#: actions/smssettings.php:312
+#, php-format
+msgid "Mobile carrier for your phone. "
+msgstr ""
+
+#: actions/twitapidirect_messages.php:76
+#, php-format
+msgid "Direct messages to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:77
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:81
+msgid "Direct Messages You've Sent"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:82
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:128
+msgid "No message text!"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:138
+msgid "Recipient user not found."
+msgstr ""
+
+#: actions/twitapidirect_messages.php:141
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
+#: actions/twitapifavorites.php:92
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr ""
+
+#: actions/twitapifavorites.php:95
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr ""
+
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#, php-format
+msgid "%s added your notice as a favorite"
+msgstr ""
+
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+msgstr ""
+
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+msgstr ""
+
+#: actions/twittersettings.php:41
+msgid "Twitter settings"
+msgstr ""
+
+#: actions/twittersettings.php:48
+msgid "Twitter Account"
+msgstr ""
+
+#: actions/twittersettings.php:56
+msgid "Current verified Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr ""
+
+#: actions/twittersettings.php:65
+msgid "No spaces, please."
+msgstr ""
+
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr ""
+
+#: actions/twittersettings.php:72
+msgid "Automatically send my notices to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:75
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:78
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+
+#: actions/twittersettings.php:128
+msgid "Could not verify your Twitter credentials!"
+msgstr ""
+
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+msgid "Unable to save your Twitter settings!"
+msgstr ""
+
+#: actions/twittersettings.php:174
+msgid "Twitter settings saved."
+msgstr ""
+
+#: actions/twittersettings.php:192
+msgid "That is not your Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+msgid "Couldn't remove Twitter user."
+msgstr ""
+
+#: actions/twittersettings.php:212
+msgid "Twitter account removed."
+msgstr ""
+
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+msgid "Couldn't save Twitter preferences."
+msgstr ""
+
+#: actions/twittersettings.php:245
+msgid "Twitter preferences saved."
+msgstr ""
+
+#: actions/userauthorization.php:84
+msgid "Please check these details to make sure "
+msgstr ""
+
+#: actions/userauthorization.php:324
+msgid "The subscription has been authorized, but no "
+msgstr ""
+
+#: actions/userauthorization.php:334
+msgid "The subscription has been rejected, but no "
+msgstr ""
+
+#: classes/Channel.php:113
+msgid "Command results"
+msgstr ""
+
+#: classes/Channel.php:148
+msgid "Command complete"
+msgstr ""
+
+#: classes/Channel.php:158
+msgid "Command failed"
+msgstr ""
+
+#: classes/Command.php:39
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: classes/Command.php:96
+#, php-format
+msgid "Subscriptions: %1$s\n"
+msgstr ""
+
+#: classes/Command.php:125 classes/Command.php:242
+msgid "User has no last notice"
+msgstr ""
+
+#: classes/Command.php:146
+msgid "Notice marked as fave."
+msgstr ""
+
+#: classes/Command.php:166
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr ""
+
+#: classes/Command.php:169
+#, php-format
+msgid "Fullname: %s"
+msgstr ""
+
+#: classes/Command.php:172
+#, php-format
+msgid "Location: %s"
+msgstr ""
+
+#: classes/Command.php:175
+#, php-format
+msgid "Homepage: %s"
+msgstr ""
+
+#: classes/Command.php:178
+#, php-format
+msgid "About: %s"
+msgstr ""
+
+#: classes/Command.php:200
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
+
+#: classes/Command.php:214
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
+
+#: classes/Command.php:216
+msgid "Error sending direct message."
+msgstr ""
+
+#: classes/Command.php:263
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: classes/Command.php:270
+#, php-format
+msgid "Subscribed to %s"
+msgstr ""
+
+#: classes/Command.php:288
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
+
+#: classes/Command.php:295
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr ""
+
+#: classes/Command.php:310 classes/Command.php:330
+msgid "Command not yet implemented."
+msgstr ""
+
+#: classes/Command.php:313
+msgid "Notification off."
+msgstr ""
+
+#: classes/Command.php:315
+msgid "Can't turn off notification."
+msgstr ""
+
+#: classes/Command.php:333
+msgid "Notification on."
+msgstr ""
+
+#: classes/Command.php:335
+msgid "Can't turn on notification."
+msgstr ""
+
+#: classes/Command.php:344
+msgid "Commands:\n"
+msgstr ""
+
+#: classes/Message.php:53
+msgid "Could not insert message."
+msgstr ""
+
+#: classes/Message.php:63
+msgid "Could not update message with new URI."
+msgstr ""
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr ""
+
+#: lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:249
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:253
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+msgstr ""
+
+#: lib/mailbox.php:43
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/openid.php:195
+msgid "This form should automatically submit itself. "
+msgstr ""
+
+#: lib/personal.php:65
+msgid "Favorites"
+msgstr ""
+
+#: lib/personal.php:66
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
+#: lib/personal.php:66
+msgid "User"
+msgstr ""
+
+#: lib/personal.php:75
+msgid "Inbox"
+msgstr ""
+
+#: lib/personal.php:76
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personal.php:80
+msgid "Outbox"
+msgstr ""
+
+#: lib/personal.php:81
+msgid "Your sent messages"
+msgstr ""
+
+#: lib/settingsaction.php:99
+msgid "Twitter"
+msgstr ""
+
+#: lib/settingsaction.php:100
+msgid "Twitter integration options"
+msgstr ""
+
+#: lib/util.php:1718
+msgid "To"
+msgstr ""
+
+#: scripts/maildaemon.php:45
+msgid "Could not parse message."
+msgstr ""
diff --git a/locale/pl_PL/LC_MESSAGES/laconica.mo b/locale/pl_PL/LC_MESSAGES/laconica.mo
index 03bcbf566..38a0f543d 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 36d0311d5..0beb8e85a 100644
--- a/locale/pl_PL/LC_MESSAGES/laconica.po
+++ b/locale/pl_PL/LC_MESSAGES/laconica.po
@@ -1,14 +1,22 @@
+# #-#-#-#-#  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.
 #
+# #-#-#-#-#  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.
+#
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-27 14:57-0400\n"
+"POT-Creation-Date: 2008-07-14 21:07+1200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Paweł Wilk <siefca@gnu.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,79 +25,42 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
-#
-#
-# Polish language has 3 plural forms.
-# Special case is used for one and some numbers ending in 2, 3, or 4.
-# Example:
+#  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
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "Szukaj strumienia dla \"%s\""
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
 msgid ""
-" except this private data: password, email address, IM address, phone number."
+" except this private data: password, email address, IM address, phone "
+"number."
 msgstr ""
 "z wyłączeniem tych prywatnych danych: e-maila, identyfikatora IM, numeru "
 "telefonu."
 
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-msgid " from "
-msgstr ""
-
-#: ../actions/twitapistatuses.php:478
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/invite.php:168
-#, fuzzy, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s obserwuje teraz Twoje wpisy na %2$s."
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-
-#: ../lib/mail.php:124
+#: ../actions/subscribe.php:84
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s obserwuje teraz Twoje wpisy na %2$s."
 
-#: ../lib/mail.php:126
+#: ../actions/subscribe.php:86
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -104,155 +75,72 @@ msgstr ""
 "KÅ‚aniam siÄ™,\n"
 "%4$s.\n"
 
-#: ../actions/twitapistatuses.php:482
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-
 #: ../actions/shownotice.php:45
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Status użytkownika %1$s na %2$s"
 
-#: ../actions/invite.php:84 ../actions/invite.php:92
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:60
 #, php-format
 msgid "%s Public Stream"
 msgstr "Publiczny strumień %s"
 
-#: ../actions/all.php:47 ../actions/allrss.php:60
-#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51
+#: ../actions/all.php:47 ../actions/allrss.php:70 ../lib/stream.php:45
 #, php-format
 msgid "%s and friends"
 msgstr "%s i przyjaciele"
 
-#: ../actions/twitapistatuses.php:49
-#, fuzzy, php-format
-msgid "%s public timeline"
-msgstr "Publiczna oÅ› czasu"
-
-#: ../lib/mail.php:206
-#, fuzzy, php-format
-msgid "%s status"
-msgstr "Status użytkownika %1$s na %2$s"
-
-#: ../actions/twitapistatuses.php:338
-#, fuzzy, php-format
-msgid "%s timeline"
-msgstr "Publiczna oÅ› czasu"
-
-#: ../actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:213
-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:233
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** is a microblogging service brought to you by "
+"[%%site.broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
-"**%%site.name%%** to serwis z mikroblogami 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:235
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** to serwis do mikroblogowania."
 
-#: ../lib/util.php:274
+#: ../lib/util.php:250
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ""
-". Współpracownicy 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/register.php:176
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "Max. 64 znaki alfanumeryczne, bez spacji i znaków przestankowych"
 
-#: ../actions/register.php:152
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "Max. 64 znaki alfanumeryczne, bez spacji i znaków przestankowych"
-
-#: ../actions/password.php:42
+#: ../actions/password.php:42 ../actions/register.php:178
 msgid "6 or more characters"
 msgstr "6 lub więcej znaków"
 
-#: ../actions/recoverpassword.php:180
+#: ../actions/recoverpassword.php:165
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 lub więcej znaków – nie zapomnij go!"
 
-#: ../actions/register.php:154
-#, fuzzy
-msgid "6 or more characters. Required."
-msgstr "6 lub więcej znaków"
-
-#: ../actions/imsettings.php:197
+#: ../actions/imsettings.php:188
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+"A confirmation code was sent to the IM address you added. You must approve "
+"%s for sending messages to you."
 msgstr ""
 "Na Twój adres komunikatora został wysłany kod potwierdzający. Musisz "
 "zaakceptować otrzymywanie wiadomości od %s."
 
-#: ../actions/emailsettings.php:213
-#, fuzzy
-msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
-msgstr ""
-"Na Twój adres komunikatora został wysłany kod potwierdzający. Musisz "
-"zaakceptować otrzymywanie wiadomości od %s."
-
-#: ../actions/smssettings.php:216
-#, fuzzy
-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 ""
-"Na Twój adres komunikatora został wysłany kod potwierdzający. Musisz "
-"zaakceptować otrzymywanie wiadomości od %s."
-
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122
-msgid "API method not found!"
-msgstr ""
-
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-msgid "API method under construction."
-msgstr ""
-
-#: ../lib/util.php:324
+#: ../lib/util.php:296
 msgid "About"
 msgstr "O serwisie"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/userauthorization.php:118
 msgid "Accept"
 msgstr "Akceptuj"
 
-#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
-#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
 msgid "Add"
 msgstr "Dodaj"
 
@@ -260,25 +148,15 @@ msgstr "Dodaj"
 msgid "Add OpenID"
 msgstr "Dodaj konto OpenID"
 
-#: ../lib/settingsaction.php:97
-#, fuzzy
-msgid "Add or remove OpenIDs"
-msgstr "Usuń konto OpenID"
-
-#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39
+#: ../actions/imsettings.php:39
 msgid "Address"
 msgstr "Adres"
 
-#: ../actions/invite.php:131
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../actions/showstream.php:273
+#: ../actions/showstream.php:254
 msgid "All subscriptions"
 msgstr "Wszyscy obserwowani"
 
-#: ../actions/publicrss.php:64
+#: ../actions/publicrss.php:62
 #, php-format
 msgid "All updates for %s"
 msgstr "Wszystkie aktualizacje od %s"
@@ -288,35 +166,26 @@ msgstr "Wszystkie aktualizacje od %s"
 msgid "All updates matching search term \"%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
+#: ../actions/finishopenidlogin.php:29 ../actions/login.php:27
+#: ../actions/openidlogin.php:29 ../actions/register.php:28
 msgid "Already logged in."
 msgstr "Jesteś już zalogowany."
 
-#: ../lib/subs.php:42
+#: ../actions/subscribe.php:48
 msgid "Already subscribed!."
 msgstr "Już obserwujesz!"
 
-#: ../actions/deletenotice.php:54
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/userauthorization.php:77
+#: ../actions/userauthorization.php:76
 msgid "Authorize subscription"
 msgstr "Pozwól na obserwację"
 
-#: ../actions/login.php:104 ../actions/register.php:178
+#: ../actions/login.php:100 ../actions/register.php:184
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
-"Automatycznie loguj mnie na konto. Nie używać w przypadku współdzielonych "
-"komputerów!"
-
-#: ../actions/profilesettings.php:65
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr ""
+"Automatycznie loguj mnie na konto. Nie używać w przypadku "
+"współdzielonych komputerów!"
 
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: ../actions/avatar.php:32
 msgid "Avatar"
 msgstr "Awatar"
 
@@ -334,49 +203,28 @@ msgstr ""
 "Jabbera/GTalka przyszła wiadomość z dalszymi instrukcjami. (Nie zapomnij "
 "dodać %s do listy znajomych.)"
 
-#: ../actions/emailsettings.php:54
-#, fuzzy
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-msgstr ""
-"Oczekiwanie na potwierdzenie z tego adresu. Sprawdź czy na Twoje konto "
-"Jabbera/GTalka przyszła wiadomość z dalszymi instrukcjami. (Nie zapomnij "
-"dodać %s do listy znajomych.)"
-
-#: ../actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
-
-#: ../lib/util.php:1318
+#: ../lib/util.php:1136
 msgid "Before »"
 msgstr "Wcześniej »"
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: ../actions/profilesettings.php:52
 msgid "Bio"
 msgstr "O mnie"
 
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103
+#: ../actions/profilesettings.php:93 ../actions/updateprofile.php:102
 msgid "Bio is too long (max 140 chars)."
 msgstr "Wpis \"O mnie\" jest za długi (maks. 140 znaków)"
 
-#: ../lib/deleteaction.php:41
-#, fuzzy
-msgid "Can't delete this notice."
-msgstr "Nie można skasować potwierdzenia adresu e-mail."
-
-#: ../actions/updateprofile.php:119
+#: ../actions/updateprofile.php:118
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Nie można odczytać URL-a awatara '%s'"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
+#: ../actions/password.php:85 ../actions/recoverpassword.php:261
 msgid "Can't save new password."
 msgstr "Nie można zapisać nowego hasła."
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62
+#: ../actions/imsettings.php:59
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -384,79 +232,35 @@ msgstr "Anuluj"
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Nie można stworzyć instancji obiektu OpenID."
 
-#: ../actions/imsettings.php:163
+#: ../actions/imsettings.php:154
 msgid "Cannot normalize that Jabber ID"
 msgstr "Nie można znormalizować tego identyfikatora Jabbera"
 
-#: ../actions/emailsettings.php:181
-#, fuzzy
-msgid "Cannot normalize that email address"
-msgstr "Nie można znormalizować tego identyfikatora Jabbera"
-
 #: ../actions/password.php:45
 msgid "Change"
 msgstr "Zmień"
 
-#: ../lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
 #: ../actions/password.php:32
 msgid "Change password"
 msgstr "Zmień hasło"
 
-#: ../lib/settingsaction.php:94
-#, fuzzy
-msgid "Change your password"
-msgstr "Zmień hasło"
-
-#: ../lib/settingsaction.php:85
-#, fuzzy
-msgid "Change your profile settings"
-msgstr "Ustawienia profilu"
-
-#: ../actions/password.php:43 ../actions/recoverpassword.php:181
-#: ../actions/register.php:155 ../actions/smssettings.php:65
+#: ../actions/password.php:43 ../actions/recoverpassword.php:166
+#: ../actions/register.php:179
 msgid "Confirm"
 msgstr "Potwierdź"
 
-#: ../actions/confirmaddress.php:90
+#: ../actions/confirmaddress.php:84
 msgid "Confirm Address"
 msgstr "Potwierdź adres"
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245
+#: ../actions/imsettings.php:213
 msgid "Confirmation cancelled."
 msgstr "Anulowano potwierdzenie."
 
-#: ../actions/smssettings.php:63
-#, fuzzy
-msgid "Confirmation code"
-msgstr "Brak kodu potwierdzajÄ…cego."
-
 #: ../actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr "Nie znaleziono kodu potwierdzajÄ…cego."
 
-#: ../actions/register.php:202
-#, php-format
-msgid ""
-"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."
-msgstr ""
-
 #: ../actions/finishopenidlogin.php:91
 msgid "Connect"
 msgstr "Połącz"
@@ -465,7 +269,7 @@ msgstr "Połącz"
 msgid "Connect existing account"
 msgstr "Połącz z istniejącym kontem"
 
-#: ../lib/util.php:332
+#: ../lib/util.php:304
 msgid "Contact"
 msgstr "Kontakt"
 
@@ -474,66 +278,44 @@ msgstr "Kontakt"
 msgid "Could not create OpenID form: %s"
 msgstr "Nie można utworzyć formularza OpenID: %s"
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr ""
-
 #: ../lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Nie można przekierować do serwera: %s"
 
-#: ../actions/updateprofile.php:162
+#: ../actions/updateprofile.php:161
 msgid "Could not save avatar info"
 msgstr "Nie można zapisać informacji o awatarze"
 
-#: ../actions/updateprofile.php:155
+#: ../actions/updateprofile.php:154
 msgid "Could not save new profile info"
 msgstr "Nie można zapisać informacji o nowym profilu"
 
-#: ../lib/subs.php:54
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../lib/subs.php:46
-#, fuzzy
-msgid "Could not subscribe."
-msgstr "Nie obserwujesz!."
-
-#: ../actions/recoverpassword.php:102
-#, fuzzy
-msgid "Could not update user with confirmed email address."
-msgstr "Nie można wprowadzić kodu potwierdzającego."
+#: ../actions/profilesettings.php:146
+msgid "Couldn't confirm email."
+msgstr "Nie można potwierdzić e-maila."
 
 #: ../actions/finishremotesubscribe.php:99
 msgid "Couldn't convert request tokens to access tokens."
 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
+#: ../actions/subscribe.php:59
+msgid "Couldn't create subscription."
+msgstr "Nie można obserwować."
+
+#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
 msgid "Couldn't delete email confirmation."
 msgstr "Nie można skasować potwierdzenia adresu e-mail."
 
-#: ../lib/subs.php:103
+#: ../actions/unsubscribe.php:56
 msgid "Couldn't delete subscription."
 msgstr "Nie można usunąć obserwacji."
 
-#: ../actions/twitapistatuses.php:93
-#, fuzzy
-msgid "Couldn't find any statuses."
-msgstr "Nie można zaktualizować użytkownika."
-
-#: ../actions/remotesubscribe.php:127
+#: ../actions/remotesubscribe.php:125
 msgid "Couldn't get a request token."
 msgstr "Nie można uzyskać tokena z żądaniem."
 
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206
+#: ../actions/imsettings.php:178
 msgid "Couldn't insert confirmation code."
 msgstr "Nie można wprowadzić kodu potwierdzającego."
 
@@ -541,24 +323,12 @@ msgstr "Nie można wprowadzić kodu potwierdzającego."
 msgid "Couldn't insert new subscription."
 msgstr "Nie można wprowadzić nowej obserwacji."
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: ../actions/profilesettings.php:175
 msgid "Couldn't save profile."
 msgstr "Nie można zapisać profilu."
 
-#: ../actions/profilesettings.php:161
-#, fuzzy
-msgid "Couldn't update user for autosubscribe."
-msgstr "Nie można zaktualizować użytkownika."
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#, fuzzy
-msgid "Couldn't update user record."
-msgstr "Nie można zaktualizować użytkownika."
-
-#: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
-#: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
-#: ../actions/imsettings.php:243 ../actions/profilesettings.php:141
-#: ../actions/smssettings.php:157 ../actions/smssettings.php:269
+#: ../actions/confirmaddress.php:70 ../actions/imsettings.php:129
+#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
 msgid "Couldn't update user."
 msgstr "Nie można zaktualizować użytkownika."
 
@@ -582,83 +352,44 @@ msgstr "Tworzenie nowego konta użytkownika na podstawie identyfikatora OpenID."
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Potwierdzone adresy Jabbera/GTalka"
 
-#: ../actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:44
-#, fuzzy
-msgid "Current confirmed email address."
-msgstr "Potwierdzone adresy Jabbera/GTalka"
-
-#: ../actions/showstream.php:356
+#: ../actions/showstream.php:337
 msgid "Currently"
 msgstr "Obecnie"
 
-#: ../classes/Notice.php:72
-#, fuzzy, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "BÅ‚Ä…d przy dodawaniu do bazy danych: %s"
-
-#: ../lib/util.php:1061
+#: ../lib/util.php:893
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "BÅ‚Ä…d przy dodawaniu do bazy danych: %s"
 
-#: ../actions/deletenotice.php:41
-#, fuzzy
-msgid "Delete notice"
-msgstr "Nowy wpis"
-
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: ../actions/profilesettings.php:54
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Opisz siÄ™ w 140 znakach"
 
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87
+#: ../actions/register.php:181
 msgid "Email"
 msgstr "E-mail"
 
-#: ../actions/emailsettings.php:59
-#, fuzzy
-msgid "Email Address"
+#: ../actions/profilesettings.php:46
+msgid "Email address"
 msgstr "Adres e-mailowy"
 
-#: ../actions/emailsettings.php:32
-#, fuzzy
-msgid "Email Settings"
-msgstr "Ustawienia"
-
-#: ../actions/register.php:73
+#: ../actions/profilesettings.php:102 ../actions/register.php:63
 msgid "Email address already exists."
 msgstr "Taki e-mail już istnieje"
 
-#: ../lib/mail.php:90
+#: ../lib/mail.php:82
 msgid "Email address confirmation"
 msgstr "Potwierdzenie adresu e-mailowego"
 
-#: ../actions/emailsettings.php:61
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/invite.php:129
-#, fuzzy
-msgid "Email addresses"
-msgstr "Adres e-mailowy"
-
-#: ../actions/recoverpassword.php:191
+#: ../actions/recoverpassword.php:176
 msgid "Enter a nickname or email address."
 msgstr "Podaj pseudonim lub adres e-mailowy"
 
-#: ../actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/userauthorization.php:137
+#: ../actions/userauthorization.php:136
 msgid "Error authorizing token"
 msgstr "BÅ‚Ä…d podczas autoryzacji tokena"
 
-#: ../actions/finishopenidlogin.php:253
+#: ../actions/finishopenidlogin.php:282
 msgid "Error connecting user to OpenID."
 msgstr "Błąd w podłączaniu użytkownika do OpenID."
 
@@ -674,19 +405,23 @@ msgstr "BÅ‚Ä…d we wstawianiu awatara"
 msgid "Error inserting new profile"
 msgstr "BÅ‚Ä…d podczas wprowadzania nowego profilu"
 
+#: ../actions/postnotice.php:88
+msgid "Error inserting notice"
+msgstr "BÅ‚Ä…d przy wprowadzaniu wpisu"
+
 #: ../actions/finishremotesubscribe.php:167
 msgid "Error inserting remote profile"
 msgstr "BÅ‚Ä…d podczas wprowadzania zdalnego profilu"
 
-#: ../actions/recoverpassword.php:240
+#: ../actions/recoverpassword.php:201
 msgid "Error saving address confirmation."
 msgstr "BÅ‚Ä…d w zapisie potwierdzenia adresu."
 
-#: ../actions/userauthorization.php:140
+#: ../actions/userauthorization.php:139
 msgid "Error saving remote profile"
 msgstr "BÅ‚Ä…d w zapisie zdalnego profilu."
 
-#: ../lib/openid.php:226
+#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
 msgid "Error saving the profile."
 msgstr "BÅ‚Ä…d w zapisie profilu."
 
@@ -698,8 +433,8 @@ msgstr "Błąd w zapisie użytkownika."
 msgid "Error saving user; invalid."
 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:43 ../actions/login.php:69
+#: ../actions/recoverpassword.php:268 ../actions/register.php:73
 msgid "Error setting user."
 msgstr "Błąd w ustawianiu danych użytkownika."
 
@@ -711,7 +446,7 @@ msgstr "BÅ‚Ä…d podczas aktualizowania profilu"
 msgid "Error updating remote profile"
 msgstr "BÅ‚Ä…d podczas aktualizowania zdalnego profilu"
 
-#: ../actions/recoverpassword.php:80
+#: ../actions/recoverpassword.php:79
 msgid "Error with confirmation code."
 msgstr "BÅ‚Ä…d kodu potwierdzajÄ…cego."
 
@@ -719,7 +454,7 @@ msgstr "BÅ‚Ä…d kodu potwierdzajÄ…cego."
 msgid "Existing nickname"
 msgstr "Dotychczasowy pseudonim"
 
-#: ../lib/util.php:326
+#: ../lib/util.php:298
 msgid "FAQ"
 msgstr "FAQ"
 
@@ -727,71 +462,49 @@ msgstr "FAQ"
 msgid "Failed updating avatar."
 msgstr "Uaktualnianie awatara nie powiodło się."
 
-#: ../actions/all.php:61 ../actions/allrss.php:64
+#: ../actions/all.php:61 ../actions/allrss.php:74
 #, 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:61 ../actions/repliesrss.php:80
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Kanał dla odpowiedzi do użytkownika %s"
 
-#: ../actions/tag.php:55
-#, fuzzy, php-format
-msgid "Feed for tag %s"
-msgstr "Kanał dla odpowiedzi do użytkownika %s"
-
-#: ../lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/login.php:122
+#: ../actions/login.php:118
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
-"Z powodów bezpieczeństwa wprowadź proszę ponownie nazwę użytkownika i hasło "
-"przed zmianą swoich 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:44
 msgid "Full name"
 msgstr "Pełna nazwa"
 
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93
+#: ../actions/profilesettings.php:90 ../actions/updateprofile.php:92
 msgid "Full name is too long (max 255 chars)."
 msgstr "Pełna nazwa jest zbyt długa (max. 255 znaków)."
 
-#: ../lib/util.php:322
+#: ../lib/util.php:279
 msgid "Help"
 msgstr "Pomoc"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:274
 msgid "Home"
 msgstr "PoczÄ…tek"
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: ../actions/profilesettings.php:49
 msgid "Homepage"
 msgstr "Strona domowa"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: ../actions/profilesettings.php:87
 msgid "Homepage is not a valid URL."
 msgstr "Adres strony domowej nie jest poprawnym URL-em."
 
-#: ../actions/emailsettings.php:91
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102
-msgid "IM"
-msgstr ""
-
-#: ../actions/imsettings.php:60
+#: ../actions/imsettings.php:61
 msgid "IM Address"
 msgstr "Adres komunikatora"
 
@@ -804,8 +517,8 @@ 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ę używając nazwy użytkownika i hasła, aby "
-"połączyć je ze swoim identyfikatorem OpenID."
+"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
 msgid ""
@@ -815,57 +528,42 @@ msgstr ""
 "Jeśli chcesz skojarzyć konto OpenID ze swoim lokalnym kontem, wprowadź "
 "identyfikator w poniższe pole i kliknij \"Dodaj\"."
 
-#: ../actions/recoverpassword.php:137
-#, fuzzy
+#: ../actions/recoverpassword.php:122
 msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
+"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."
-
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283
-#, fuzzy
-msgid "Incoming email address removed."
-msgstr "Adres został usunięty."
+"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."
 
 #: ../actions/password.php:69
 msgid "Incorrect old password"
 msgstr "Stare hasło jest niepoprawne"
 
-#: ../actions/login.php:67
+#: ../actions/login.php:63
 msgid "Incorrect username or password."
 msgstr "Błędna nazwa użytkownika lub hasło."
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:226
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
-"Instrukcje dotyczące przywrócenia hasła zostały wysłane na adres e-mailowy "
-"skojarzony 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:113
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "Błędny URL awatara '%s'"
 
-#: ../actions/invite.php:55
-#, fuzzy, php-format
-msgid "Invalid email address: %s"
-msgstr "Niewłaściwy adres e-mailowy."
-
-#: ../actions/updateprofile.php:98
+#: ../actions/updateprofile.php:97
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Błędna strona domowa '%s'"
 
-#: ../actions/updateprofile.php:82
+#: ../actions/updateprofile.php:81
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "Błędny URL licencji '%s'"
@@ -882,7 +580,7 @@ msgstr "Błędny URI wpisu"
 msgid "Invalid notice url"
 msgstr "Błędny URL wpisu"
 
-#: ../actions/updateprofile.php:87
+#: ../actions/updateprofile.php:86
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "Błędny URL profilu '%s'."
@@ -899,71 +597,47 @@ msgstr "Błędny URL profilu zwrócony przez serwer."
 msgid "Invalid size."
 msgstr "Niepoprawny rozmiar."
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111
+#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
+#: ../actions/register.php:84
 msgid "Invalid username or password."
 msgstr "Błędna nazwa użytkownika lub hasło."
 
-#: ../actions/invite.php:79
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123
-msgid "Invite new users"
-msgstr ""
-
-#: ../lib/util.php:261
+#: ../lib/util.php:237
 #, 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)."
+"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 [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)."
+"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:164
 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
 #, 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 GTalka w postaci \"Użytkownik@przykladowadomena.org\". Nie "
-"zapomnij dodać %s do listy znajomych w swoim komunikatorze lub panelu GTalka."
-
-#: ../actions/profilesettings.php:57
-msgid "Language"
-msgstr ""
-
-#: ../actions/profilesettings.php:113
-#, fuzzy
-msgid "Language is too long (max 50 chars)."
-msgstr "Lokalizacja jest za długa (max. 255 znaków)."
+"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:52 ../actions/register.php:173
+#: ../actions/profilesettings.php:55
 msgid "Location"
 msgstr "Lokalizacja"
 
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108
+#: ../actions/profilesettings.php:96 ../actions/updateprofile.php:107
 msgid "Location is too long (max 255 chars)."
 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:93 ../actions/login.php:102
+#: ../actions/openidlogin.php:68 ../lib/util.php:286
 msgid "Login"
 msgstr "Login"
 
@@ -972,39 +646,26 @@ msgstr "Login"
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Zaloguj się używając konta  [OpenID](%%doc.openid%%)."
 
-#: ../actions/login.php:126
+#: ../actions/login.php:122
 #, 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%"
-"%). "
+"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ę 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:284
 msgid "Logout"
 msgstr "Wyloguj"
 
-#: ../actions/register.php:166
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
-
-#: ../actions/login.php:110
+#: ../actions/login.php:106
 msgid "Lost or forgotten password?"
 msgstr "Zgubione hasło?"
 
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr ""
-
-#: ../actions/showstream.php:300
+#: ../actions/showstream.php:281
 msgid "Member since"
 msgstr "W serwisie od"
 
@@ -1013,59 +674,38 @@ msgstr "W serwisie od"
 msgid "Microblog by %s"
 msgstr "%s – mikroblog"
 
-#: ../actions/smssettings.php:304
-#, php-format
-msgid ""
-"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
-"email but isn't listed here, send email to let us know at %s."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
 msgid "My text and files are available under "
 msgstr "Moje teksty i pliki sÄ… widoczne pod"
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-msgid "New"
-msgstr ""
-
-#: ../lib/mail.php:144
-#, fuzzy, php-format
-msgid "New email address for posting to %s"
-msgstr "Brak zarejestrowanych adresów e-mailowych dla tego użytkownika."
-
-#: ../actions/emailsettings.php:297
-#, fuzzy
-msgid "New incoming email address added."
-msgstr "Niewłaściwy adres e-mailowy."
-
 #: ../actions/finishopenidlogin.php:71
 msgid "New nickname"
 msgstr "Nowy pseudonim"
 
-#: ../actions/newnotice.php:87
+#: ../actions/newnotice.php:100
 msgid "New notice"
 msgstr "Nowy wpis"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
+#: ../actions/password.php:41 ../actions/recoverpassword.php:164
 msgid "New password"
 msgstr "Nowe hasło"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:275
 msgid "New password successfully saved. You are now logged in."
 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:97 ../actions/profilesettings.php:41
+#: ../actions/register.php:175
 msgid "Nickname"
 msgstr "Pseudonim"
 
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69
+#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:99
+#: ../actions/register.php:59
 msgid "Nickname already in use. Try another one."
 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:165 ../actions/profilesettings.php:80
+#: ../actions/register.php:57 ../actions/updateprofile.php:76
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Pseudonim musi zawierać tylko małe litery i cyfry, bez znaków spacji."
 
@@ -1077,53 +717,30 @@ msgstr "Pseudonim niedozwolony."
 msgid "Nickname of the user you want to follow"
 msgstr "Pseudonim użytkownika którego chcesz obserwować"
 
-#: ../actions/recoverpassword.php:162
+#: ../actions/recoverpassword.php:147
 msgid "Nickname or email"
 msgstr "Pseudonim lub e-mail"
 
-#: ../actions/deletenotice.php:59
-msgid "No"
-msgstr ""
-
-#: ../actions/imsettings.php:156
+#: ../actions/imsettings.php:147
 msgid "No Jabber ID."
 msgstr "Brak identyfikatora Jabbera."
 
-#: ../actions/userauthorization.php:129
+#: ../actions/userauthorization.php:128
 msgid "No authorization request!"
 msgstr "Brak żądania autoryzacji!"
 
-#: ../actions/smssettings.php:181
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316
-#, fuzzy
-msgid "No code entered"
-msgstr "Brak zawartości!"
-
 #: ../actions/confirmaddress.php:33
 msgid "No confirmation code."
 msgstr "Brak kodu potwierdzajÄ…cego."
 
-#: ../actions/newnotice.php:44
+#: ../actions/newnotice.php:49
 msgid "No content!"
 msgstr "Brak zawartości!"
 
-#: ../actions/emailsettings.php:174
-#, fuzzy
-msgid "No email address."
-msgstr "Adres e-mailowy"
-
-#: ../actions/userbyid.php:32
+#: ../actions/userbyid.php:27
 msgid "No id."
 msgstr "Brak identyfikatora."
 
-#: ../actions/emailsettings.php:271
-#, fuzzy
-msgid "No incoming email address."
-msgstr "Niewłaściwy adres e-mailowy."
-
 #: ../actions/finishremotesubscribe.php:65
 msgid "No nickname provided by remote server."
 msgstr "Zdalny serwer nie wysłał pseudonimu."
@@ -1132,25 +749,19 @@ msgstr "Zdalny serwer nie wysłał pseudonimu."
 msgid "No nickname."
 msgstr "Brak pseudonimu."
 
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229
+#: ../actions/imsettings.php:197
 msgid "No pending confirmation to cancel."
 msgstr "Brak oczekujących potwierdzeń do anulowania."
 
-#: ../actions/smssettings.php:176
-#, fuzzy
-msgid "No phone number."
-msgstr "Brak takiego użytkownika."
-
 #: ../actions/finishremotesubscribe.php:72
 msgid "No profile URL returned by server."
 msgstr "Serwer nie zwrócił żadnego URL-a."
 
-#: ../actions/recoverpassword.php:226
+#: ../actions/recoverpassword.php:189
 msgid "No registered email address for that user."
 msgstr "Brak zarejestrowanych adresów e-mailowych dla tego użytkownika."
 
-#: ../actions/userauthorization.php:49
+#: ../actions/userauthorization.php:48
 msgid "No request found!"
 msgstr "Nie znaleziono żądania!"
 
@@ -1162,14 +773,6 @@ msgstr "Brak wyników"
 msgid "No size."
 msgstr "Zerowy rozmiar."
 
-#: ../actions/twitapistatuses.php:595
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555
-msgid "No status with that ID found."
-msgstr ""
-
 #: ../actions/openidsettings.php:135
 msgid "No such OpenID."
 msgstr "Brak takiego identyfikatora OpenID."
@@ -1178,8 +781,7 @@ msgstr "Brak takiego identyfikatora OpenID."
 msgid "No such document."
 msgstr "Brak takiego dokumentu."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30
+#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
 msgid "No such notice."
 msgstr "Brak takiego wpisu."
 
@@ -1192,21 +794,16 @@ msgid "No such subscription"
 msgstr "Nie ma takiej obserwacji"
 
 #: ../actions/all.php:34 ../actions/allrss.php:35
-#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
-#: ../actions/remotesubscribe.php:84 ../actions/remotesubscribe.php:91
-#: ../actions/replies.php:57 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:110 ../actions/userbyid.php:36
-#: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
-#: ../lib/subs.php:33 ../lib/subs.php:82
+#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:36
+#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
+#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
+#: ../actions/showstream.php:95 ../actions/subscribe.php:43
+#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
+#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
 msgid "No such user."
 msgstr "Brak takiego użytkownika."
 
-#: ../actions/recoverpassword.php:211
-#, fuzzy
-msgid "No user with that email address or username."
-msgstr "Brak zarejestrowanych adresów e-mailowych dla tego użytkownika."
-
-#: ../lib/gallery.php:80
+#: ../lib/gallery.php:76
 msgid "Nobody to show!"
 msgstr "Nie ma kogo pokazać!"
 
@@ -1214,18 +811,7 @@ msgstr "Nie ma kogo pokazać!"
 msgid "Not a recovery code."
 msgstr "To nie jest kod przywracania."
 
-#: ../scripts/maildaemon.php:50
-#, fuzzy
-msgid "Not a registered user."
-msgstr "To nie jest kod przywracania."
-
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332
-#, fuzzy
-msgid "Not a supported data format."
-msgstr "Nieobsługiwany format pliku obrazu."
-
-#: ../actions/imsettings.php:167
+#: ../actions/imsettings.php:158
 msgid "Not a valid Jabber ID"
 msgstr "Niepoprawny identyfikator Jabbera"
 
@@ -1233,24 +819,19 @@ msgstr "Niepoprawny identyfikator Jabbera"
 msgid "Not a valid OpenID."
 msgstr "Niepoprawny identyfikator OpenID."
 
-#: ../actions/emailsettings.php:185
-#, fuzzy
-msgid "Not a valid email address"
-msgstr "Niewłaściwy adres e-mailowy."
-
-#: ../actions/register.php:63
+#: ../actions/profilesettings.php:75 ../actions/register.php:53
 msgid "Not a valid email address."
 msgstr "Niewłaściwy adres e-mailowy."
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
+#: ../actions/profilesettings.php:83 ../actions/register.php:61
 msgid "Not a valid nickname."
 msgstr "Niewłaściwy pseudonim."
 
-#: ../actions/remotesubscribe.php:120
+#: ../actions/remotesubscribe.php:118
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "Błędny URL profilu (niepoprawne usługi)"
 
-#: ../actions/remotesubscribe.php:113
+#: ../actions/remotesubscribe.php:111
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "Błędny URL profilu (nie zdefiniowany XRDS)"
 
@@ -1270,27 +851,16 @@ msgstr "Brak autoryzacji."
 msgid "Not expecting this response!"
 msgstr "Nieoczekiwana odpowiedź!"
 
-#: ../actions/twitapistatuses.php:422
-#, fuzzy
-msgid "Not found"
-msgstr "Nie znaleziono żądania!"
-
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:28
-#: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
-#: ../lib/settingsaction.php:27
+#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
+#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
+#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
 msgid "Not logged in."
 msgstr "Niezalogowany."
 
-#: ../lib/subs.php:91
+#: ../actions/unsubscribe.php:43
 msgid "Not subscribed!."
 msgstr "Nie obserwujesz!."
 
-#: ../actions/opensearch.php:35
-#, fuzzy
-msgid "Notice Search"
-msgstr "Szukaj"
-
 #: ../actions/showstream.php:82
 #, php-format
 msgid "Notice feed for %s"
@@ -1300,20 +870,15 @@ msgstr "Kanał wpisów dla %s"
 msgid "Notice has no profile"
 msgstr "Wpis nie ma przypisanego profilu"
 
-#: ../actions/showstream.php:316
+#: ../actions/showstream.php:297
 msgid "Notices"
 msgstr "Wpisy"
 
-#: ../actions/tag.php:35 ../actions/tag.php:81
-#, fuzzy, php-format
-msgid "Notices tagged with %s"
-msgstr "Kanał wpisów dla %s"
-
 #: ../actions/password.php:39
 msgid "Old password"
 msgstr "Stare hasło"
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314
+#: ../lib/util.php:288
 msgid "OpenID"
 msgstr "OpenID"
 
@@ -1356,105 +921,74 @@ msgstr "Usunięto identyfikator OpenID."
 msgid "OpenID settings"
 msgstr "Ustawienia OpenID"
 
-#: ../actions/invite.php:135
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
 #: ../actions/avatar.php:84
 msgid "Partial upload."
 msgstr "Częściowa wysyłka."
 
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
-#: ../actions/register.php:153 ../lib/settingsaction.php:93
+#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
+#: ../actions/register.php:177
 msgid "Password"
 msgstr "Hasło"
 
-#: ../actions/recoverpassword.php:288
+#: ../actions/recoverpassword.php:249
 msgid "Password and confirmation do not match."
 msgstr "Hasło i jego potwierdzenie nie pasują do siebie."
 
-#: ../actions/recoverpassword.php:284
+#: ../actions/recoverpassword.php:245
 msgid "Password must be 6 chars or more."
 msgstr "Hasło musi mieć 6 lub więcej znaków."
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
 msgid "Password recovery requested"
 msgstr "Zażądano odzyskania hasła"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: ../actions/password.php:89 ../actions/recoverpassword.php:274
 msgid "Password saved."
 msgstr "Hasło zostało zapisane."
 
-#: ../actions/password.php:61 ../actions/register.php:88
+#: ../actions/password.php:61 ../actions/register.php:65
 msgid "Passwords don't match."
 msgstr "Podane hasła nie pasują do siebie."
 
-#: ../lib/searchaction.php:100
-#, fuzzy
-msgid "People"
-msgstr "Szukaj ludzi"
-
-#: ../actions/opensearch.php:33
-#, fuzzy
-msgid "People Search"
-msgstr "Szukaj ludzi"
-
 #: ../actions/peoplesearch.php:33
 msgid "People search"
 msgstr "Szukaj ludzi"
 
-#: ../lib/stream.php:50
+#: ../lib/stream.php:44
 msgid "Personal"
 msgstr "Osobiste"
 
-#: ../actions/invite.php:133
-#, fuzzy
-msgid "Personal message"
-msgstr "Osobiste"
-
-#: ../actions/smssettings.php:69
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "Max. 64 znaki alfanumeryczne, bez spacji i znaków przestankowych"
-
-#: ../actions/userauthorization.php:78
+#: ../actions/userauthorization.php:77
 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 \"Cancel\"."
 msgstr ""
 "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\"."
+"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
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Utwórz wpis kiedy zmieni się status na komunikatorze."
 
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94
+#: ../actions/imsettings.php:68
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163
+#: ../actions/imsettings.php:135
 msgid "Preferences saved."
 msgstr "Preferencje zostały zapisane."
 
-#: ../actions/profilesettings.php:57
-#, fuzzy
-msgid "Preferred language"
-msgstr "Preferencje"
-
-#: ../lib/util.php:328
+#: ../lib/util.php:300
 msgid "Privacy"
 msgstr "Prywatność"
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106
+#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
 msgid "Problem saving notice."
 msgstr "Problem z zachowywaniem wpisu."
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60
+#: ../lib/stream.php:54
 msgid "Profile"
 msgstr "Profil"
 
@@ -1466,10 +1000,14 @@ msgstr "URL profilu"
 msgid "Profile settings"
 msgstr "Ustawienia profilu"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
 msgid "Profile unknown"
 msgstr "Nieznany profil"
 
+#: ../lib/util.php:276
+msgid "Public"
+msgstr "Publiczny"
+
 #: ../actions/public.php:54
 msgid "Public Stream Feed"
 msgstr "Publiczny Kanał Strumieni"
@@ -1478,25 +1016,11 @@ msgstr "Publiczny Kanał Strumieni"
 msgid "Public timeline"
 msgstr "Publiczna oÅ› czasu"
 
-#: ../actions/imsettings.php:79
-#, fuzzy
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Potwierdzone adresy Jabbera/GTalka"
-
-#: ../actions/emailsettings.php:94
-#, fuzzy
-msgid "Publish a MicroID for my email address."
-msgstr "Podaj pseudonim lub adres e-mailowy"
-
-#: ../actions/tag.php:75 ../actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
-
-#: ../actions/recoverpassword.php:166
+#: ../actions/recoverpassword.php:151
 msgid "Recover"
 msgstr "Przywróć"
 
-#: ../actions/recoverpassword.php:156
+#: ../actions/recoverpassword.php:141
 msgid "Recover password"
 msgstr "Odzyskiwanie hasła"
 
@@ -1504,28 +1028,19 @@ msgstr "Odzyskiwanie hasła"
 msgid "Recovery code for unknown user."
 msgstr "Kod przywracający dla nieznanego użytkownika."
 
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: ../actions/register.php:171 ../actions/register.php:195 ../lib/util.php:287
 msgid "Register"
 msgstr "Zarejestruj"
 
-#: ../actions/register.php:28
-#, fuzzy
-msgid "Registration not allowed."
-msgstr "Pseudonim niedozwolony."
-
-#: ../actions/register.php:200
-msgid "Registration successful"
-msgstr ""
-
-#: ../actions/userauthorization.php:120
+#: ../actions/userauthorization.php:119
 msgid "Reject"
 msgstr "Odrzuć"
 
-#: ../actions/login.php:103 ../actions/register.php:176
+#: ../actions/login.php:99 ../actions/register.php:183
 msgid "Remember me"
 msgstr "Pamiętaj mnie"
 
-#: ../actions/updateprofile.php:70
+#: ../actions/updateprofile.php:69
 msgid "Remote profile with no matching profile"
 msgstr "Zdalny profil bez odpowiadajÄ…cego profilu lokalnego"
 
@@ -1533,9 +1048,7 @@ msgstr "Zdalny profil bez odpowiadajÄ…cego profilu lokalnego"
 msgid "Remote subscribe"
 msgstr "Zdalna subskrypcja"
 
-#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
-#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
 msgid "Remove"
 msgstr "Usuń"
 
@@ -1548,59 +1061,35 @@ 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 konta OpenID uniemożliwi dalsze logowanie! Jeśli musisz "
-"je usunąć dodaj wcześniej jakieś 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/stream.php:49
 msgid "Replies"
 msgstr "Odpowiedzi"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
 #, php-format
 msgid "Replies to %s"
 msgstr "Odpowiedzi na %s"
 
-#: ../actions/recoverpassword.php:183
+#: ../actions/recoverpassword.php:168
 msgid "Reset"
 msgstr "Wyzeruj"
 
-#: ../actions/recoverpassword.php:173
+#: ../actions/recoverpassword.php:158
 msgid "Reset password"
 msgstr "Ustaw ponownie hasło"
 
-#: ../lib/settingsaction.php:99
-msgid "SMS"
-msgstr ""
-
-#: ../actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
-
-#: ../actions/smssettings.php:33
-#, fuzzy
-msgid "SMS Settings"
-msgstr "Ustawienia komunikatora"
-
-#: ../lib/mail.php:219
-#, fuzzy
-msgid "SMS confirmation"
-msgstr "Brak kodu potwierdzajÄ…cego."
-
-#: ../actions/recoverpassword.php:182
+#: ../actions/recoverpassword.php:167 ../actions/register.php:180
 msgid "Same as password above"
 msgstr "Takie samo jak hasło wprowadzone powyżej"
 
-#: ../actions/register.php:156
-#, fuzzy
-msgid "Same as password above. Required."
-msgstr "Takie samo jak hasło wprowadzone powyżej"
-
-#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
-#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
+#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
 msgid "Save"
 msgstr "Zapisz"
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300
+#: ../lib/searchaction.php:73 ../lib/util.php:277
 msgid "Search"
 msgstr "Szukaj"
 
@@ -1627,50 +1116,22 @@ msgstr ""
 "nazwiska, miejscowości lub zainteresowania. Użyj spacji aby oddzielić "
 "elementy wyszukiwania. Słowa muszą mieć minimum 3 znaki."
 
-#: ../actions/smssettings.php:296
-msgid "Select a carrier"
-msgstr ""
-
-#: ../actions/invite.php:137 ../lib/util.php:1172
+#: ../lib/util.php:982
 msgid "Send"
 msgstr "Wyślij"
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
-msgstr ""
-
-#: ../actions/emailsettings.php:88
-#, fuzzy
-msgid "Send me notices of new subscriptions through email."
-msgstr "Wysyłaj mi wpisy przez Jabbera/GTalka"
-
-#: ../actions/imsettings.php:70
+#: ../actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Wysyłaj mi wpisy przez Jabbera/GTalka"
 
-#: ../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
-#, fuzzy
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr "Wysyłaj mi wpisy przez Jabbera/GTalka"
-
-#: ../lib/util.php:304
+#: ../lib/util.php:282
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: ../actions/profilesettings.php:192
+#: ../actions/profilesettings.php:183
 msgid "Settings saved."
 msgstr "Ustawienia zostały zapisane."
 
-#: ../actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
 #: ../actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr "Ktoś inny posługuje się już tym identyfikatorem OpenID."
@@ -1679,45 +1140,36 @@ msgstr "Ktoś inny posługuje się już tym identyfikatorem OpenID."
 msgid "Something weird happened."
 msgstr "Stało się coś dziwnego."
 
-#: ../scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54
-#, fuzzy
-msgid "Sorry, that is not your incoming email address."
-msgstr "To jest błędny adres komunikatora."
-
-#: ../lib/util.php:330
+#: ../lib/util.php:302
 msgid "Source"
 msgstr "Kod źródłowy"
 
-#: ../actions/showstream.php:296
+#: ../actions/showstream.php:277
 msgid "Statistics"
 msgstr "Statystyki"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
 msgid "Stored OpenID not found."
 msgstr "Nie znaleziono zapisanego konta OpenID."
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197
+#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
+#: ../actions/showstream.php:181
 msgid "Subscribe"
 msgstr "Subskrybuj"
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: ../actions/showstream.php:294 ../actions/subscribers.php:27
 msgid "Subscribers"
 msgstr "Subskrybenci"
 
-#: ../actions/userauthorization.php:310
+#: ../actions/userauthorization.php:309
 msgid "Subscription authorized"
 msgstr "Subskrypcja uwierzytelniona"
 
-#: ../actions/userauthorization.php:320
+#: ../actions/userauthorization.php:319
 msgid "Subscription rejected"
 msgstr "Subskrypcja odrzucona"
 
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
+#: ../actions/showstream.php:212 ../actions/showstream.php:288
 #: ../actions/subscriptions.php:27
 msgid "Subscriptions"
 msgstr "Subskrypcje"
@@ -1726,14 +1178,6 @@ msgstr "Subskrypcje"
 msgid "System error uploading file."
 msgstr "Błąd systemowy podczas wysyłania pliku."
 
-#: ../actions/tag.php:41 ../lib/util.php:301
-msgid "Tags"
-msgstr ""
-
-#: ../lib/searchaction.php:104
-msgid "Text"
-msgstr ""
-
 #: ../actions/noticesearch.php:34
 msgid "Text search"
 msgstr "Szukaj tekstu"
@@ -1750,95 +1194,55 @@ msgstr "Ten adres został już potwierdzony"
 msgid "That confirmation code is not for you!"
 msgstr "Ten kod potwierdzajÄ…cy nie jest przeznaczony dla Ciebie!"
 
-#: ../actions/emailsettings.php:191
-#, fuzzy
-msgid "That email address already belongs to another user."
-msgstr "Identyfikator Jabbera należy już do innego użytkownika."
-
 #: ../actions/avatar.php:80
 msgid "That file is too big."
 msgstr "Ten plik jest za duży."
 
-#: ../actions/imsettings.php:170
+#: ../actions/imsettings.php:161
 msgid "That is already your Jabber ID."
 msgstr "Ten identyfikator Jabbera jest już do Ciebie przypisany."
 
-#: ../actions/emailsettings.php:188
-#, fuzzy
-msgid "That is already your email address."
-msgstr "Ten identyfikator Jabbera jest już do Ciebie przypisany."
-
-#: ../actions/smssettings.php:188
-#, fuzzy
-msgid "That is already your phone number."
-msgstr "Ten identyfikator Jabbera jest już do Ciebie przypisany."
-
-#: ../actions/imsettings.php:233
+#: ../actions/imsettings.php:224
 msgid "That is not your Jabber ID."
 msgstr "To nie jest Twój identyfikator Jabbera."
 
-#: ../actions/emailsettings.php:249
-#, fuzzy
-msgid "That is not your email address."
-msgstr "To jest błędny adres komunikatora."
-
-#: ../actions/smssettings.php:257
-#, fuzzy
-msgid "That is not your phone number."
-msgstr "To nie jest Twój identyfikator Jabbera."
-
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
+#: ../actions/imsettings.php:201
 msgid "That is the wrong IM address."
 msgstr "To jest błędny adres komunikatora."
 
-#: ../actions/smssettings.php:233
-#, fuzzy
-msgid "That is the wrong confirmation number."
-msgstr "To jest błędny adres komunikatora."
-
-#: ../actions/smssettings.php:191
-#, fuzzy
-msgid "That phone number already belongs to another user."
-msgstr "Identyfikator Jabbera należy już do innego użytkownika."
-
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: ../actions/newnotice.php:52
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "Wpis za długi. Maksymalna długość to 140 znaków."
 
-#: ../actions/twitapiaccount.php:74
-#, fuzzy
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "Wpis za długi. Maksymalna długość to 140 znaków."
-
-#: ../actions/confirmaddress.php:92
+#: ../actions/confirmaddress.php:86
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Skojarzony z Twoim kontem adres \"%s\" został potwierdzony."
 
-#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274
+#: ../actions/imsettings.php:241
 msgid "The address was removed."
 msgstr "Adres został usunięty."
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:311
 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 ""
-"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:"
+"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:321
 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 ""
-"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."
+"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
 #, php-format
@@ -1858,12 +1262,7 @@ msgstr "Ludzie, których wpisy obserwuje użytkownik %s."
 msgid "These are the people whose notices you listen to."
 msgstr "Ludzie których wpisy obserwujesz."
 
-#: ../actions/invite.php:89
-msgid ""
-"These people are already users and you were automatically subscribed to them:"
-msgstr ""
-
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:87
 msgid "This confirmation code is too old. Please start again."
 msgstr "Kod potwierdzajÄ…cy jest przeterminowany. Zacznij jeszcze raz."
 
@@ -1872,8 +1271,8 @@ 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 "
-"kliknij Wyślij, aby przejść do Twojego 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
 #, php-format
@@ -1882,47 +1281,28 @@ 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ę 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."
+"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
-msgid "This method requires a POST or DELETE."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381
-msgid "This method requires a POST."
-msgstr ""
-
-#: ../lib/util.php:164
+#: ../lib/util.php:147
 msgid "This page is not available in a media type you accept"
 msgstr "Ta strona nie jest dostępna dla medium, którego typ akceptujesz"
 
-#: ../actions/profilesettings.php:63
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107
-msgid "Timezone not selected."
-msgstr ""
-
 #: ../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."
+"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 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."
+"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
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
-
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: ../actions/profilesettings.php:51
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL Twojej strony domowej, bloga, lub profilu na innej stronie"
 
@@ -1930,24 +1310,19 @@ msgstr "URL Twojej strony domowej, bloga, lub profilu na innej stronie"
 msgid "URL of your profile on another compatible microblogging service"
 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
+#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
 msgid "Unexpected form submission."
 msgstr "Nieoczekiwane przesłanie formularza."
 
-#: ../actions/recoverpassword.php:276
+#: ../actions/recoverpassword.php:237
 msgid "Unexpected password reset."
 msgstr "Nieoczekiwane wyzerowanie hasła."
 
-#: ../index.php:57
-msgid "Unknown action"
-msgstr ""
-
 #: ../actions/finishremotesubscribe.php:58
 msgid "Unknown version of OMB protocol."
 msgstr "Nieznana wersja protokołu OMB."
 
-#: ../lib/util.php:269
+#: ../lib/util.php:245
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
@@ -1960,11 +1335,11 @@ msgstr ""
 msgid "Unrecognized address type %s"
 msgstr "Nierozpoznany typ adresu %s"
 
-#: ../actions/showstream.php:209
+#: ../actions/showstream.php:193
 msgid "Unsubscribe"
 msgstr "Zrezygnuj z subskrypcji"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
 msgid "Unsupported OMB version"
 msgstr "Nieobsługiwana wersja OMB"
 
@@ -1972,24 +1347,6 @@ msgstr "Nieobsługiwana wersja OMB"
 msgid "Unsupported image file format."
 msgstr "Nieobsługiwany format pliku obrazu."
 
-#: ../lib/settingsaction.php:100
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:241
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:341
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
 #: ../actions/avatar.php:68
 msgid "Upload"
 msgstr "Wyślij"
@@ -2002,22 +1359,12 @@ msgid ""
 "share."
 msgstr ""
 "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
-#, fuzzy
-msgid "Upload a new profile image"
-msgstr "Nie można zapisać informacji o nowym profilu"
-
-#: ../actions/invite.php:114
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
-msgstr ""
+"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."
 
-#: ../actions/register.php:159 ../actions/register.php:162
+#: ../actions/profilesettings.php:48 ../actions/register.php:182
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Używane tylko do aktualizacji, ogłoszeń i przywracania hasła"
 
@@ -2026,10 +1373,8 @@ msgid "User being listened to doesn't exist."
 msgstr "Obserwowany użytkownik nie istnieje."
 
 #: ../actions/all.php:41 ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:47 ../actions/replies.php:41
-#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
-#: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
-#: ../actions/twitapiusers.php:82
+#: ../actions/foaf.php:43 ../actions/replies.php:41
+#: ../actions/showstream.php:44
 msgid "User has no profile."
 msgstr "Użytkownik nie ma profilu."
 
@@ -2037,92 +1382,62 @@ msgstr "Użytkownik nie ma profilu."
 msgid "User nickname"
 msgstr "Pseudonim użytkownika"
 
-#: ../actions/twitapiusers.php:75
-#, fuzzy
-msgid "User not found."
-msgstr "Nie znaleziono zapisanego konta OpenID."
-
-#: ../actions/profilesettings.php:63
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../lib/util.php:1159
+#: ../lib/util.php:969
 #, php-format
 msgid "What's up, %s?"
 msgstr "Co słychać, %s?"
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: ../actions/profilesettings.php:57
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Gdzie jesteÅ›? (np. \"miasto, region, kraj\")"
 
-#: ../actions/updateprofile.php:128
+#: ../actions/updateprofile.php:127
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Nieprawidłowy typ obrazu dla '%s'"
 
-#: ../actions/updateprofile.php:123
+#: ../actions/updateprofile.php:122
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Nieprawidłowy rozmiar obrazu dla '%s'"
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-msgid "Yes"
-msgstr ""
-
 #: ../actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr "Już masz ten identyfikator OpenID!"
 
-#: ../actions/deletenotice.php:37
-msgid ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
-msgstr ""
-
 #: ../actions/recoverpassword.php:31
 msgid "You are already logged in!"
 msgstr "Nie musisz ponownie się logować!"
 
-#: ../actions/invite.php:81
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr ""
-
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
 msgstr "Tu możesz zmienić hasło. Wybierz porządne!"
 
-#: ../actions/register.php:135
+#: ../actions/register.php:164
 msgid "You can create a new account to start posting notices."
 msgstr "Możesz utworzyć nowe konto, aby rozpocząć wysyłanie wpisów."
 
-#: ../actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
-"Możesz usunąć łączność z serwerem OpenID ze swojego konta klikając \"Usuń\"."
+"Możesz usunąć łączność z serwerem OpenID ze swojego konta klikając "
+"\"Usuń\"."
 
 #: ../actions/imsettings.php:28
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
-"Możesz wysyłać i odbierać wpisy przez komunikator Jabber/GTalk (%%doc.im%%). "
-"Poniżej możesz skonfigurować swój adres i ustawienia IM."
+"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
 msgid ""
-"You can update your personal profile info here so people know more about you."
+"You can update your personal profile info here so people know more about "
+"you."
 msgstr ""
 "W tym miejscu możesz zaktualizować informacje zawarte w Twoim osobistym "
 "profilu, aby inni mogli lepiej Cię poznać."
@@ -2131,44 +1446,17 @@ msgstr ""
 msgid "You can use the local subscription!"
 msgstr "Możesz skorzystać z lokalnej subskrypcji!"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
 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."
+"Nie możesz się zarejestrować, jeśli nie zgadzasz się z warunkami "
+"licencji."
 
-#: ../actions/updateprofile.php:63
+#: ../actions/updateprofile.php:62
 msgid "You did not send us that profile"
 msgstr "Ten profil nie był wysłany przez Ciebie"
 
-#: ../lib/mail.php:147
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
-"Send email to %2$s to post new messages.\n"
-"\n"
-"More email instructions at %3$s.\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:612
-msgid "You may not delete another user's status."
-msgstr ""
-
-#: ../actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr ""
-
-#: ../actions/invite.php:103
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
-
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:134
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Identyfikacja pomyślna. Wprowadź poniżej nowe hasło."
 
@@ -2176,10 +1464,11 @@ msgstr "Identyfikacja pomyślna. Wprowadź poniżej nowe hasło."
 msgid "Your OpenID URL"
 msgstr "URL Twojej usługi OpenID"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:149
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
-"Twój pseudonim na tym serwerze lub adres e-mailowy użyty podczas rejestracji."
+"Twój pseudonim na tym serwerze lub adres e-mailowy użyty podczas "
+"rejestracji."
 
 #: ../actions/openidsettings.php:28
 #, php-format
@@ -2191,61 +1480,57 @@ msgstr ""
 "wykorzystaniem jednego konta użytkownika. Tu możesz zarządzać swoimi "
 "identyfikatorami OpenID."
 
-#: ../lib/util.php:943
+#: ../lib/util.php:814
 msgid "a few seconds ago"
 msgstr "kilka sekund temu"
 
-#: ../lib/util.php:955
+#: ../lib/util.php:826
 #, php-format
 msgid "about %d days ago"
 msgstr "około %d dni temu"
 
-#: ../lib/util.php:951
+#: ../lib/util.php:822
 #, php-format
 msgid "about %d hours ago"
 msgstr "około %d godzin temu"
 
-#: ../lib/util.php:947
+#: ../lib/util.php:818
 #, php-format
 msgid "about %d minutes ago"
 msgstr "około %d minut temu"
 
-#: ../lib/util.php:959
+#: ../lib/util.php:830
 #, php-format
 msgid "about %d months ago"
 msgstr "około %d miesięcy temu"
 
-#: ../lib/util.php:953
+#: ../lib/util.php:824
 msgid "about a day ago"
 msgstr "blisko dzień temu"
 
-#: ../lib/util.php:945
+#: ../lib/util.php:816
 msgid "about a minute ago"
 msgstr "blisko minutÄ™ temu"
 
-#: ../lib/util.php:957
+#: ../lib/util.php:828
 msgid "about a month ago"
 msgstr "blisko miesiÄ…c temu"
 
-#: ../lib/util.php:961
+#: ../lib/util.php:832
 msgid "about a year ago"
 msgstr "blisko rok temu"
 
-#: ../lib/util.php:949
+#: ../lib/util.php:820
 msgid "about an hour ago"
 msgstr "blisko godzinÄ™ temu"
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-msgid "delete"
-msgstr ""
-
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117
+#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
+#: ../lib/stream.php:101
 msgid "in reply to..."
 msgstr "w odpowiedzi na…"
 
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124
+#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
+#: ../lib/stream.php:108
 msgid "reply"
 msgstr "odpowiedź"
 
@@ -2253,23 +1538,1311 @@ msgstr "odpowiedź"
 msgid "same as password above"
 msgstr "takie samo hasło jak powyżej"
 
-#: ../actions/twitapistatuses.php:755
-#, fuzzy
-msgid "unsupported file type"
-msgstr "Nieobsługiwany format pliku obrazu."
-
-#: ../lib/util.php:1309
+#: ../lib/util.php:1127
 msgid "« After"
 msgstr "« następne"
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "Nie można potwierdzić e-maila."
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+msgid " from "
+msgstr ""
 
-#~ msgid "Couldn't create subscription."
-#~ msgstr "Nie można obserwować."
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
 
-#~ msgid "Error inserting notice"
-#~ msgstr "BÅ‚Ä…d przy wprowadzaniu wpisu"
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
+
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#, php-format
+msgid "%s public timeline"
+msgstr ""
+
+#: ../lib/mail.php:206 lib/mail.php:212
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/register.php:154 actions/register.php:168
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55
+msgid "API method not found!"
+msgstr ""
+
+#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
+#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
+#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
+#: ../actions/twitapidirect_messages.php:49
+#: ../actions/twitapidirect_messages.php:56
+#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
+#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
+#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
+#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
+#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
+#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
+#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
+#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
+#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
+#: actions/twitapistatuses.php:690
+msgid "API method under construction."
+msgstr ""
+
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
 
-#~ msgid "Public"
-#~ msgstr "Publiczny"
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
+
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for "
+"non-humans)"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
+
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr ""
+
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+msgid "Change email handling"
+msgstr ""
+
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+msgid "Change your profile settings"
+msgstr ""
+
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+msgid "Could not follow user: User not found."
+msgstr ""
+
+#: ../lib/subs.php:54 lib/subs.php:61
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: ../lib/subs.php:46 lib/subs.php:46
+msgid "Could not subscribe."
+msgstr ""
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+msgid "Couldn't update user record."
+msgstr ""
+
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr ""
+
+#: ../classes/Notice.php:72 classes/Notice.php:86
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr ""
+
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr ""
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr ""
+
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: ../actions/tag.php:55 actions/tag.php:55
+#, php-format
+msgid "Feed for tag %s"
+msgstr ""
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr ""
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr ""
+
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+msgid "I want to post notices by email."
+msgstr ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+msgid "IM"
+msgstr ""
+
+#: ../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
+msgid "Incoming email"
+msgstr ""
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+msgid "Incoming email address removed."
+msgstr ""
+
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Language"
+msgstr ""
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+msgid "Language is too long (max 50 chars)."
+msgstr ""
+
+#: ../actions/register.php:166 actions/register.php:180
+msgid "Longer name, preferably your \"real\" name"
+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 ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr ""
+
+#: ../lib/mail.php:144 lib/mail.php:144
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+msgid "New incoming email address added."
+msgstr ""
+
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+msgid "No"
+msgstr ""
+
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr ""
+
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+msgid "No email address."
+msgstr ""
+
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+msgid "No incoming email address."
+msgstr ""
+
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+msgid "No status with that ID found."
+msgstr ""
+
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+msgid "Not a registered user."
+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
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+msgid "Not found"
+msgstr ""
+
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr ""
+
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
+
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr ""
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr ""
+
+#: ../actions/invite.php:133 actions/invite.php:141
+msgid "Personal message"
+msgstr ""
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Preferred language"
+msgstr ""
+
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/register.php:28 actions/register.php:28
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+msgid "Registration successful"
+msgstr ""
+
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/register.php:156 actions/register.php:170
+msgid "Same as password above. Required."
+msgstr ""
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr ""
+
+#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
+#: actions/emailsettings.php:74 actions/smssettings.php:82
+msgid "Send email to this address to post new notices."
+msgstr ""
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../actions/tag.php:60 actions/tag.php:60
+msgid "Showing most popular tags from the last week"
+msgstr ""
+
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317
+msgid "Tags"
+msgstr ""
+
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
+msgid "Text"
+msgstr ""
+
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+msgid "That is not your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+msgid "That is not your phone number."
+msgstr ""
+
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/invite.php:89 actions/invite.php:96
+msgid ""
+"These people are already users and you were automatically subscribed to "
+"them:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511
+msgid "This method requires a POST or 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
+msgid "This method requires a POST."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+msgid "Timezone not selected."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+msgid "Two user ids or screen_names must be supplied."
+msgstr ""
+
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this "
+"service."
+msgstr ""
+
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+msgid "Yes"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+msgid "You are not friends with the specified user."
+msgstr ""
+
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr ""
+
+#: ../actions/invite.php:103 actions/invite.php:110
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
+msgstr ""
+
+#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99
+msgid "delete"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+msgid "unsupported file type"
+msgstr ""
+
+#: actions/deletenotice.php:74 actions/disfavor.php:43
+#: actions/emailsettings.php:127 actions/favor.php:45
+#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
+#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
+#: actions/openidsettings.php:123 actions/profilesettings.php:47
+#: actions/recoverpassword.php:282 actions/register.php:42
+#: actions/remotesubscribe.php:40 actions/smssettings.php:124
+#: actions/subscribe.php:44 actions/twittersettings.php:97
+#: actions/unsubscribe.php:41 actions/userauthorization.php:35
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/disfavor.php:55
+msgid "This notice is not a favorite!"
+msgstr ""
+
+#: actions/disfavor.php:63
+msgid "Could not delete favorite."
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Favor"
+msgstr ""
+
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+
+#: actions/emailsettings.php:95
+msgid "Send me email when someone sends me a private message."
+msgstr ""
+
+#: actions/favor.php:53 actions/twitapifavorites.php:142
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132
+msgid "Could not create favorite."
+msgstr ""
+
+#: actions/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#, php-format
+msgid "%s favorite notices"
+msgstr ""
+
+#: actions/favoritesrss.php:64
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr ""
+
+#: actions/inbox.php:28
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+
+#: actions/invite.php:178
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+msgstr ""
+
+#: actions/login.php:104
+msgid "Automatically login in the future; "
+msgstr ""
+
+#: actions/login.php:122
+msgid "For security reasons, please re-enter your "
+msgstr ""
+
+#: actions/login.php:126
+msgid "Login with your username and password. "
+msgstr ""
+
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+msgid "That's too long. Max message size is 140 chars."
+msgstr ""
+
+#: actions/newmessage.php:65
+msgid "No recipient specified."
+msgstr ""
+
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206
+msgid "You can't send a message to this user."
+msgstr ""
+
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly "
+"instead."
+msgstr ""
+
+#: actions/newmessage.php:108
+msgid "No such user"
+msgstr ""
+
+#: actions/newmessage.php:117
+msgid "New message"
+msgstr ""
+
+#: actions/noticesearch.php:95
+msgid "Notice without matching profile"
+msgstr ""
+
+#: actions/openidsettings.php:28
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr ""
+
+#: actions/openidsettings.php:46
+msgid "If you want to add an OpenID to your account, "
+msgstr ""
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr ""
+
+#: actions/openidsettings.php:87
+msgid "You can remove an OpenID from your account "
+msgstr ""
+
+#: actions/outbox.php:28
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr ""
+
+#: actions/outbox.php:30
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#: actions/outbox.php:53
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+
+#: actions/peoplesearch.php:28
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+msgstr ""
+
+#: actions/profilesettings.php:27
+msgid "You can update your personal profile info here "
+msgstr ""
+
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+msgid "User without matching profile"
+msgstr ""
+
+#: actions/recoverpassword.php:91
+msgid "This confirmation code is too old. "
+msgstr ""
+
+#: actions/recoverpassword.php:141
+msgid "If you've forgotten or lost your"
+msgstr ""
+
+#: actions/recoverpassword.php:154
+msgid "You've been identified. Enter a "
+msgstr ""
+
+#: actions/recoverpassword.php:169
+msgid "Your nickname on this server, "
+msgstr ""
+
+#: actions/recoverpassword.php:271
+msgid "Instructions for recovering your password "
+msgstr ""
+
+#: actions/recoverpassword.php:327
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95
+msgid "Password must be 6 or more characters."
+msgstr ""
+
+#: actions/register.php:216
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
+msgstr ""
+
+#: actions/register.php:227
+msgid "(You should receive a message by email momentarily, with "
+msgstr ""
+
+#: actions/remotesubscribe.php:51
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
+msgstr ""
+
+#: actions/showfavorites.php:61
+#, php-format
+msgid "Feed for favorites of %s"
+msgstr ""
+
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+msgid "Could not retrieve favorite notices."
+msgstr ""
+
+#: actions/showmessage.php:33
+msgid "No such message."
+msgstr ""
+
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
+msgstr ""
+
+#: actions/showmessage.php:61
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr ""
+
+#: actions/showmessage.php:66
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr ""
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr ""
+
+#: actions/smssettings.php:312
+#, php-format
+msgid "Mobile carrier for your phone. "
+msgstr ""
+
+#: actions/twitapidirect_messages.php:76
+#, php-format
+msgid "Direct messages to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:77
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:81
+msgid "Direct Messages You've Sent"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:82
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:128
+msgid "No message text!"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:138
+msgid "Recipient user not found."
+msgstr ""
+
+#: actions/twitapidirect_messages.php:141
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
+#: actions/twitapifavorites.php:92
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr ""
+
+#: actions/twitapifavorites.php:95
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr ""
+
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#, php-format
+msgid "%s added your notice as a favorite"
+msgstr ""
+
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+msgstr ""
+
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+msgstr ""
+
+#: actions/twittersettings.php:41
+msgid "Twitter settings"
+msgstr ""
+
+#: actions/twittersettings.php:48
+msgid "Twitter Account"
+msgstr ""
+
+#: actions/twittersettings.php:56
+msgid "Current verified Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr ""
+
+#: actions/twittersettings.php:65
+msgid "No spaces, please."
+msgstr ""
+
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr ""
+
+#: actions/twittersettings.php:72
+msgid "Automatically send my notices to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:75
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:78
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+
+#: actions/twittersettings.php:128
+msgid "Could not verify your Twitter credentials!"
+msgstr ""
+
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+msgid "Unable to save your Twitter settings!"
+msgstr ""
+
+#: actions/twittersettings.php:174
+msgid "Twitter settings saved."
+msgstr ""
+
+#: actions/twittersettings.php:192
+msgid "That is not your Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+msgid "Couldn't remove Twitter user."
+msgstr ""
+
+#: actions/twittersettings.php:212
+msgid "Twitter account removed."
+msgstr ""
+
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+msgid "Couldn't save Twitter preferences."
+msgstr ""
+
+#: actions/twittersettings.php:245
+msgid "Twitter preferences saved."
+msgstr ""
+
+#: actions/userauthorization.php:84
+msgid "Please check these details to make sure "
+msgstr ""
+
+#: actions/userauthorization.php:324
+msgid "The subscription has been authorized, but no "
+msgstr ""
+
+#: actions/userauthorization.php:334
+msgid "The subscription has been rejected, but no "
+msgstr ""
+
+#: classes/Channel.php:113
+msgid "Command results"
+msgstr ""
+
+#: classes/Channel.php:148
+msgid "Command complete"
+msgstr ""
+
+#: classes/Channel.php:158
+msgid "Command failed"
+msgstr ""
+
+#: classes/Command.php:39
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: classes/Command.php:96
+#, php-format
+msgid "Subscriptions: %1$s\n"
+msgstr ""
+
+#: classes/Command.php:125 classes/Command.php:242
+msgid "User has no last notice"
+msgstr ""
+
+#: classes/Command.php:146
+msgid "Notice marked as fave."
+msgstr ""
+
+#: classes/Command.php:166
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr ""
+
+#: classes/Command.php:169
+#, php-format
+msgid "Fullname: %s"
+msgstr ""
+
+#: classes/Command.php:172
+#, php-format
+msgid "Location: %s"
+msgstr ""
+
+#: classes/Command.php:175
+#, php-format
+msgid "Homepage: %s"
+msgstr ""
+
+#: classes/Command.php:178
+#, php-format
+msgid "About: %s"
+msgstr ""
+
+#: classes/Command.php:200
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
+
+#: classes/Command.php:214
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
+
+#: classes/Command.php:216
+msgid "Error sending direct message."
+msgstr ""
+
+#: classes/Command.php:263
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: classes/Command.php:270
+#, php-format
+msgid "Subscribed to %s"
+msgstr ""
+
+#: classes/Command.php:288
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
+
+#: classes/Command.php:295
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr ""
+
+#: classes/Command.php:310 classes/Command.php:330
+msgid "Command not yet implemented."
+msgstr ""
+
+#: classes/Command.php:313
+msgid "Notification off."
+msgstr ""
+
+#: classes/Command.php:315
+msgid "Can't turn off notification."
+msgstr ""
+
+#: classes/Command.php:333
+msgid "Notification on."
+msgstr ""
+
+#: classes/Command.php:335
+msgid "Can't turn on notification."
+msgstr ""
+
+#: classes/Command.php:344
+msgid "Commands:\n"
+msgstr ""
+
+#: classes/Message.php:53
+msgid "Could not insert message."
+msgstr ""
+
+#: classes/Message.php:63
+msgid "Could not update message with new URI."
+msgstr ""
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr ""
+
+#: lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:249
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:253
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+msgstr ""
+
+#: lib/mailbox.php:43
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/openid.php:195
+msgid "This form should automatically submit itself. "
+msgstr ""
+
+#: lib/personal.php:65
+msgid "Favorites"
+msgstr ""
+
+#: lib/personal.php:66
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
+#: lib/personal.php:66
+msgid "User"
+msgstr ""
+
+#: lib/personal.php:75
+msgid "Inbox"
+msgstr ""
+
+#: lib/personal.php:76
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personal.php:80
+msgid "Outbox"
+msgstr ""
+
+#: lib/personal.php:81
+msgid "Your sent messages"
+msgstr ""
+
+#: lib/settingsaction.php:99
+msgid "Twitter"
+msgstr ""
+
+#: lib/settingsaction.php:100
+msgid "Twitter integration options"
+msgstr ""
+
+#: lib/util.php:1718
+msgid "To"
+msgstr ""
+
+#: scripts/maildaemon.php:45
+msgid "Could not parse message."
+msgstr ""
diff --git a/locale/pt/LC_MESSAGES/laconica.mo b/locale/pt/LC_MESSAGES/laconica.mo
index 02cadfaa8..bca591d88 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 ec7b73f11..6cb7250ae 100644
--- a/locale/pt/LC_MESSAGES/laconica.po
+++ b/locale/pt/LC_MESSAGES/laconica.po
@@ -1,44 +1,47 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Tiago Faria <gouki@goukihq.org>, 2008.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-27 14:57-0400\n"
+"POT-Creation-Date: 2008-10-13 21:07+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Tiago Faria <gouki@goukihq.org>\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: actions/finishopenidlogin.php:88 actions/register.php:205
 msgid ""
-" except this private data: password, email address, IM address, phone number."
+" 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 ""
 
-#: ../actions/twitapistatuses.php:478
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr ""
 
-#: ../actions/invite.php:168
-#, fuzzy, php-format
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
 msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s está agora a ouvir os seus comunicados em %2$s."
+msgstr ""
 
 #: ../actions/invite.php:170
 #, php-format
@@ -71,10 +74,10 @@ msgid ""
 "Sincerely, %2$s\n"
 msgstr ""
 
-#: ../lib/mail.php:124
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s está agora a ouvir os seus comunicados em %2$s."
+msgstr ""
 
 #: ../lib/mail.php:126
 #, php-format
@@ -87,48 +90,50 @@ msgid ""
 "%4$s.\n"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:482
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
 #, 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:45
 #, php-format
 msgid "%1$s's status on %2$s"
-msgstr "status de %1$s em %2$s"
+msgstr ""
 
-#: ../actions/invite.php:84 ../actions/invite.php:92
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
 #, php-format
 msgid "%s Public Stream"
-msgstr "%s Fluxo Público"
+msgstr ""
 
 #: ../actions/all.php:47 ../actions/allrss.php:60
-#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51
+#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51 actions/all.php:47
+#: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
 #, php-format
 msgid "%s and friends"
-msgstr "%s e amigos"
+msgstr ""
 
-#: ../actions/twitapistatuses.php:49
-#, fuzzy, php-format
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#, php-format
 msgid "%s public timeline"
-msgstr "%s Fluxo Público"
+msgstr ""
 
-#: ../lib/mail.php:206
-#, fuzzy, php-format
+#: ../lib/mail.php:206 lib/mail.php:212
+#, php-format
 msgid "%s status"
-msgstr "status de %1$s em %2$s"
+msgstr ""
 
-#: ../actions/twitapistatuses.php:338
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
 #, php-format
 msgid "%s timeline"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:52
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
@@ -139,59 +144,57 @@ msgid ""
 "to confirm your email address.)"
 msgstr ""
 
-#: ../lib/util.php:257
+#: ../lib/util.php:257 lib/util.php:273
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** is a microblogging service brought to you by "
+"[%%site.broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
 
-#: ../lib/util.php:259
+#: ../lib/util.php:259 lib/util.php:275
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** é um serviço de microblogging. "
+msgstr ""
 
-#: ../lib/util.php:274
+#: ../lib/util.php:274 lib/util.php:290
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ""
-"Colaboradores deverão ser reconhecidos por nome completo ou por apelido."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 letras minúsculas ou números, sem pontuação ou espaços."
+msgstr ""
 
-#: ../actions/register.php:152
-#, fuzzy
+#: ../actions/register.php:152 actions/register.php:166
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64 letras minúsculas ou números, sem pontuação ou espaços."
+msgstr ""
 
-#: ../actions/password.php:42
+#: ../actions/password.php:42 actions/profilesettings.php:181
 msgid "6 or more characters"
-msgstr "6 ou mais caracteres"
+msgstr ""
 
-#: ../actions/recoverpassword.php:180
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
 msgid "6 or more characters, and don't forget it!"
-msgstr "6 ou mais caracteres, e não se esqueça!"
+msgstr ""
 
-#: ../actions/register.php:154
-#, fuzzy
+#: ../actions/register.php:154 actions/register.php:168
 msgid "6 or more characters. Required."
-msgstr "6 ou mais caracteres"
+msgstr ""
 
-#: ../actions/imsettings.php:197
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+"A confirmation code was sent to the IM address you added. You must approve "
+"%s for sending messages to you."
 msgstr ""
 
-#: ../actions/emailsettings.php:213
+#: ../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 ""
 
-#: ../actions/smssettings.php:216
+#: ../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."
@@ -200,7 +203,14 @@ msgstr ""
 #: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
 #: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
 #: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55
 msgid "API method not found!"
 msgstr ""
 
@@ -213,192 +223,210 @@ msgstr ""
 #: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
 #: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
 #: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
+#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
+#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
+#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
+#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
+#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
+#: actions/twitapistatuses.php:690
 msgid "API method under construction."
 msgstr ""
 
-#: ../lib/util.php:324
+#: ../lib/util.php:324 lib/util.php:340
 msgid "About"
-msgstr "Sobre"
+msgstr ""
 
-#: ../actions/userauthorization.php:119
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
 msgid "Accept"
-msgstr "Aceitar"
+msgstr ""
 
 #: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
 #: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: actions/emailsettings.php:63 actions/imsettings.php:64
+#: actions/openidsettings.php:58 actions/smssettings.php:71
+#: actions/twittersettings.php:85
 msgid "Add"
-msgstr "Adicionar"
+msgstr ""
 
-#: ../actions/openidsettings.php:43
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
 msgid "Add OpenID"
-msgstr "Adicionar OpenID"
+msgstr ""
 
-#: ../lib/settingsaction.php:97
-#, fuzzy
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
 msgid "Add or remove OpenIDs"
-msgstr "Adicionar OpenID"
+msgstr ""
 
 #: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
 msgid "Address"
-msgstr "Endereço"
+msgstr ""
 
-#: ../actions/invite.php:131
+#: ../actions/invite.php:131 actions/invite.php:139
 msgid "Addresses of friends to invite (one per line)"
 msgstr ""
 
-#: ../actions/showstream.php:273
+#: ../actions/showstream.php:273 actions/showstream.php:288
 msgid "All subscriptions"
-msgstr "Todas as subscrições"
+msgstr ""
 
-#: ../actions/publicrss.php:64
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
 #, php-format
 msgid "All updates for %s"
-msgstr "Todas as actualizações para %s"
+msgstr ""
 
-#: ../actions/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
 #: ../actions/openidlogin.php:29 ../actions/register.php:30
+#: actions/finishopenidlogin.php:29 actions/login.php:31
+#: actions/openidlogin.php:29 actions/register.php:30
 msgid "Already logged in."
 msgstr ""
 
-#: ../lib/subs.php:42
+#: ../lib/subs.php:42 lib/subs.php:42
 msgid "Already subscribed!."
 msgstr ""
 
-#: ../actions/deletenotice.php:54
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
 msgid "Are you sure you want to delete this notice?"
 msgstr ""
 
-#: ../actions/userauthorization.php:77
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 msgid "Authorize subscription"
 msgstr ""
 
 #: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
-#: ../actions/profilesettings.php:65
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for "
+"non-humans)"
 msgstr ""
 
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: actions/profilesettings.php:34
 msgid "Avatar"
-msgstr "Avatar"
+msgstr ""
 
-#: ../actions/avatar.php:113
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
 msgid "Avatar updated."
-msgstr "Avatar actualizado."
+msgstr ""
 
-#: ../actions/imsettings.php:55
+#: ../actions/imsettings.php:55 actions/imsettings.php:56
 #, 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 ""
 
-#: ../actions/emailsettings.php:54
+#: ../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 ""
 
-#: ../actions/smssettings.php:58
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
-#: ../lib/util.php:1318
+#: ../lib/util.php:1318 lib/util.php:1452
 msgid "Before »"
-msgstr "Anterior >>"
+msgstr ""
 
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: actions/profilesettings.php:82 actions/register.php:184
 msgid "Bio"
-msgstr "Bio"
+msgstr ""
 
 #: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103
+#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
+#: actions/register.php:89 actions/updateprofile.php:104
 msgid "Bio is too long (max 140 chars)."
-msgstr "Bio é demasiado extensa (max 140 caracteres)."
+msgstr ""
 
-#: ../lib/deleteaction.php:41
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
 msgid "Can't delete this notice."
 msgstr ""
 
-#: ../actions/updateprofile.php:119
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #, php-format
 msgid "Can't read avatar URL '%s'"
-msgstr "Não foi possível ler o URL do avatar '%s'"
+msgstr ""
 
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
+#: actions/profilesettings.php:404 actions/recoverpassword.php:313
 msgid "Can't save new password."
-msgstr "Não foi possível guardar a nova palavra chave."
+msgstr ""
 
 #: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62
+#: ../actions/smssettings.php:62 actions/emailsettings.php:58
+#: actions/imsettings.php:59 actions/smssettings.php:62
 msgid "Cancel"
-msgstr "Cancelar"
+msgstr ""
 
-#: ../lib/openid.php:121
+#: ../lib/openid.php:121 lib/openid.php:121
 msgid "Cannot instantiate OpenID consumer object."
 msgstr ""
 
-#: ../actions/imsettings.php:163
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
 msgid "Cannot normalize that Jabber ID"
 msgstr ""
 
-#: ../actions/emailsettings.php:181
-#, fuzzy
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
 msgid "Cannot normalize that email address"
-msgstr "Introduza o nickname ou o endereço de Email"
+msgstr ""
 
-#: ../actions/password.php:45
+#: ../actions/password.php:45 actions/profilesettings.php:184
 msgid "Change"
-msgstr "Alterar"
+msgstr ""
 
-#: ../lib/settingsaction.php:88
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
 msgid "Change email handling"
 msgstr ""
 
-#: ../actions/password.php:32
+#: ../actions/password.php:32 actions/profilesettings.php:36
 msgid "Change password"
-msgstr "Alterar palavra chave"
+msgstr ""
 
 #: ../lib/settingsaction.php:94
-#, fuzzy
 msgid "Change your password"
-msgstr "Alterar palavra chave"
+msgstr ""
 
-#: ../lib/settingsaction.php:85
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
 msgid "Change your profile settings"
 msgstr ""
 
 #: ../actions/password.php:43 ../actions/recoverpassword.php:181
 #: ../actions/register.php:155 ../actions/smssettings.php:65
+#: actions/profilesettings.php:182 actions/recoverpassword.php:187
+#: actions/register.php:169 actions/smssettings.php:65
 msgid "Confirm"
-msgstr "Confirmar"
+msgstr ""
 
-#: ../actions/confirmaddress.php:90
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
 msgid "Confirm Address"
-msgstr "Confirmar endereço"
+msgstr ""
 
 #: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245
+#: ../actions/smssettings.php:245 actions/emailsettings.php:256
+#: actions/imsettings.php:230 actions/smssettings.php:253
 msgid "Confirmation cancelled."
-msgstr "Confirmação cancelada."
+msgstr ""
 
-#: ../actions/smssettings.php:63
-#, fuzzy
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
 msgid "Confirmation code"
-msgstr "Código de confirmação não encontrado."
+msgstr ""
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 msgid "Confirmation code not found."
-msgstr "Código de confirmação não encontrado."
+msgstr ""
 
 #: ../actions/register.php:202
 #, php-format
@@ -419,96 +447,104 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:91
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
 msgid "Connect"
-msgstr "Ligar"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
 msgid "Connect existing account"
-msgstr "Ligar conta existente"
+msgstr ""
 
-#: ../lib/util.php:332
+#: ../lib/util.php:332 lib/util.php:348
 msgid "Contact"
-msgstr "Contacto"
+msgstr ""
 
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178
 #, php-format
 msgid "Could not create OpenID form: %s"
-msgstr "Não foi possível criar o formulário do OpenID: %s"
+msgstr ""
 
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #, 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:53
 msgid "Could not follow user: User not found."
 msgstr ""
 
-#: ../lib/openid.php:160
+#: ../lib/openid.php:160 lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
-msgstr "Não foi possível redirecionar para o servidor: %s"
+msgstr ""
 
-#: ../actions/updateprofile.php:162
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
 msgid "Could not save avatar info"
-msgstr "Não foi possível guardar a informação do avatar"
+msgstr ""
 
-#: ../actions/updateprofile.php:155
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
 msgid "Could not save new profile info"
-msgstr "Não foi possível guardar a nova informação do perfil"
+msgstr ""
 
-#: ../lib/subs.php:54
+#: ../lib/subs.php:54 lib/subs.php:61
 msgid "Could not subscribe other to you."
 msgstr ""
 
-#: ../lib/subs.php:46
+#: ../lib/subs.php:46 lib/subs.php:46
 msgid "Could not subscribe."
 msgstr ""
 
-#: ../actions/recoverpassword.php:102
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
 msgid "Could not update user with confirmed email address."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:99
+#: actions/finishremotesubscribe.php:101
 msgid "Couldn't convert request tokens to access tokens."
 msgstr ""
 
 #: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
 #: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#: actions/confirmaddress.php:84 actions/emailsettings.php:252
+#: actions/imsettings.php:226 actions/smssettings.php:249
 msgid "Couldn't delete email confirmation."
 msgstr ""
 
-#: ../lib/subs.php:103
+#: ../lib/subs.php:103 lib/subs.php:116
 msgid "Couldn't delete subscription."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:93
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
 msgid "Couldn't find any statuses."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:127
+#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
 msgid "Couldn't get a request token."
 msgstr ""
 
 #: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206
+#: ../actions/smssettings.php:206 actions/emailsettings.php:223
+#: actions/imsettings.php:195 actions/smssettings.php:214
 msgid "Couldn't insert confirmation code."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182
 msgid "Couldn't insert new subscription."
 msgstr ""
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 msgid "Couldn't save profile."
 msgstr ""
 
-#: ../actions/profilesettings.php:161
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
 msgid "Couldn't update user for autosubscribe."
 msgstr ""
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
 msgid "Couldn't update user record."
 msgstr ""
 
@@ -516,192 +552,203 @@ msgstr ""
 #: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
 #: ../actions/imsettings.php:243 ../actions/profilesettings.php:141
 #: ../actions/smssettings.php:157 ../actions/smssettings.php:269
+#: actions/confirmaddress.php:72 actions/emailsettings.php:174
+#: actions/emailsettings.php:277 actions/imsettings.php:146
+#: actions/imsettings.php:251 actions/profilesettings.php:256
+#: actions/smssettings.php:165 actions/smssettings.php:277
 msgid "Couldn't update user."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:84
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
 msgid "Create"
-msgstr "Criar"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:70
+#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
 msgid "Create a new user with this nickname."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:68
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
 msgid "Create new account"
-msgstr "Criar nova conta"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:191
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
 msgid "Creating new account for OpenID that already has a user."
 msgstr ""
 
-#: ../actions/imsettings.php:45
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
 msgid "Current confirmed Jabber/GTalk address."
 msgstr ""
 
-#: ../actions/smssettings.php:46
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
-#: ../actions/emailsettings.php:44
-#, fuzzy
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
 msgid "Current confirmed email address."
-msgstr "Não foi possível confirmar o email."
+msgstr ""
 
-#: ../actions/showstream.php:356
+#: ../actions/showstream.php:356 actions/showstream.php:367
 msgid "Currently"
 msgstr ""
 
-#: ../classes/Notice.php:72
-#, fuzzy, php-format
+#: ../classes/Notice.php:72 classes/Notice.php:86
+#, php-format
 msgid "DB error inserting hashtag: %s"
-msgstr "Erro ao inserir o avatar"
+msgstr ""
 
-#: ../lib/util.php:1061
+#: ../lib/util.php:1061 lib/util.php:1110
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr ""
 
-#: ../actions/deletenotice.php:41
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
 msgid "Delete notice"
 msgstr ""
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: actions/profilesettings.php:84 actions/register.php:186
 msgid "Describe yourself and your interests in 140 chars"
 msgstr ""
 
 #: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87
+#: ../lib/settingsaction.php:87 actions/register.php:172
+#: actions/register.php:175 lib/settingsaction.php:87
 msgid "Email"
-msgstr "Email"
+msgstr ""
 
-#: ../actions/emailsettings.php:59
-#, fuzzy
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
 msgid "Email Address"
-msgstr "Endereço de Email"
+msgstr ""
 
-#: ../actions/emailsettings.php:32
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
 msgid "Email Settings"
 msgstr ""
 
-#: ../actions/register.php:73
+#: ../actions/register.php:73 actions/register.php:80
 msgid "Email address already exists."
-msgstr "Endereço de Email já existente"
+msgstr ""
 
-#: ../lib/mail.php:90
+#: ../lib/mail.php:90 lib/mail.php:90
 msgid "Email address confirmation"
-msgstr "Confirmação de endereço de Email"
+msgstr ""
 
-#: ../actions/emailsettings.php:61
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 
-#: ../actions/invite.php:129
-#, fuzzy
+#: ../actions/invite.php:129 actions/invite.php:137
 msgid "Email addresses"
-msgstr "Endereço de Email"
+msgstr ""
 
-#: ../actions/recoverpassword.php:191
+#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 msgid "Enter a nickname or email address."
-msgstr "Introduza o nickname ou o endereço de Email"
+msgstr ""
 
-#: ../actions/smssettings.php:64
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
 msgid "Enter the code you received on your phone."
 msgstr ""
 
-#: ../actions/userauthorization.php:137
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 msgid "Error authorizing token"
-msgstr "Erro ao autorizar o token"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:253
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
 msgid "Error connecting user to OpenID."
-msgstr "Erro ao ligar o utilizador ao OpenID."
+msgstr ""
 
-#: ../actions/finishaddopenid.php:78
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
 msgid "Error connecting user."
-msgstr "Erro ao ligar o utilizador."
+msgstr ""
 
 #: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153
 msgid "Error inserting avatar"
-msgstr "Erro ao inserir o avatar"
+msgstr ""
 
 #: ../actions/finishremotesubscribe.php:143
+#: actions/finishremotesubscribe.php:145
 msgid "Error inserting new profile"
-msgstr "Erro ao inserir novo perfil"
+msgstr ""
 
 #: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169
 msgid "Error inserting remote profile"
-msgstr "Erro ao inserir o perfil remoto"
+msgstr ""
 
-#: ../actions/recoverpassword.php:240
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
 msgid "Error saving address confirmation."
-msgstr "Erro ao salvar confirmação de endereço."
+msgstr ""
 
-#: ../actions/userauthorization.php:140
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
 msgid "Error saving remote profile"
-msgstr "Erro ao salvar perfil remoto"
+msgstr ""
 
-#: ../lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226
 msgid "Error saving the profile."
-msgstr "Erro ao salvar o perfil."
+msgstr ""
 
-#: ../lib/openid.php:237
+#: ../lib/openid.php:237 lib/openid.php:237
 msgid "Error saving the user."
 msgstr ""
 
-#: ../actions/password.php:80
+#: ../actions/password.php:80 actions/profilesettings.php:399
 msgid "Error saving user; invalid."
 msgstr ""
 
 #: ../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
 msgid "Error setting user."
 msgstr ""
 
-#: ../actions/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
 msgid "Error updating profile"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:161
+#: actions/finishremotesubscribe.php:163
 msgid "Error updating remote profile"
 msgstr ""
 
-#: ../actions/recoverpassword.php:80
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
 msgid "Error with confirmation code."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:89
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
 msgid "Existing nickname"
 msgstr ""
 
-#: ../lib/util.php:326
+#: ../lib/util.php:326 lib/util.php:342
 msgid "FAQ"
-msgstr "FAQ"
+msgstr ""
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
 msgid "Failed updating avatar."
-msgstr "Falha na actualização do avatar."
+msgstr ""
 
-#: ../actions/all.php:61 ../actions/allrss.php:64
+#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
+#: actions/allrss.php:64
 #, 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
 #, php-format
 msgid "Feed for replies to %s"
 msgstr ""
 
-#: ../actions/tag.php:55
+#: ../actions/tag.php:55 actions/tag.php:55
 #, php-format
 msgid "Feed for tag %s"
 msgstr ""
 
-#: ../lib/searchaction.php:105
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
 msgid "Find content of notices"
 msgstr ""
 
-#: ../lib/searchaction.php:101
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
 msgid "Find people on this site"
 msgstr ""
 
@@ -712,47 +759,51 @@ msgid ""
 msgstr ""
 
 #: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: actions/profilesettings.php:77 actions/register.php:178
 msgid "Full name"
-msgstr "Nome completo"
+msgstr ""
 
 #: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93
+#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
+#: actions/register.php:86 actions/updateprofile.php:94
 msgid "Full name is too long (max 255 chars)."
 msgstr ""
 
-#: ../lib/util.php:322
+#: ../lib/util.php:322 lib/util.php:338
 msgid "Help"
 msgstr ""
 
-#: ../lib/util.php:298
+#: ../lib/util.php:298 lib/util.php:314
 msgid "Home"
 msgstr ""
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: actions/profilesettings.php:79 actions/register.php:181
 msgid "Homepage"
 msgstr ""
 
 #: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: actions/profilesettings.php:210 actions/register.php:83
 msgid "Homepage is not a valid URL."
 msgstr ""
 
-#: ../actions/emailsettings.php:91
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
 msgid "I want to post notices by email."
 msgstr ""
 
-#: ../lib/settingsaction.php:102
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
 msgid "IM"
 msgstr ""
 
-#: ../actions/imsettings.php:60
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
 msgid "IM Address"
 msgstr ""
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
 msgid "IM Settings"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:88
+#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -771,18 +822,19 @@ msgid ""
 msgstr ""
 
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
 msgid "Incoming email"
 msgstr ""
 
-#: ../actions/emailsettings.php:283
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
 msgid "Incoming email address removed."
 msgstr ""
 
-#: ../actions/password.php:69
+#: ../actions/password.php:69 actions/profilesettings.php:388
 msgid "Incorrect old password"
 msgstr ""
 
-#: ../actions/login.php:67
+#: ../actions/login.php:67 actions/login.php:67
 msgid "Incorrect username or password."
 msgstr ""
 
@@ -792,119 +844,123 @@ msgid ""
 "address registered to your account."
 msgstr ""
 
-#: ../actions/updateprofile.php:114
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr ""
 
-#: ../actions/invite.php:55
-#, fuzzy, php-format
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
 msgid "Invalid email address: %s"
-msgstr "Endereço de Email"
+msgstr ""
 
-#: ../actions/updateprofile.php:98
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr ""
 
-#: ../actions/updateprofile.php:82
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr ""
 
-#: ../actions/postnotice.php:61
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
 msgid "Invalid notice content"
 msgstr ""
 
-#: ../actions/postnotice.php:67
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
 msgid "Invalid notice uri"
 msgstr ""
 
-#: ../actions/postnotice.php:72
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
 msgid "Invalid notice url"
 msgstr ""
 
-#: ../actions/updateprofile.php:87
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:96
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
 msgid "Invalid profile URL (bad format)"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79
 msgid "Invalid profile URL returned by server."
 msgstr ""
 
-#: ../actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 msgid "Invalid size."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111
+#: ../actions/register.php:111 actions/finishopenidlogin.php:241
+#: actions/register.php:103 actions/register.php:121
 msgid "Invalid username or password."
 msgstr ""
 
-#: ../actions/invite.php:79
+#: ../actions/invite.php:79 actions/invite.php:86
 msgid "Invitation(s) sent"
 msgstr ""
 
-#: ../actions/invite.php:97
+#: ../actions/invite.php:97 actions/invite.php:104
 msgid "Invitation(s) sent to the following people:"
 msgstr ""
 
-#: ../lib/util.php:306
+#: ../lib/util.php:306 lib/util.php:322
 msgid "Invite"
 msgstr ""
 
-#: ../actions/invite.php:123
+#: ../actions/invite.php:123 actions/invite.php:130
 msgid "Invite new users"
 msgstr ""
 
-#: ../lib/util.php:261
+#: ../lib/util.php:261 lib/util.php:277
 #, 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)."
+"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 ""
 
-#: ../actions/imsettings.php:173
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
 msgid "Jabber ID already belongs to another user."
 msgstr ""
 
-#: ../actions/imsettings.php:62
+#: ../actions/imsettings.php:62 actions/imsettings.php:63
 #, 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 ""
 
-#: ../actions/profilesettings.php:57
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
 msgid "Language"
 msgstr ""
 
-#: ../actions/profilesettings.php:113
-#, fuzzy
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
 msgid "Language is too long (max 50 chars)."
-msgstr "Bio é demasiado extensa (max 140 caracteres)."
+msgstr ""
 
 #: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: actions/profilesettings.php:85 actions/register.php:187
 msgid "Location"
 msgstr ""
 
 #: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108
+#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
+#: actions/register.php:92 actions/updateprofile.php:109
 msgid "Location is too long (max 255 chars)."
 msgstr ""
 
 #: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310
+#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
+#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
 msgid "Login"
 msgstr ""
 
-#: ../actions/openidlogin.php:44
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr ""
@@ -912,37 +968,38 @@ msgstr ""
 #: ../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%"
-"%). "
+"Login with your username and password. Don't have a username yet? "
+"[Register](%%action.register%%) a new account, or try "
+"[OpenID](%%action.openidlogin%%). "
 msgstr ""
 
-#: ../lib/util.php:308
+#: ../lib/util.php:308 lib/util.php:324
 msgid "Logout"
 msgstr ""
 
-#: ../actions/register.php:166
+#: ../actions/register.php:166 actions/register.php:180
 msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
-#: ../actions/login.php:110
+#: ../actions/login.php:110 actions/login.php:110
 msgid "Lost or forgotten password?"
 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 ""
 
-#: ../actions/emailsettings.php:27
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
-#: ../actions/showstream.php:300
+#: ../actions/showstream.php:300 actions/showstream.php:315
 msgid "Member since"
 msgstr ""
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67
 #, php-format
 msgid "Microblog by %s"
 msgstr ""
@@ -955,31 +1012,34 @@ msgid ""
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
 msgid "My text and files are available under "
 msgstr ""
 
 #: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
 msgid "New"
 msgstr ""
 
-#: ../lib/mail.php:144
+#: ../lib/mail.php:144 lib/mail.php:144
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
 
-#: ../actions/emailsettings.php:297
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
 msgid "New incoming email address added."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:71
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
 msgid "New nickname"
 msgstr ""
 
-#: ../actions/newnotice.php:87
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
 msgid "New notice"
 msgstr ""
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
+#: actions/profilesettings.php:180 actions/recoverpassword.php:185
 msgid "New password"
 msgstr ""
 
@@ -988,137 +1048,146 @@ msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
 #: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151
+#: ../actions/register.php:151 actions/login.php:101
+#: actions/profilesettings.php:74 actions/register.php:165
 msgid "Nickname"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69
+#: ../actions/register.php:69 actions/finishopenidlogin.php:181
+#: actions/profilesettings.php:225 actions/register.php:76
 msgid "Nickname already in use. Try another one."
 msgstr ""
 
 #: ../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
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:170
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
 msgid "Nickname not allowed."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:72
+#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
 msgid "Nickname of the user you want to follow"
 msgstr ""
 
-#: ../actions/recoverpassword.php:162
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
 msgid "Nickname or email"
 msgstr ""
 
-#: ../actions/deletenotice.php:59
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 msgid "No"
 msgstr ""
 
-#: ../actions/imsettings.php:156
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
 msgid "No Jabber ID."
 msgstr ""
 
-#: ../actions/userauthorization.php:129
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
 msgid "No authorization request!"
 msgstr ""
 
-#: ../actions/smssettings.php:181
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
 msgid "No carrier selected."
 msgstr ""
 
-#: ../actions/smssettings.php:316
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
 msgid "No code entered"
 msgstr ""
 
-#: ../actions/confirmaddress.php:33
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 msgid "No confirmation code."
 msgstr ""
 
-#: ../actions/newnotice.php:44
+#: ../actions/newnotice.php:44 actions/newmessage.php:53
+#: actions/newnotice.php:44 classes/Command.php:197
 msgid "No content!"
 msgstr ""
 
-#: ../actions/emailsettings.php:174
-#, fuzzy
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
 msgid "No email address."
-msgstr "Endereço de Email"
+msgstr ""
 
-#: ../actions/userbyid.php:32
+#: ../actions/userbyid.php:32 actions/userbyid.php:32
 msgid "No id."
 msgstr ""
 
-#: ../actions/emailsettings.php:271
-#, fuzzy
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
 msgid "No incoming email address."
-msgstr "Introduza o nickname ou o endereço de Email"
+msgstr ""
 
 #: ../actions/finishremotesubscribe.php:65
+#: actions/finishremotesubscribe.php:67
 msgid "No nickname provided by remote server."
 msgstr ""
 
-#: ../actions/avatarbynickname.php:27
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 msgid "No nickname."
 msgstr ""
 
 #: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229
+#: ../actions/smssettings.php:229 actions/emailsettings.php:240
+#: actions/imsettings.php:214 actions/smssettings.php:237
 msgid "No pending confirmation to cancel."
 msgstr ""
 
-#: ../actions/smssettings.php:176
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
 msgid "No phone number."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:72
+#: actions/finishremotesubscribe.php:74
 msgid "No profile URL returned by server."
 msgstr ""
 
-#: ../actions/recoverpassword.php:226
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
 msgid "No registered email address for that user."
 msgstr ""
 
-#: ../actions/userauthorization.php:49
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
 msgid "No request found!"
 msgstr ""
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
+#: actions/noticesearch.php:69 actions/peoplesearch.php:69
 msgid "No results"
 msgstr ""
 
-#: ../actions/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
 msgid "No size."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:595
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520
 msgid "No status found with that ID."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:555
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
 msgid "No status with that ID found."
 msgstr ""
 
-#: ../actions/openidsettings.php:135
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 msgid "No such OpenID."
 msgstr ""
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29
 msgid "No such document."
 msgstr ""
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30
+#: ../lib/deleteaction.php:30 actions/shownotice.php:32
+#: actions/shownotice.php:83 lib/deleteaction.php:30
 msgid "No such notice."
 msgstr ""
 
-#: ../actions/recoverpassword.php:56
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
 msgid "No such recovery code."
 msgstr ""
 
-#: ../actions/postnotice.php:56
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
 msgid "No such subscription"
 msgstr ""
 
@@ -1128,217 +1197,243 @@ msgstr ""
 #: ../actions/replies.php:57 ../actions/repliesrss.php:35
 #: ../actions/showstream.php:110 ../actions/userbyid.php:36
 #: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
-#: ../lib/subs.php:33 ../lib/subs.php:82
+#: ../lib/subs.php:33 ../lib/subs.php:82 actions/all.php:34
+#: actions/allrss.php:35 actions/avatarbynickname.php:43
+#: actions/favoritesrss.php:35 actions/foaf.php:40 actions/ical.php:31
+#: actions/remotesubscribe.php:93 actions/remotesubscribe.php:100
+#: actions/replies.php:57 actions/repliesrss.php:35
+#: actions/showfavorites.php:34 actions/showstream.php:110
+#: actions/userbyid.php:36 actions/userrss.php:35 actions/xrds.php:35
+#: classes/Command.php:120 classes/Command.php:162 classes/Command.php:203
+#: classes/Command.php:237 lib/gallery.php:62 lib/mailbox.php:36
+#: lib/subs.php:33 lib/subs.php:95
 msgid "No such user."
 msgstr ""
 
-#: ../actions/recoverpassword.php:211
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
 msgid "No user with that email address or username."
 msgstr ""
 
-#: ../lib/gallery.php:80
+#: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
 msgstr ""
 
-#: ../actions/recoverpassword.php:60
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
 msgid "Not a recovery code."
 msgstr ""
 
-#: ../scripts/maildaemon.php:50
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
 msgid "Not a registered user."
 msgstr ""
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332
+#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
+#: lib/twitterapi.php:502
 msgid "Not a supported data format."
 msgstr ""
 
-#: ../actions/imsettings.php:167
+#: ../actions/imsettings.php:167 actions/imsettings.php:175
 msgid "Not a valid Jabber ID"
 msgstr ""
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131
 msgid "Not a valid OpenID."
 msgstr ""
 
-#: ../actions/emailsettings.php:185
-#, fuzzy
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
 msgid "Not a valid email address"
-msgstr "Introduza o nickname ou o endereço de Email"
+msgstr ""
 
-#: ../actions/register.php:63
+#: ../actions/register.php:63 actions/register.php:70
 msgid "Not a valid email address."
 msgstr ""
 
 #: ../actions/profilesettings.php:91 ../actions/register.php:71
+#: actions/profilesettings.php:206 actions/register.php:78
 msgid "Not a valid nickname."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:120
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
 msgid "Not a valid profile URL (incorrect services)."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:113
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:104
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
 msgid "Not a valid profile URL (no YADIS document)."
 msgstr ""
 
-#: ../actions/avatar.php:95
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
 msgid "Not an image or corrupt file."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53
 msgid "Not authorized."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38
 msgid "Not expecting this response!"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:422
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 msgid "Not found"
 msgstr ""
 
 #: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
 #: ../actions/newnotice.php:29 ../actions/subscribe.php:28
 #: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
-#: ../lib/settingsaction.php:27
+#: ../lib/settingsaction.php:27 actions/disfavor.php:29 actions/favor.php:30
+#: actions/finishaddopenid.php:29 actions/logout.php:33
+#: actions/newmessage.php:28 actions/newnotice.php:29 actions/subscribe.php:28
+#: actions/unsubscribe.php:25 lib/deleteaction.php:38
+#: lib/settingsaction.php:27
 msgid "Not logged in."
 msgstr ""
 
-#: ../lib/subs.php:91
+#: ../lib/subs.php:91 lib/subs.php:104
 msgid "Not subscribed!."
 msgstr ""
 
-#: ../actions/opensearch.php:35
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
 msgid "Notice Search"
 msgstr ""
 
-#: ../actions/showstream.php:82
+#: ../actions/showstream.php:82 actions/showstream.php:82
 #, php-format
 msgid "Notice feed for %s"
 msgstr ""
 
-#: ../actions/shownotice.php:39
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
 msgid "Notice has no profile"
 msgstr ""
 
-#: ../actions/showstream.php:316
+#: ../actions/showstream.php:316 actions/showstream.php:331
 msgid "Notices"
 msgstr ""
 
-#: ../actions/tag.php:35 ../actions/tag.php:81
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
 
-#: ../actions/password.php:39
+#: ../actions/password.php:39 actions/profilesettings.php:178
 msgid "Old password"
 msgstr ""
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314
+#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
+#: lib/util.php:330
 msgid "OpenID"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:61
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
 msgid "OpenID Account Setup"
 msgstr ""
 
-#: ../lib/openid.php:180
+#: ../lib/openid.php:180 lib/openid.php:180
 msgid "OpenID Auto-Submit"
 msgstr ""
 
 #: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60
+#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
+#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 msgid "OpenID Login"
 msgstr ""
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
+#: actions/openidlogin.php:74 actions/openidsettings.php:50
 msgid "OpenID URL"
 msgstr ""
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
+#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 msgid "OpenID authentication cancelled."
 msgstr ""
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr ""
 
-#: ../lib/openid.php:133
+#: ../lib/openid.php:133 lib/openid.php:133
 #, php-format
 msgid "OpenID failure: %s"
 msgstr ""
 
-#: ../actions/openidsettings.php:144
+#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
 msgid "OpenID removed."
 msgstr ""
 
-#: ../actions/openidsettings.php:37
+#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
 msgid "OpenID settings"
 msgstr ""
 
-#: ../actions/invite.php:135
+#: ../actions/invite.php:135 actions/invite.php:143
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
-#: ../actions/avatar.php:84
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
 msgid "Partial upload."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
 #: ../actions/register.php:153 ../lib/settingsaction.php:93
+#: actions/finishopenidlogin.php:96 actions/login.php:102
+#: actions/register.php:167
 msgid "Password"
 msgstr ""
 
-#: ../actions/recoverpassword.php:288
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
 msgid "Password and confirmation do not match."
 msgstr ""
 
-#: ../actions/recoverpassword.php:284
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
 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
 msgid "Password recovery requested"
 msgstr ""
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: actions/profilesettings.php:408 actions/recoverpassword.php:326
 msgid "Password saved."
 msgstr ""
 
 #: ../actions/password.php:61 ../actions/register.php:88
+#: actions/profilesettings.php:380 actions/register.php:98
 msgid "Passwords don't match."
 msgstr ""
 
-#: ../lib/searchaction.php:100
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
 msgid "People"
 msgstr ""
 
-#: ../actions/opensearch.php:33
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
 msgid "People Search"
 msgstr ""
 
-#: ../actions/peoplesearch.php:33
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
 msgid "People search"
 msgstr ""
 
-#: ../lib/stream.php:50
+#: ../lib/stream.php:50 lib/personal.php:50
 msgid "Personal"
 msgstr ""
 
-#: ../actions/invite.php:133
+#: ../actions/invite.php:133 actions/invite.php:141
 msgid "Personal message"
 msgstr ""
 
-#: ../actions/smssettings.php:69
-#, fuzzy
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
 msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "1-64 letras minúsculas ou números, sem pontuação ou espaços."
+msgstr ""
 
 #: ../actions/userauthorization.php:78
 msgid ""
@@ -1347,116 +1442,128 @@ msgid ""
 "click \"Cancel\"."
 msgstr ""
 
-#: ../actions/imsettings.php:73
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
 #: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94
+#: ../actions/smssettings.php:94 actions/emailsettings.php:86
+#: actions/imsettings.php:68 actions/smssettings.php:94
+#: actions/twittersettings.php:70
 msgid "Preferences"
 msgstr ""
 
 #: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163
+#: ../actions/smssettings.php:163 actions/emailsettings.php:180
+#: actions/imsettings.php:152 actions/smssettings.php:171
 msgid "Preferences saved."
 msgstr ""
 
-#: ../actions/profilesettings.php:57
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
 msgid "Preferred language"
 msgstr ""
 
-#: ../lib/util.php:328
+#: ../lib/util.php:328 lib/util.php:344
 msgid "Privacy"
 msgstr ""
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106
+#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
+#: classes/Notice.php:119
 msgid "Problem saving notice."
 msgstr ""
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60
+#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
+#: lib/settingsaction.php:84
 msgid "Profile"
 msgstr ""
 
-#: ../actions/remotesubscribe.php:73
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
 msgid "Profile URL"
 msgstr ""
 
-#: ../actions/profilesettings.php:34
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
 msgid "Profile settings"
 msgstr ""
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: actions/postnotice.php:52 actions/updateprofile.php:53
 msgid "Profile unknown"
 msgstr ""
 
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54
 msgid "Public Stream Feed"
 msgstr ""
 
-#: ../actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33
 msgid "Public timeline"
 msgstr ""
 
-#: ../actions/imsettings.php:79
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
-#: ../actions/emailsettings.php:94
-#, fuzzy
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
 msgid "Publish a MicroID for my email address."
-msgstr "Introduza o nickname ou o endereço de Email"
+msgstr ""
 
-#: ../actions/tag.php:75 ../actions/tag.php:76
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
 msgid "Recent Tags"
 msgstr ""
 
-#: ../actions/recoverpassword.php:166
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
 msgid "Recover"
 msgstr ""
 
-#: ../actions/recoverpassword.php:156
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
 msgid "Recover password"
 msgstr ""
 
-#: ../actions/recoverpassword.php:67
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
 msgid "Recovery code for unknown user."
 msgstr ""
 
 #: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: actions/register.php:152 actions/register.php:207 lib/util.php:328
 msgid "Register"
 msgstr ""
 
-#: ../actions/register.php:28
+#: ../actions/register.php:28 actions/register.php:28
 msgid "Registration not allowed."
 msgstr ""
 
-#: ../actions/register.php:200
+#: ../actions/register.php:200 actions/register.php:214
 msgid "Registration successful"
 msgstr ""
 
-#: ../actions/userauthorization.php:120
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
 msgid "Reject"
 msgstr ""
 
-#: ../actions/login.php:103 ../actions/register.php:176
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190
 msgid "Remember me"
 msgstr ""
 
-#: ../actions/updateprofile.php:70
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
 msgid "Remote profile with no matching profile"
 msgstr ""
 
-#: ../actions/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
 msgid "Remote subscribe"
 msgstr ""
 
 #: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
 #: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59
 msgid "Remove"
 msgstr ""
 
-#: ../actions/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
 msgid "Remove OpenID"
 msgstr ""
 
@@ -1466,62 +1573,66 @@ msgid ""
 "remove it, add another OpenID first."
 msgstr ""
 
-#: ../lib/stream.php:55
+#: ../lib/stream.php:55 lib/personal.php:55
 msgid "Replies"
 msgstr ""
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #, php-format
 msgid "Replies to %s"
 msgstr ""
 
-#: ../actions/recoverpassword.php:183
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
 msgid "Reset"
 msgstr ""
 
-#: ../actions/recoverpassword.php:173
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
 msgid "Reset password"
 msgstr ""
 
-#: ../lib/settingsaction.php:99
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 msgid "SMS"
 msgstr ""
 
-#: ../actions/smssettings.php:67
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
 msgid "SMS Phone number"
 msgstr ""
 
-#: ../actions/smssettings.php:33
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
 msgid "SMS Settings"
 msgstr ""
 
-#: ../lib/mail.php:219
-#, fuzzy
+#: ../lib/mail.php:219 lib/mail.php:225
 msgid "SMS confirmation"
-msgstr "Confirmação de endereço de Email"
+msgstr ""
 
-#: ../actions/recoverpassword.php:182
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
 msgid "Same as password above"
 msgstr ""
 
-#: ../actions/register.php:156
+#: ../actions/register.php:156 actions/register.php:170
 msgid "Same as password above. Required."
 msgstr ""
 
 #: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
 #: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
+#: actions/emailsettings.php:104 actions/imsettings.php:82
+#: actions/profilesettings.php:101 actions/smssettings.php:100
+#: actions/twittersettings.php:83
 msgid "Save"
 msgstr ""
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300
+#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
+#: lib/util.php:316
 msgid "Search"
 msgstr ""
 
-#: ../actions/noticesearch.php:80
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
 msgid "Search Stream Feed"
 msgstr ""
 
-#: ../actions/noticesearch.php:30
+#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -1535,188 +1646,196 @@ msgid ""
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 
-#: ../actions/smssettings.php:296
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
 msgid "Select a carrier"
 msgstr ""
 
-#: ../actions/invite.php:137 ../lib/util.php:1172
+#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
+#: lib/util.php:1306 lib/util.php:1731
 msgid "Send"
 msgstr ""
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
+#: actions/emailsettings.php:74 actions/smssettings.php:82
 msgid "Send email to this address to post new notices."
 msgstr ""
 
-#: ../actions/emailsettings.php:88
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
-#: ../actions/imsettings.php:70
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
-#: ../actions/smssettings.php:97
+#: ../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:76 actions/imsettings.php:77
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: ../lib/util.php:304
+#: ../lib/util.php:304 lib/util.php:320
 msgid "Settings"
 msgstr ""
 
-#: ../actions/profilesettings.php:192
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
 msgid "Settings saved."
 msgstr ""
 
-#: ../actions/tag.php:60
+#: ../actions/tag.php:60 actions/tag.php:60
 msgid "Showing most popular tags from the last week"
 msgstr ""
 
-#: ../actions/finishaddopenid.php:66
+#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
+#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
 msgid "Something weird happened."
 msgstr ""
 
-#: ../scripts/maildaemon.php:58
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
 msgid "Sorry, no incoming email allowed."
 msgstr ""
 
-#: ../scripts/maildaemon.php:54
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
 msgid "Sorry, that is not your incoming email address."
 msgstr ""
 
-#: ../lib/util.php:330
+#: ../lib/util.php:330 lib/util.php:346
 msgid "Source"
 msgstr ""
 
-#: ../actions/showstream.php:296
+#: ../actions/showstream.php:296 actions/showstream.php:311
 msgid "Statistics"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 msgid "Stored OpenID not found."
 msgstr ""
 
 #: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197
+#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
+#: actions/showstream.php:197 actions/showstream.php:206
 msgid "Subscribe"
 msgstr ""
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: actions/showstream.php:328 actions/subscribers.php:27
 msgid "Subscribers"
 msgstr ""
 
-#: ../actions/userauthorization.php:310
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
 msgid "Subscription authorized"
 msgstr ""
 
-#: ../actions/userauthorization.php:320
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
 msgid "Subscription rejected"
 msgstr ""
 
 #: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27
+#: ../actions/subscriptions.php:27 actions/showstream.php:240
+#: actions/showstream.php:322 actions/subscriptions.php:27
 msgid "Subscriptions"
 msgstr ""
 
-#: ../actions/avatar.php:87
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
 msgid "System error uploading file."
 msgstr ""
 
-#: ../actions/tag.php:41 ../lib/util.php:301
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317
 msgid "Tags"
 msgstr ""
 
-#: ../lib/searchaction.php:104
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
 msgid "Text"
 msgstr ""
 
-#: ../actions/noticesearch.php:34
+#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
 msgid "Text search"
 msgstr ""
 
-#: ../actions/openidsettings.php:140
+#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
 msgid "That OpenID does not belong to you."
 msgstr ""
 
-#: ../actions/confirmaddress.php:52
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
 msgid "That address has already been confirmed."
 msgstr ""
 
-#: ../actions/confirmaddress.php:43
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
 msgid "That confirmation code is not for you!"
 msgstr ""
 
-#: ../actions/emailsettings.php:191
-#, fuzzy
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
 msgid "That email address already belongs to another user."
-msgstr "Endereço de Email já existente"
+msgstr ""
 
-#: ../actions/avatar.php:80
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
 msgid "That file is too big."
 msgstr ""
 
-#: ../actions/imsettings.php:170
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
 msgid "That is already your Jabber ID."
 msgstr ""
 
-#: ../actions/emailsettings.php:188
-#, fuzzy
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
 msgid "That is already your email address."
-msgstr "Introduza o nickname ou o endereço de Email"
+msgstr ""
 
-#: ../actions/smssettings.php:188
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
 msgid "That is already your phone number."
 msgstr ""
 
-#: ../actions/imsettings.php:233
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
 msgid "That is not your Jabber ID."
 msgstr ""
 
-#: ../actions/emailsettings.php:249
-#, fuzzy
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
 msgid "That is not your email address."
-msgstr "Introduza o nickname ou o endereço de Email"
+msgstr ""
 
-#: ../actions/smssettings.php:257
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
 msgid "That is not your phone number."
 msgstr ""
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
+#: actions/emailsettings.php:244 actions/imsettings.php:218
 msgid "That is the wrong IM address."
 msgstr ""
 
-#: ../actions/smssettings.php:233
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
 msgid "That is the wrong confirmation number."
 msgstr ""
 
-#: ../actions/smssettings.php:191
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
 msgid "That phone number already belongs to another user."
 msgstr ""
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: actions/newnotice.php:49 actions/twitapistatuses.php:330
 msgid "That's too long. Max notice size is 140 chars."
 msgstr ""
 
-#: ../actions/twitapiaccount.php:74
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
 msgid "That's too long. Max notice size is 255 chars."
 msgstr ""
 
-#: ../actions/confirmaddress.php:92
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
 
 #: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274
+#: ../actions/smssettings.php:274 actions/emailsettings.php:282
+#: actions/imsettings.php:258 actions/smssettings.php:282
 msgid "The address was removed."
 msgstr ""
 
@@ -1734,27 +1853,28 @@ msgid ""
 "subscription."
 msgstr ""
 
-#: ../actions/subscribers.php:35
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr ""
 
-#: ../actions/subscribers.php:33
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
 msgid "These are the people who listen to your notices."
 msgstr ""
 
-#: ../actions/subscriptions.php:35
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr ""
 
-#: ../actions/subscriptions.php:33
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
 msgid "These are the people whose notices you listen to."
 msgstr ""
 
-#: ../actions/invite.php:89
+#: ../actions/invite.php:89 actions/invite.php:96
 msgid ""
-"These people are already users and you were automatically subscribed to them:"
+"These people are already users and you were automatically subscribed to "
+"them:"
 msgstr ""
 
 #: ../actions/recoverpassword.php:88
@@ -1767,7 +1887,7 @@ msgid ""
 "button to go to your OpenID provider."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:56
+#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -1776,105 +1896,116 @@ msgid ""
 msgstr ""
 
 #: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511
 msgid "This method requires a POST or DELETE."
 msgstr ""
 
 #: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381
+#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
+#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
+#: actions/twitapistatuses.php:303
 msgid "This method requires a POST."
 msgstr ""
 
-#: ../lib/util.php:164
+#: ../lib/util.php:164 lib/util.php:246
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
-#: ../actions/profilesettings.php:63
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
 msgid "Timezone"
 msgstr ""
 
-#: ../actions/profilesettings.php:107
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
 msgid "Timezone not selected."
 msgstr ""
 
 #: ../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."
+"To subscribe, you can [login](%%action.login%%), or "
+"[register](%%action.register%%) a new  account. If you already have an "
+"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
+"your profile URL below."
 msgstr ""
 
-#: ../actions/twitapifriendships.php:163
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 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
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
-#: ../actions/remotesubscribe.php:74
+#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
 msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
 #: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
 #: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: actions/emailsettings.php:144 actions/imsettings.php:118
+#: actions/recoverpassword.php:39 actions/smssettings.php:143
+#: actions/twittersettings.php:108
 msgid "Unexpected form submission."
 msgstr ""
 
-#: ../actions/recoverpassword.php:276
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
 msgid "Unexpected password reset."
 msgstr ""
 
-#: ../index.php:57
+#: ../index.php:57 index.php:57
 msgid "Unknown action"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:58
+#: actions/finishremotesubscribe.php:60
 msgid "Unknown version of OMB protocol."
 msgstr ""
 
-#: ../lib/util.php:269
+#: ../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 ""
 
-#: ../actions/confirmaddress.php:48
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr ""
 
-#: ../actions/showstream.php:209
+#: ../actions/showstream.php:209 actions/showstream.php:219
 msgid "Unsubscribe"
 msgstr ""
 
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: actions/postnotice.php:45 actions/updateprofile.php:46
 msgid "Unsupported OMB version"
 msgstr ""
 
-#: ../actions/avatar.php:105
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
 msgid "Unsupported image file format."
 msgstr ""
 
-#: ../lib/settingsaction.php:100
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
 msgid "Updates by SMS"
 msgstr ""
 
-#: ../lib/settingsaction.php:103
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:241
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:341
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
-#: ../actions/avatar.php:68
+#: ../actions/avatar.php:68 actions/profilesettings.php:161
 msgid "Upload"
 msgstr ""
 
@@ -1887,20 +2018,22 @@ msgid ""
 msgstr ""
 
 #: ../lib/settingsaction.php:91
-#, fuzzy
 msgid "Upload a new profile image"
-msgstr "Não foi possível guardar a nova informação do perfil"
+msgstr ""
 
-#: ../actions/invite.php:114
+#: ../actions/invite.php:114 actions/invite.php:121
 msgid ""
-"Use this form to invite your friends and colleagues to use this service."
+"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
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:86
+#: actions/finishremotesubscribe.php:88
 msgid "User being listened to doesn't exist."
 msgstr ""
 
@@ -1908,64 +2041,71 @@ msgstr ""
 #: ../actions/foaf.php:47 ../actions/replies.php:41
 #: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
 #: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
-#: ../actions/twitapiusers.php:82
+#: ../actions/twitapiusers.php:82 actions/all.php:41
+#: actions/avatarbynickname.php:48 actions/foaf.php:47 actions/replies.php:41
+#: actions/showfavorites.php:41 actions/showstream.php:44
+#: actions/twitapiaccount.php:80 actions/twitapifavorites.php:68
+#: actions/twitapistatuses.php:235 actions/twitapistatuses.php:609
+#: actions/twitapiusers.php:87 lib/mailbox.php:50
 msgid "User has no profile."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
 msgid "User nickname"
 msgstr ""
 
-#: ../actions/twitapiusers.php:75
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
 msgid "User not found."
 msgstr ""
 
-#: ../actions/profilesettings.php:63
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
 msgid "What timezone are you normally in?"
 msgstr ""
 
-#: ../lib/util.php:1159
+#: ../lib/util.php:1159 lib/util.php:1293
 #, php-format
 msgid "What's up, %s?"
 msgstr ""
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: actions/profilesettings.php:87 actions/register.php:189
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
-#: ../actions/updateprofile.php:128
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr ""
 
-#: ../actions/updateprofile.php:123
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr ""
 
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
 msgid "Yes"
 msgstr ""
 
-#: ../actions/finishaddopenid.php:64
+#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr ""
 
-#: ../actions/deletenotice.php:37
+#: ../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 ""
 
-#: ../actions/recoverpassword.php:31
+#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
 msgid "You are already logged in!"
 msgstr ""
 
-#: ../actions/invite.php:81
+#: ../actions/invite.php:81 actions/invite.php:88
 msgid "You are already subscribed to these users:"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:128
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
 msgid "You are not friends with the specified user."
 msgstr ""
 
@@ -1973,11 +2113,11 @@ msgstr ""
 msgid "You can change your password here. Choose a good one!"
 msgstr ""
 
-#: ../actions/register.php:135
+#: ../actions/register.php:135 actions/register.php:145
 msgid "You can create a new account to start posting notices."
 msgstr ""
 
-#: ../actions/smssettings.php:28
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
@@ -1988,27 +2128,30 @@ msgid ""
 "\"Remove\"."
 msgstr ""
 
-#: ../actions/imsettings.php:28
+#: ../actions/imsettings.php:28 actions/imsettings.php:28
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about you."
+"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
 msgid "You can use the local subscription!"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: actions/finishopenidlogin.php:38 actions/register.php:68
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 
-#: ../actions/updateprofile.php:63
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
 msgid "You did not send us that profile"
 msgstr ""
 
@@ -2025,16 +2168,16 @@ msgid ""
 "%4$s"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:612
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
 msgid "You may not delete another user's status."
 msgstr ""
 
-#: ../actions/invite.php:31
+#: ../actions/invite.php:31 actions/invite.php:31
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr ""
 
-#: ../actions/invite.php:103
+#: ../actions/invite.php:103 actions/invite.php:110
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
@@ -2044,7 +2187,7 @@ msgstr ""
 msgid "You've been identified. Enter a  new password below. "
 msgstr ""
 
-#: ../actions/openidlogin.php:67
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
 msgid "Your OpenID URL"
 msgstr ""
 
@@ -2059,75 +2202,664 @@ msgid ""
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
 
-#: ../lib/util.php:943
+#: ../lib/util.php:943 lib/util.php:992
 msgid "a few seconds ago"
 msgstr ""
 
-#: ../lib/util.php:955
+#: ../lib/util.php:955 lib/util.php:1004
 #, php-format
 msgid "about %d days ago"
 msgstr ""
 
-#: ../lib/util.php:951
+#: ../lib/util.php:951 lib/util.php:1000
 #, php-format
 msgid "about %d hours ago"
 msgstr ""
 
-#: ../lib/util.php:947
+#: ../lib/util.php:947 lib/util.php:996
 #, php-format
 msgid "about %d minutes ago"
 msgstr ""
 
-#: ../lib/util.php:959
+#: ../lib/util.php:959 lib/util.php:1008
 #, php-format
 msgid "about %d months ago"
 msgstr ""
 
-#: ../lib/util.php:953
+#: ../lib/util.php:953 lib/util.php:1002
 msgid "about a day ago"
 msgstr ""
 
-#: ../lib/util.php:945
+#: ../lib/util.php:945 lib/util.php:994
 msgid "about a minute ago"
 msgstr ""
 
-#: ../lib/util.php:957
+#: ../lib/util.php:957 lib/util.php:1006
 msgid "about a month ago"
 msgstr ""
 
-#: ../lib/util.php:961
+#: ../lib/util.php:961 lib/util.php:1010
 msgid "about a year ago"
 msgstr ""
 
-#: ../lib/util.php:949
+#: ../lib/util.php:949 lib/util.php:998
 msgid "about an hour ago"
 msgstr ""
 
 #: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99
 msgid "delete"
 msgstr ""
 
 #: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117
+#: ../lib/stream.php:117 actions/noticesearch.php:136
+#: actions/showstream.php:426 lib/stream.php:84
 msgid "in reply to..."
 msgstr ""
 
 #: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124
+#: ../lib/stream.php:124 actions/noticesearch.php:143
+#: actions/showstream.php:433 lib/stream.php:91
 msgid "reply"
 msgstr ""
 
-#: ../actions/password.php:44
+#: ../actions/password.php:44 actions/profilesettings.php:183
 msgid "same as password above"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:755
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
 msgid "unsupported file type"
 msgstr ""
 
-#: ../lib/util.php:1309
+#: ../lib/util.php:1309 lib/util.php:1443
 msgid "« After"
 msgstr ""
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Erro ao inserir notificação"
+#: actions/deletenotice.php:74 actions/disfavor.php:43
+#: actions/emailsettings.php:127 actions/favor.php:45
+#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
+#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
+#: actions/openidsettings.php:123 actions/profilesettings.php:47
+#: actions/recoverpassword.php:282 actions/register.php:42
+#: actions/remotesubscribe.php:40 actions/smssettings.php:124
+#: actions/subscribe.php:44 actions/twittersettings.php:97
+#: actions/unsubscribe.php:41 actions/userauthorization.php:35
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/disfavor.php:55
+msgid "This notice is not a favorite!"
+msgstr ""
+
+#: actions/disfavor.php:63
+msgid "Could not delete favorite."
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Favor"
+msgstr ""
+
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+
+#: actions/emailsettings.php:95
+msgid "Send me email when someone sends me a private message."
+msgstr ""
+
+#: actions/favor.php:53 actions/twitapifavorites.php:142
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132
+msgid "Could not create favorite."
+msgstr ""
+
+#: actions/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#, php-format
+msgid "%s favorite notices"
+msgstr ""
+
+#: actions/favoritesrss.php:64
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr ""
+
+#: actions/inbox.php:28
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+
+#: actions/invite.php:178
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+msgstr ""
+
+#: actions/login.php:104
+msgid "Automatically login in the future; "
+msgstr ""
+
+#: actions/login.php:122
+msgid "For security reasons, please re-enter your "
+msgstr ""
+
+#: actions/login.php:126
+msgid "Login with your username and password. "
+msgstr ""
+
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+msgid "That's too long. Max message size is 140 chars."
+msgstr ""
+
+#: actions/newmessage.php:65
+msgid "No recipient specified."
+msgstr ""
+
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206
+msgid "You can't send a message to this user."
+msgstr ""
+
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly "
+"instead."
+msgstr ""
+
+#: actions/newmessage.php:108
+msgid "No such user"
+msgstr ""
+
+#: actions/newmessage.php:117
+msgid "New message"
+msgstr ""
+
+#: actions/noticesearch.php:95
+msgid "Notice without matching profile"
+msgstr ""
+
+#: actions/openidsettings.php:28
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr ""
+
+#: actions/openidsettings.php:46
+msgid "If you want to add an OpenID to your account, "
+msgstr ""
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr ""
+
+#: actions/openidsettings.php:87
+msgid "You can remove an OpenID from your account "
+msgstr ""
+
+#: actions/outbox.php:28
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr ""
+
+#: actions/outbox.php:30
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#: actions/outbox.php:53
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+
+#: actions/peoplesearch.php:28
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+msgstr ""
+
+#: actions/profilesettings.php:27
+msgid "You can update your personal profile info here "
+msgstr ""
+
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+msgid "User without matching profile"
+msgstr ""
+
+#: actions/recoverpassword.php:91
+msgid "This confirmation code is too old. "
+msgstr ""
+
+#: actions/recoverpassword.php:141
+msgid "If you've forgotten or lost your"
+msgstr ""
+
+#: actions/recoverpassword.php:154
+msgid "You've been identified. Enter a "
+msgstr ""
+
+#: actions/recoverpassword.php:169
+msgid "Your nickname on this server, "
+msgstr ""
+
+#: actions/recoverpassword.php:271
+msgid "Instructions for recovering your password "
+msgstr ""
+
+#: actions/recoverpassword.php:327
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95
+msgid "Password must be 6 or more characters."
+msgstr ""
+
+#: actions/register.php:216
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
+msgstr ""
+
+#: actions/register.php:227
+msgid "(You should receive a message by email momentarily, with "
+msgstr ""
+
+#: actions/remotesubscribe.php:51
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
+msgstr ""
+
+#: actions/showfavorites.php:61
+#, php-format
+msgid "Feed for favorites of %s"
+msgstr ""
+
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+msgid "Could not retrieve favorite notices."
+msgstr ""
+
+#: actions/showmessage.php:33
+msgid "No such message."
+msgstr ""
+
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
+msgstr ""
+
+#: actions/showmessage.php:61
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr ""
+
+#: actions/showmessage.php:66
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr ""
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr ""
+
+#: actions/smssettings.php:312
+#, php-format
+msgid "Mobile carrier for your phone. "
+msgstr ""
+
+#: actions/twitapidirect_messages.php:76
+#, php-format
+msgid "Direct messages to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:77
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:81
+msgid "Direct Messages You've Sent"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:82
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:128
+msgid "No message text!"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:138
+msgid "Recipient user not found."
+msgstr ""
+
+#: actions/twitapidirect_messages.php:141
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
+#: actions/twitapifavorites.php:92
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr ""
+
+#: actions/twitapifavorites.php:95
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr ""
+
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#, php-format
+msgid "%s added your notice as a favorite"
+msgstr ""
+
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+msgstr ""
+
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+msgstr ""
+
+#: actions/twittersettings.php:41
+msgid "Twitter settings"
+msgstr ""
+
+#: actions/twittersettings.php:48
+msgid "Twitter Account"
+msgstr ""
+
+#: actions/twittersettings.php:56
+msgid "Current verified Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr ""
+
+#: actions/twittersettings.php:65
+msgid "No spaces, please."
+msgstr ""
+
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr ""
+
+#: actions/twittersettings.php:72
+msgid "Automatically send my notices to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:75
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:78
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+
+#: actions/twittersettings.php:128
+msgid "Could not verify your Twitter credentials!"
+msgstr ""
+
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+msgid "Unable to save your Twitter settings!"
+msgstr ""
+
+#: actions/twittersettings.php:174
+msgid "Twitter settings saved."
+msgstr ""
+
+#: actions/twittersettings.php:192
+msgid "That is not your Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+msgid "Couldn't remove Twitter user."
+msgstr ""
+
+#: actions/twittersettings.php:212
+msgid "Twitter account removed."
+msgstr ""
+
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+msgid "Couldn't save Twitter preferences."
+msgstr ""
+
+#: actions/twittersettings.php:245
+msgid "Twitter preferences saved."
+msgstr ""
+
+#: actions/userauthorization.php:84
+msgid "Please check these details to make sure "
+msgstr ""
+
+#: actions/userauthorization.php:324
+msgid "The subscription has been authorized, but no "
+msgstr ""
+
+#: actions/userauthorization.php:334
+msgid "The subscription has been rejected, but no "
+msgstr ""
+
+#: classes/Channel.php:113
+msgid "Command results"
+msgstr ""
+
+#: classes/Channel.php:148
+msgid "Command complete"
+msgstr ""
+
+#: classes/Channel.php:158
+msgid "Command failed"
+msgstr ""
+
+#: classes/Command.php:39
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: classes/Command.php:96
+#, php-format
+msgid "Subscriptions: %1$s\n"
+msgstr ""
+
+#: classes/Command.php:125 classes/Command.php:242
+msgid "User has no last notice"
+msgstr ""
+
+#: classes/Command.php:146
+msgid "Notice marked as fave."
+msgstr ""
+
+#: classes/Command.php:166
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr ""
+
+#: classes/Command.php:169
+#, php-format
+msgid "Fullname: %s"
+msgstr ""
+
+#: classes/Command.php:172
+#, php-format
+msgid "Location: %s"
+msgstr ""
+
+#: classes/Command.php:175
+#, php-format
+msgid "Homepage: %s"
+msgstr ""
+
+#: classes/Command.php:178
+#, php-format
+msgid "About: %s"
+msgstr ""
+
+#: classes/Command.php:200
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
+
+#: classes/Command.php:214
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
+
+#: classes/Command.php:216
+msgid "Error sending direct message."
+msgstr ""
+
+#: classes/Command.php:263
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: classes/Command.php:270
+#, php-format
+msgid "Subscribed to %s"
+msgstr ""
+
+#: classes/Command.php:288
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
+
+#: classes/Command.php:295
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr ""
+
+#: classes/Command.php:310 classes/Command.php:330
+msgid "Command not yet implemented."
+msgstr ""
+
+#: classes/Command.php:313
+msgid "Notification off."
+msgstr ""
+
+#: classes/Command.php:315
+msgid "Can't turn off notification."
+msgstr ""
+
+#: classes/Command.php:333
+msgid "Notification on."
+msgstr ""
+
+#: classes/Command.php:335
+msgid "Can't turn on notification."
+msgstr ""
+
+#: classes/Command.php:344
+msgid "Commands:\n"
+msgstr ""
+
+#: classes/Message.php:53
+msgid "Could not insert message."
+msgstr ""
+
+#: classes/Message.php:63
+msgid "Could not update message with new URI."
+msgstr ""
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr ""
+
+#: lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:249
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:253
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+msgstr ""
+
+#: lib/mailbox.php:43
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/openid.php:195
+msgid "This form should automatically submit itself. "
+msgstr ""
+
+#: lib/personal.php:65
+msgid "Favorites"
+msgstr ""
+
+#: lib/personal.php:66
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
+#: lib/personal.php:66
+msgid "User"
+msgstr ""
+
+#: lib/personal.php:75
+msgid "Inbox"
+msgstr ""
+
+#: lib/personal.php:76
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personal.php:80
+msgid "Outbox"
+msgstr ""
+
+#: lib/personal.php:81
+msgid "Your sent messages"
+msgstr ""
+
+#: lib/settingsaction.php:99
+msgid "Twitter"
+msgstr ""
+
+#: lib/settingsaction.php:100
+msgid "Twitter integration options"
+msgstr ""
+
+#: lib/util.php:1718
+msgid "To"
+msgstr ""
+
+#: scripts/maildaemon.php:45
+msgid "Could not parse message."
+msgstr ""
diff --git a/locale/pt_BR/LC_MESSAGES/laconica.mo b/locale/pt_BR/LC_MESSAGES/laconica.mo
index f9f8d61cf..562a91187 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 65ea56935..7c8b0d8e8 100644
--- a/locale/pt_BR/LC_MESSAGES/laconica.po
+++ b/locale/pt_BR/LC_MESSAGES/laconica.po
@@ -1,5 +1,13 @@
+# #-#-#-#-#  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.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  laconica.po (laconica)  #-#-#-#-#\n"
 "Project-Id-Version: laconica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-08-27 14:57-0400\n"
@@ -12,23 +20,31 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: BRAZIL\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: ../actions/noticesearchrss.php:64
 #, php-format
 msgid " Search Stream for \"%s\""
-msgstr " Busca de resultados para \"%s\""
+msgstr "Pesquisar por \"%s\" no fluxo de mensagens"
 
-#: ../actions/finishopenidlogin.php:82
-#: ../actions/register.php:191
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 msgid ""
 " except this private data: password, email address, IM address, phone "
 "number."
 msgstr ""
-" exceto estes dados pessoais: senha, endereço de email, endereço de IM, "
-"número de telefone."
+"exceto estes dados privados: senha, endereço de e-mail, endereço de "
+"mensageiro instantâneo, número de telefone."
 
-#: ../actions/showstream.php:400
-#: ../lib/stream.php:109
+#: ../actions/showstream.php:400 ../lib/stream.php:109
 msgid " from "
 msgstr " via "
 
@@ -102,7 +118,7 @@ msgstr ""
 #: ../lib/mail.php:124
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s agora está seguindo suas mensagens no %2$s."
+msgstr "%1$s agora está acompanhando suas mensagens em %2$s. "
 
 #: ../lib/mail.php:126
 #, php-format
@@ -114,25 +130,25 @@ msgid ""
 "Faithfully yours,\n"
 "%4$s.\n"
 msgstr ""
-"%1$s agora está seguindo suas mensagens no %2$s.\n"
+"%1$s agora está acompanhando suas mensagens em %2$s.\n"
 "\n"
 "\t%3$s\n"
 "\n"
 "Atenciosamente,\n"
-"%4$s.\n"
+"%4$s.\n "
 
 #: ../actions/twitapistatuses.php:482
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "Atualizações de %1$s que respondem à mensagens de %2$s / %3$s."
+msgstr "Atualizações de %1$s que respondem a mensagens de %2$s / %3$s."
 
+#  Apesar do termo em inglês ser status, na verdade ele refere-se a uma determinada mensagem.
 #: ../actions/shownotice.php:45
 #, php-format
 msgid "%1$s's status on %2$s"
-msgstr "Status de %1$s's no %2$s"
+msgstr "Mensagem de %1$s em %2$s"
 
-#: ../actions/invite.php:84
-#: ../actions/invite.php:92
+#: ../actions/invite.php:84 ../actions/invite.php:92
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -142,10 +158,8 @@ msgstr "%s (%s)"
 msgid "%s Public Stream"
 msgstr "Conteúdo público de %s"
 
-#: ../actions/all.php:47
-#: ../actions/allrss.php:60
-#: ../actions/twitapistatuses.php:238
-#: ../lib/stream.php:51
+#: ../actions/all.php:47 ../actions/allrss.php:60
+#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amigos"
@@ -175,8 +189,8 @@ msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr ""
-"(Você recebeu uma mensagem por email, com instruções sobre como confirmar "
-"seu endereço.)"
+"(Você receberá uma mensagem por e-mail a qualquer momento, com "
+"instruções sobre como confirmar seu endereço.)"
 
 #: ../lib/util.php:257
 #, php-format
@@ -184,7 +198,7 @@ msgid ""
 "**%%site.name%%** is a microblogging service brought to you by "
 "[%%site.broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
-"**%%site.name%%** é um serviço de microblog disponibilizado para você por "
+"**%%site.name%%** é um serviço de microblog disponibilizado por "
 "[%%site.broughtby%%](%%site.broughtbyurl%%). "
 
 #: ../lib/util.php:259
@@ -194,16 +208,17 @@ msgstr "**%%site.name%%** é um serviço de microblog."
 
 #: ../lib/util.php:274
 msgid ". Contributors should be attributed by full name or nickname."
-msgstr ". Contribuidores devem ser atribuidos pelo nome completo ou apelido."
+msgstr ""
+". Os colaboradores devem ser citados usando seu nome completo ou "
+"apelido."
 
-#: ../actions/finishopenidlogin.php:73
-#: ../actions/profilesettings.php:43
+#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 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ções ou espaços"
 
 #: ../actions/register.php:152
 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 ou números, sem pontuação ou espaços. Obrigatório."
 
 #: ../actions/password.php:42
 msgid "6 or more characters"
@@ -211,11 +226,11 @@ msgstr "6 ou mais caracteres"
 
 #: ../actions/recoverpassword.php:180
 msgid "6 or more characters, and don't forget it!"
-msgstr "6 ou mais caracteres e não esqueça!"
+msgstr "6 ou mais caracteres. E não se esqueça dela!"
 
 #: ../actions/register.php:154
 msgid "6 or more characters. Required."
-msgstr "6 ou mais caracteres. Obrigatório."
+msgstr "6 caracteres ou mais. Obrigatório."
 
 #: ../actions/imsettings.php:197
 #, php-format
@@ -223,15 +238,15 @@ 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 IM que você "
-"informou. Você deve aprovar que %s envie mensagens para você."
+"Um código de confirmação foi enviado para o endereço de MI que você "
+"adicionou. Você deve permitir que %s envie mensagens para você."
 
 #: ../actions/emailsettings.php:213
 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 ""
-"Um código de confirmação foi enviado para o endereço de email que você "
+"Um código de confirmação foi enviado para o endereço de e-mail que você "
 "informou. Verifique sua caixa de entrada (e de spam!) para o código e "
 "instruções sobre como usá-lo."
 
@@ -240,36 +255,26 @@ 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 ""
-"Um código de confirmação foi enviado para o telefone de email que você "
-"informou. Verifique sua caixa de entrada (e de spam!) para o código e "
+"Um código de confirmação foi enviado para o número de telefone de que "
+"você informou. Verifique sua caixa de entrada (e de spam!) para o código e "
 "instruções sobre como usá-lo."
 
-#: ../actions/twitapiaccount.php:49
-#: ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88
-#: ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370
-#: ../actions/twitapistatuses.php:532
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
 #: ../actions/twitapiusers.php:122
 msgid "API method not found!"
 msgstr "Método da API não encontrado!"
 
-#: ../actions/twitapiaccount.php:57
-#: ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119
-#: ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34
-#: ../actions/twitapidirect_messages.php:43
+#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
+#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
+#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
 #: ../actions/twitapidirect_messages.php:49
 #: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62
-#: ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47
-#: ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52
-#: ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35
-#: ../actions/twitapistatuses.php:768
+#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
+#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
+#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
+#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
 msgid "API method under construction."
 msgstr "Método da API em construção."
 
@@ -281,10 +286,8 @@ msgstr "Sobre"
 msgid "Accept"
 msgstr "Aceitar"
 
-#: ../actions/emailsettings.php:62
-#: ../actions/imsettings.php:63
-#: ../actions/openidsettings.php:57
-#: ../actions/smssettings.php:71
+#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
+#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
 msgid "Add"
 msgstr "Adicionar"
 
@@ -296,8 +299,7 @@ msgstr "Adicionar OpenID"
 msgid "Add or remove OpenIDs"
 msgstr "Adicionar/Remover OpenIDs"
 
-#: ../actions/emailsettings.php:38
-#: ../actions/imsettings.php:39
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
 #: ../actions/smssettings.php:39
 msgid "Address"
 msgstr "Endereço"
@@ -318,18 +320,16 @@ msgstr "Todas as atualizações para %s"
 #: ../actions/noticesearchrss.php:66
 #, php-format
 msgid "All updates matching search term \"%s\""
-msgstr "Todas as atualizações contendo o(s) termo(s) \"%s\""
+msgstr "Todas as atualizações correspondentes ao termo \"%s\""
 
-#: ../actions/finishopenidlogin.php:29
-#: ../actions/login.php:31
-#: ../actions/openidlogin.php:29
-#: ../actions/register.php:30
+#: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
+#: ../actions/openidlogin.php:29 ../actions/register.php:30
 msgid "Already logged in."
-msgstr "Já logado."
+msgstr "Já está autenticado."
 
 #: ../lib/subs.php:42
 msgid "Already subscribed!."
-msgstr "Já assinado!."
+msgstr "Já foi assinado!"
 
 #: ../actions/deletenotice.php:54
 msgid "Are you sure you want to delete this notice?"
@@ -337,29 +337,29 @@ msgstr "Você tem certeza que deseja apagar esta mensagem?"
 
 #: ../actions/userauthorization.php:77
 msgid "Authorize subscription"
-msgstr "Authorise subscription"
+msgstr "Autorizar assinatura"
 
-#: ../actions/login.php:104
-#: ../actions/register.php:178
+#: ../actions/login.php:104 ../actions/register.php:178
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
-"Logar automaticamente no futuro; não use em computadores "
+"Entrar automaticamente no futuro sem pedir a senha. Não use em computadores "
 "compartilhados!"
 
 #: ../actions/profilesettings.php:65
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for "
 "non-humans)"
-msgstr "Seguir automaticamente à quem me seguir (bom para não humanos)"
+msgstr "Assinar automaticamente à quem me assinar (melhor para não humanos)"
 
-#: ../actions/avatar.php:32
-#: ../lib/settingsaction.php:90
+#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#, fuzzy
 msgid "Avatar"
-msgstr "Imagem de exibição"
+msgstr "Avatar"
 
 #: ../actions/avatar.php:113
+#, fuzzy
 msgid "Avatar updated."
-msgstr "Imagem de exibição atualizada."
+msgstr "O avatar foi atualizado"
 
 #: ../actions/imsettings.php:55
 #, php-format
@@ -367,8 +367,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 ""
-"Aguardando confirmação neste endereço. Verifique em sua conta de "
-"Jabber/GTalk por uma mensagem com demais instruções (Você adicionou %s à "
+"Aguardando a confirmação deste endereço. Procure em sua conta de "
+"Jabber/GTalk por uma mensagem com mais instruções (Você adicionou %s à "
 "sua lista de contatos?)"
 
 #: ../actions/emailsettings.php:54
@@ -381,39 +381,36 @@ msgstr ""
 
 #: ../actions/smssettings.php:58
 msgid "Awaiting confirmation on this phone number."
-msgstr "Aguardando a confirmação desse número de telefone."
+msgstr "Aguardando a confirmação deste número de telefone."
 
 #: ../lib/util.php:1318
 msgid "Before »"
 msgstr "Antes »"
 
-#: ../actions/profilesettings.php:49
-#: ../actions/register.php:170
+#: ../actions/profilesettings.php:49 ../actions/register.php:170
 msgid "Bio"
 msgstr "Descrição"
 
-#: ../actions/profilesettings.php:101
-#: ../actions/register.php:82
+#: ../actions/profilesettings.php:101 ../actions/register.php:82
 #: ../actions/updateprofile.php:103
 msgid "Bio is too long (max 140 chars)."
-msgstr "Descrição muito longa (máximo 140 caracteres)."
+msgstr "Descrição muito extensa (máximo 140 caracteres)."
 
 #: ../lib/deleteaction.php:41
 msgid "Can't delete this notice."
-msgstr "Não foi possível apagar esta mensagem."
+msgstr "Não é possível apagar esta mensagem."
 
 #: ../actions/updateprofile.php:119
 #, php-format
+#, fuzzy
 msgid "Can't read avatar URL '%s'"
 msgstr "Não foi possível encontrar a imagem de exibição '%s'"
 
-#: ../actions/password.php:85
-#: ../actions/recoverpassword.php:300
+#: ../actions/password.php:85 ../actions/recoverpassword.php:300
 msgid "Can't save new password."
 msgstr "Não foi possível salvar a nova senha."
 
-#: ../actions/emailsettings.php:57
-#: ../actions/imsettings.php:58
+#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
 #: ../actions/smssettings.php:62
 msgid "Cancel"
 msgstr "Cancelar"
@@ -424,11 +421,11 @@ msgstr "Não foi possível instanciar um objeto do OpenID"
 
 #: ../actions/imsettings.php:163
 msgid "Cannot normalize that Jabber ID"
-msgstr "Cannot normalise that Jabber ID"
+msgstr "Não foi possível configurar essa ID do Jabber"
 
 #: ../actions/emailsettings.php:181
 msgid "Cannot normalize that email address"
-msgstr "Não foi possível usar este endereço de email"
+msgstr "Não é possível usar este endereço de email"
 
 #: ../actions/password.php:45
 msgid "Change"
@@ -440,7 +437,7 @@ msgstr "Alterar tratamento de emails"
 
 #: ../actions/password.php:32
 msgid "Change password"
-msgstr "Alterar senha"
+msgstr "Alterar a senha"
 
 #: ../lib/settingsaction.php:94
 msgid "Change your password"
@@ -450,30 +447,27 @@ msgstr "Alterar sua senha"
 msgid "Change your profile settings"
 msgstr "Alterar suas configurações de perfil"
 
-#: ../actions/password.php:43
-#: ../actions/recoverpassword.php:181
-#: ../actions/register.php:155
-#: ../actions/smssettings.php:65
+#: ../actions/password.php:43 ../actions/recoverpassword.php:181
+#: ../actions/register.php:155 ../actions/smssettings.php:65
 msgid "Confirm"
 msgstr "Confirmar"
 
 #: ../actions/confirmaddress.php:90
 msgid "Confirm Address"
-msgstr "Confirmar endereço"
+msgstr "Confirmar o endereço"
 
-#: ../actions/emailsettings.php:238
-#: ../actions/imsettings.php:222
+#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
 #: ../actions/smssettings.php:245
 msgid "Confirmation cancelled."
-msgstr "Confirmação cancelada."
+msgstr "A confirmação foi cancelada."
 
 #: ../actions/smssettings.php:63
 msgid "Confirmation code"
-msgstr "Código de confirmação."
+msgstr "Código de confirmação"
 
 #: ../actions/confirmaddress.php:38
 msgid "Confirmation code not found."
-msgstr "Código de confirmação não encontrado."
+msgstr "O código de confirmação não foi encontrado."
 
 #: ../actions/register.php:202
 #, php-format
@@ -493,20 +487,20 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
-"Parabéns, %s! E bem vindo ao %%%%site.name%%%%. A partir de agora, você "
-"pode querer...\n"
+"Parabéns, %s! E bem vindo a %%%%site.name%%%%. A partir de agora, você "
+"algumas opções...\n"
 "\n"
-"* Acessar [seu perfil](%s) e postar sua primeira mensagem.\n"
+"* Acessar [seu perfil](%s) e publicar sua primeira mensagem.\n"
 "* Adicionar um [Endereço de Jabber/GTalk](%%%%action.imsettings%%%%) para "
-"você poder postar via IM.\n"
-"* [Pesquisar por pessoas](%%%%action.peoplesearch%%%%) você possa conhecer "
-"ou que tenha os mesmos interesses. \n"
-"* Atualizar suas [preferências de profile](%%%%action.profilesettings%%%%) "
+"você possa publicar via mensageiro instantâneo.\n"
+"* [Pesquisar por pessoas](%%%%action.peoplesearch%%%%) que você conheça ou "
+"que tenha os mesmos interesses. \n"
+"* Atualizar suas [preferências de perfil](%%%%action.profilesettings%%%%) "
 "para que outras pessoas saibam mais sobre você. \n"
-"* Ler a [documentação](%%%%doc.help%%%%) e procurar recursos que você "
-"não conhece. \n"
+"* Ler a [documentação on-line](%%%%doc.help%%%%) para conhecer os recursos "
+"disponíveis. \n"
 "\n"
-"Obrigado por se cadastrar e esperamos que aproveite o serviço."
+"Obrigado por se cadastrar e esperamos que você aproveite o serviço."
 
 #: ../actions/finishopenidlogin.php:91
 msgid "Connect"
@@ -514,26 +508,25 @@ msgstr "Conectar"
 
 #: ../actions/finishopenidlogin.php:86
 msgid "Connect existing account"
-msgstr "Conectar conta existente"
+msgstr "Conecta-se a uma conta já existente"
 
 #: ../lib/util.php:332
 msgid "Contact"
-msgstr "Contactar"
+msgstr "Contato"
 
 #: ../lib/openid.php:178
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "Não foi possível criar o formulário OpenID: %s"
 
-#: ../actions/twitapifriendships.php:60
-#: ../actions/twitapifriendships.php:76
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Não foi possível seguir o usuário: %s já está na sua lista."
 
 #: ../actions/twitapifriendships.php:53
 msgid "Could not follow user: User not found."
-msgstr "Não foi possível seguir o usuário: Usuário não encontrado."
+msgstr "Não é possível acompanhar o usuário: Usuário não encontrado."
 
 #: ../lib/openid.php:160
 #, php-format
@@ -550,7 +543,7 @@ msgstr "Não foi possível salvar as novas informações do perfil"
 
 #: ../lib/subs.php:54
 msgid "Could not subscribe other to you."
-msgstr "Não conseguiram seguir você."
+msgstr "Não é possível que outros o acompanhem."
 
 #: ../lib/subs.php:46
 msgid "Could not subscribe."
@@ -562,18 +555,16 @@ msgstr "Não foi possível atualizar o usuário com o endereço email confirmado
 
 #: ../actions/finishremotesubscribe.php:99
 msgid "Couldn't convert request tokens to access tokens."
-msgstr "Não foi possível encontrar uma página a partir da requisição feita."
+msgstr "Não foi possível encontrar a página a partir da requisição feita."
 
-#: ../actions/confirmaddress.php:84
-#: ../actions/emailsettings.php:234
-#: ../actions/imsettings.php:218
-#: ../actions/smssettings.php:241
+#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
+#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
 msgid "Couldn't delete email confirmation."
-msgstr "Não foi possível apagar a confirmação por email."
+msgstr "Não foi possível excluir a confirmação do email."
 
 #: ../lib/subs.php:103
 msgid "Couldn't delete subscription."
-msgstr "Não foi possível apagar a assinatura."
+msgstr "Não foi possível excluir a assinatura."
 
 #: ../actions/twitapistatuses.php:93
 msgid "Couldn't find any statuses."
@@ -583,38 +574,31 @@ msgstr "Não foi possível encontrar nenhum status."
 msgid "Couldn't get a request token."
 msgstr "Não foi possível processar a requisição."
 
-#: ../actions/emailsettings.php:205
-#: ../actions/imsettings.php:187
+#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
 #: ../actions/smssettings.php:206
 msgid "Couldn't insert confirmation code."
 msgstr "Não foi possível inserir o código de confirmação."
 
 #: ../actions/finishremotesubscribe.php:180
 msgid "Couldn't insert new subscription."
-msgstr "Não foi possível inserir uma nova assinatura."
+msgstr "Não foi possível inserir a nova assinatura."
 
-#: ../actions/profilesettings.php:184
-#: ../actions/twitapiaccount.php:96
+#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
 msgid "Couldn't save profile."
 msgstr "Não foi possível salvar o perfil."
 
 #: ../actions/profilesettings.php:161
 msgid "Couldn't update user for autosubscribe."
-msgstr "Não foi possível atualizar o usuário para seguir automaticamente."
+msgstr "Não foi possível atualizar o usuário para assinar automaticamente."
 
-#: ../actions/emailsettings.php:280
-#: ../actions/emailsettings.php:294
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
 msgid "Couldn't update user record."
-msgstr "Não foi possível atualizar o registro usuário."
-
-#: ../actions/confirmaddress.php:72
-#: ../actions/emailsettings.php:156
-#: ../actions/emailsettings.php:259
-#: ../actions/imsettings.php:138
-#: ../actions/imsettings.php:243
-#: ../actions/profilesettings.php:141
-#: ../actions/smssettings.php:157
-#: ../actions/smssettings.php:269
+msgstr "Não foi possível atualizar os registros do usuário."
+
+#: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
+#: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
+#: ../actions/imsettings.php:243 ../actions/profilesettings.php:141
+#: ../actions/smssettings.php:157 ../actions/smssettings.php:269
 msgid "Couldn't update user."
 msgstr "Não foi possível atualizar o usuário."
 
@@ -628,15 +612,15 @@ msgstr "Criar um novo usuário com este apelido."
 
 #: ../actions/finishopenidlogin.php:68
 msgid "Create new account"
-msgstr "Criar nova conta"
+msgstr "Criar uma nova conta"
 
 #: ../actions/finishopenidlogin.php:191
 msgid "Creating new account for OpenID that already has a user."
-msgstr "Criar uma nova conta para um OpenID que já tem um usuário."
+msgstr "Criando uma nova conta para um OpenID que já tem um usuário."
 
 #: ../actions/imsettings.php:45
 msgid "Current confirmed Jabber/GTalk address."
-msgstr "Endereço atual de Jabber/Gtalk confirmado."
+msgstr "Endereço atual de Jabber/GTalk confirmado."
 
 #: ../actions/smssettings.php:46
 msgid "Current confirmed SMS-enabled phone number."
@@ -644,56 +628,54 @@ msgstr "Telefone atualmente habilitado para receber SMS."
 
 #: ../actions/emailsettings.php:44
 msgid "Current confirmed email address."
-msgstr "Endereço atual de email."
+msgstr "Endereço confirmado de e-mail."
 
 #: ../actions/showstream.php:356
 msgid "Currently"
-msgstr "Neste momento"
+msgstr "Nesse momento"
 
 #: ../classes/Notice.php:72
 #, php-format
 msgid "DB error inserting hashtag: %s"
-msgstr "Erro no banco de dados inserindo: %s"
+msgstr "Erro no banco de dados durante a inserção da etiqueta: %s"
 
 #: ../lib/util.php:1061
 #, php-format
 msgid "DB error inserting reply: %s"
-msgstr "Erro no banco de dados inserindo a reposta: %s"
+msgstr "Erro no banco de dados na inserção da reposta: %s"
 
 #: ../actions/deletenotice.php:41
 msgid "Delete notice"
-msgstr "Apagar mensagem"
+msgstr "Excluir mensagem"
 
-#: ../actions/profilesettings.php:51
-#: ../actions/register.php:172
+#: ../actions/profilesettings.php:51 ../actions/register.php:172
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Descreva você mesmo e seus interesses em 140 caracteres."
 
-#: ../actions/register.php:158
-#: ../actions/register.php:161
+#: ../actions/register.php:158 ../actions/register.php:161
 #: ../lib/settingsaction.php:87
 msgid "Email"
-msgstr "Email"
+msgstr "E-mail"
 
 #: ../actions/emailsettings.php:59
 msgid "Email Address"
-msgstr "Endereço de email"
+msgstr "Endereço de e-mail"
 
 #: ../actions/emailsettings.php:32
 msgid "Email Settings"
-msgstr "Configurações de email"
+msgstr "Configurações do e-mail"
 
 #: ../actions/register.php:73
 msgid "Email address already exists."
-msgstr "O endereço de email já existe."
+msgstr "O endereço de e-mail já existe."
 
 #: ../lib/mail.php:90
 msgid "Email address confirmation"
-msgstr "Confirmação de endereço de email"
+msgstr "Confirmação do endereço de e-mail"
 
 #: ../actions/emailsettings.php:61
 msgid "Email address, like \"UserName@example.org\""
-msgstr "Endereço de email, ex: \"Usuario@exemplo.org\""
+msgstr "Endereço de email, ex: \"usuário@exemplo.org\""
 
 #: ../actions/invite.php:129
 msgid "Email addresses"
@@ -701,7 +683,7 @@ msgstr "Endereço de email"
 
 #: ../actions/recoverpassword.php:191
 msgid "Enter a nickname or email address."
-msgstr "Informe um apelido ou endereço de email."
+msgstr "Informe um apelido ou endereço de e-mail."
 
 #: ../actions/smssettings.php:64
 msgid "Enter the code you received on your phone."
@@ -709,62 +691,60 @@ msgstr "Informe o código que você recebeu no seu telefone."
 
 #: ../actions/userauthorization.php:137
 msgid "Error authorizing token"
-msgstr "Error authorising token"
+msgstr "Erro na autorização do token"
 
 #: ../actions/finishopenidlogin.php:253
 msgid "Error connecting user to OpenID."
-msgstr "Erro ao nectar usuário ao OpenID."
+msgstr "Erro na conexão do usuário ao OpenID."
 
 #: ../actions/finishaddopenid.php:78
 msgid "Error connecting user."
-msgstr "Erro conectando usuário."
+msgstr "Erro na conexão do usuário."
 
 #: ../actions/finishremotesubscribe.php:151
 msgid "Error inserting avatar"
-msgstr "Erro inserindo imagem de exibição"
+msgstr "Erro na inserção do avatar"
 
 #: ../actions/finishremotesubscribe.php:143
 msgid "Error inserting new profile"
-msgstr "Erro inserindo novo perfil"
+msgstr "Erro na inserção do novo perfil"
 
 #: ../actions/finishremotesubscribe.php:167
 msgid "Error inserting remote profile"
-msgstr "Erro inserindo perfil remoto"
+msgstr "Erro na inserção do perfil remoto"
 
 #: ../actions/recoverpassword.php:240
 msgid "Error saving address confirmation."
-msgstr "Erro salvando endereço de confirmação"
+msgstr "Erro no salvamento do endereço de confirmação"
 
 #: ../actions/userauthorization.php:140
 msgid "Error saving remote profile"
-msgstr "Erro salvando endereço remoto"
+msgstr "Erro no salvamento do perfil remoto"
 
 #: ../lib/openid.php:226
 msgid "Error saving the profile."
-msgstr "Erro salvando o perfil."
+msgstr "Erro no salvamento do perfil."
 
 #: ../lib/openid.php:237
 msgid "Error saving the user."
-msgstr "Erro salvando o usuário."
+msgstr "Erro no salvamento do usuário."
 
 #: ../actions/password.php:80
 msgid "Error saving user; invalid."
-msgstr "Erro salvando o usuário; inválido."
+msgstr "Erro no salvamento do usuário; inválido."
 
-#: ../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:307 ../actions/register.php:98
 msgid "Error setting user."
-msgstr "Erro setando o usuário."
+msgstr "Erro na configuração do usuário."
 
 #: ../actions/finishaddopenid.php:83
 msgid "Error updating profile"
-msgstr "Erro atualizando o perfil"
+msgstr "Erro na atualização do perfil"
 
 #: ../actions/finishremotesubscribe.php:161
 msgid "Error updating remote profile"
-msgstr "Erro atualizando o perfil remoto"
+msgstr "Erro na atualização do perfil remoto"
 
 #: ../actions/recoverpassword.php:80
 msgid "Error with confirmation code."
@@ -772,7 +752,7 @@ msgstr "Erro com o código de confirmação."
 
 #: ../actions/finishopenidlogin.php:89
 msgid "Existing nickname"
-msgstr "Apelido existente"
+msgstr "Esse apelido já existe"
 
 #: ../lib/util.php:326
 msgid "FAQ"
@@ -780,48 +760,44 @@ msgstr "FAQ"
 
 #: ../actions/avatar.php:115
 msgid "Failed updating avatar."
-msgstr "Houve uma falha ao atualizar a imagem de exibição."
+msgstr "Não foi possível atualizar o avatar."
 
-#: ../actions/all.php:61
-#: ../actions/allrss.php:64
+#: ../actions/all.php:61 ../actions/allrss.php:64
 #, php-format
 msgid "Feed for friends of %s"
-msgstr "Feed para amigos de %s"
+msgstr "Mensagens dos amigos de %s"
 
-#: ../actions/replies.php:65
-#: ../actions/repliesrss.php:80
+#: ../actions/replies.php:65 ../actions/repliesrss.php:80
 #, php-format
 msgid "Feed for replies to %s"
-msgstr "Feed para respostas de %s"
+msgstr "Respostas de %s"
 
 #: ../actions/tag.php:55
 #, php-format
 msgid "Feed for tag %s"
-msgstr "Feed para tag %s"
+msgstr "Mensagens com a etiqueta %s"
 
 #: ../lib/searchaction.php:105
 msgid "Find content of notices"
-msgstr "Pesquisar conteúdo de mensagens"
+msgstr "Pesquisar o conteúdo das mensagens"
 
 #: ../lib/searchaction.php:101
 msgid "Find people on this site"
-msgstr "Encontrar pessoas nesse site"
+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, informe novamente seu nome de usuário "
+"Por razões de segurança, por favor, digite novamente seu nome de usuário "
 "e senha antes de alterar suas configurações."
 
-#: ../actions/profilesettings.php:44
-#: ../actions/register.php:164
+#: ../actions/profilesettings.php:44 ../actions/register.php:164
 msgid "Full name"
 msgstr "Nome completo"
 
-#: ../actions/profilesettings.php:98
-#: ../actions/register.php:79
+#: ../actions/profilesettings.php:98 ../actions/register.php:79
 #: ../actions/updateprofile.php:93
 msgid "Full name is too long (max 255 chars)."
 msgstr "Nome completo muito longo (máx. 255 caracteres)"
@@ -834,19 +810,17 @@ msgstr "Ajuda"
 msgid "Home"
 msgstr "Início"
 
-#: ../actions/profilesettings.php:46
-#: ../actions/register.php:167
+#: ../actions/profilesettings.php:46 ../actions/register.php:167
 msgid "Homepage"
-msgstr "Site"
+msgstr "Sítio de Internet"
 
-#: ../actions/profilesettings.php:95
-#: ../actions/register.php:76
+#: ../actions/profilesettings.php:95 ../actions/register.php:76
 msgid "Homepage is not a valid URL."
-msgstr "A URL informada não é válida"
+msgstr "A URL informada não é válida."
 
 #: ../actions/emailsettings.php:91
 msgid "I want to post notices by email."
-msgstr "Eu quero postar mensagens por email."
+msgstr "Eu quero publicar mensagens por e-mail."
 
 #: ../lib/settingsaction.php:102
 msgid "IM"
@@ -854,27 +828,27 @@ msgstr "IM"
 
 #: ../actions/imsettings.php:60
 msgid "IM Address"
-msgstr "Endereço de IM"
+msgstr "Endereço do mensageiro instantâneo"
 
 #: ../actions/imsettings.php:33
 msgid "IM Settings"
-msgstr "Configuração de IM"
+msgstr "Configuração do mensageiro instantâneo"
 
 #: ../actions/finishopenidlogin.php:88
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
 msgstr ""
-"Se você já tem uma conta, logue com seu usuário e senha para conectá-la "
-"no seu OpenID."
+"Se você já possui uma conta, utilize seu nome de usuário e senha para "
+"conectá-la 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 você quer adicionar um OpenID para sua conta, informe-a na caixa abaixo "
-"e clique em \"Adicionar\"."
+"Se você quer adicionar uma OpenID à sua conta, informe-a na caixa abaixo e "
+"clique em \"Adicionar\"."
 
 #: ../actions/recoverpassword.php:137
 msgid ""
@@ -884,18 +858,17 @@ msgstr ""
 "Se você esqueceu ou perdeu sua senha, você pode ter uma nova enviada para "
 "o endereço de email informado em seu cadastro."
 
-#: ../actions/emailsettings.php:67
-#: ../actions/smssettings.php:76
+#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 msgid "Incoming email"
-msgstr "Email(s) recebido(s)"
+msgstr "E-mail de recebimento"
 
 #: ../actions/emailsettings.php:283
 msgid "Incoming email address removed."
-msgstr "O endereço de email para de recebimento foi removido."
+msgstr "O endereço de e-mail de recebimento foi removido."
 
 #: ../actions/password.php:69
 msgid "Incorrect old password"
-msgstr "Senha antiga incorreta"
+msgstr "A senha antiga está incorreta"
 
 #: ../actions/login.php:67
 msgid "Incorrect username or password."
@@ -906,13 +879,13 @@ msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
-"As Instruções para recuperar sua senha foram enviadas para o endereço de "
-"email registrado no seu cadastro."
+"As instruções para recuperar sua senha foram enviadas para o endereço de "
+"e-mail registrado no seu cadastro."
 
 #: ../actions/updateprofile.php:114
 #, php-format
 msgid "Invalid avatar URL '%s'"
-msgstr "URL para a imagem de exibição inválida '%s'"
+msgstr "A URL '%s' para a imagem de exibição é inválida"
 
 #: ../actions/invite.php:55
 #, php-format
@@ -922,24 +895,24 @@ msgstr "Não é um endereço de email válido: %s"
 #: ../actions/updateprofile.php:98
 #, php-format
 msgid "Invalid homepage '%s'"
-msgstr "Site inválido '%s'"
+msgstr "O site '%s' é inválido"
 
 #: ../actions/updateprofile.php:82
 #, php-format
 msgid "Invalid license URL '%s'"
-msgstr "URL de licença inválida '%s'"
+msgstr "A URL '%s' da licença é inválida"
 
 #: ../actions/postnotice.php:61
 msgid "Invalid notice content"
-msgstr "Conteúdo da mensagem inválido"
+msgstr "O conteúdo da mensagem é inválido"
 
 #: ../actions/postnotice.php:67
 msgid "Invalid notice uri"
-msgstr "URI de mensagem inválida"
+msgstr "A URI da mensagem é inválida"
 
 #: ../actions/postnotice.php:72
 msgid "Invalid notice url"
-msgstr "URL de mensagem inválida"
+msgstr "A URL da mensagem é inválida"
 
 #: ../actions/updateprofile.php:87
 #, php-format
@@ -948,18 +921,17 @@ msgstr "URL de perfil inválida '%s'."
 
 #: ../actions/remotesubscribe.php:96
 msgid "Invalid profile URL (bad format)"
-msgstr "URL de perfil inválida (formato inválido)"
+msgstr "A URL do perfil é inválida (formato inválido)"
 
 #: ../actions/finishremotesubscribe.php:77
 msgid "Invalid profile URL returned by server."
-msgstr "URL de perfil inválida, retornada pelo servidor."
+msgstr "A URL do perfil retornada pelo servidor é inválida."
 
 #: ../actions/avatarbynickname.php:37
 msgid "Invalid size."
 msgstr "Tamanho inválido"
 
-#: ../actions/finishopenidlogin.php:235
-#: ../actions/register.php:93
+#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
 #: ../actions/register.php:111
 msgid "Invalid username or password."
 msgstr "Nome de usuário e/ou senha inválido(s)"
@@ -987,13 +959,13 @@ msgid ""
 "%s, available under the [GNU Affero General Public "
 "License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
-"Ele roda o software de microblogging [Laconica](http://laconi.ca/), versão "
-"%s, disponível sob a [GNU Affero General Public License] "
+"Ele funciona sob o software de microblog [Laconica](http://laconi.ca/), "
+"versão %s, disponível sob a [GNU Affero General Public License] "
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #: ../actions/imsettings.php:173
 msgid "Jabber ID already belongs to another user."
-msgstr "Este id de Jabber já pertence à outro usuário."
+msgstr "Este ID do Jabber já pertence à outro usuário."
 
 #: ../actions/imsettings.php:62
 #, php-format
@@ -1001,7 +973,7 @@ 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 ""
-"Endereço de Jabber ou GTalk, ex: \"Usuario@exemplo.org\". Primeiro, "
+"Endereço de Jabber ou GTalk, ex: \"usuario@exemplo.org\". Primeiro, "
 "certifique-se de adicionar %s à sua lista de contatos no seu cliente de IM "
 "ou no GTalk."
 
@@ -1011,30 +983,26 @@ msgstr "Idioma"
 
 #: ../actions/profilesettings.php:113
 msgid "Language is too long (max 50 chars)."
-msgstr "Idioma muito longo (máx. 50 caracteres)."
+msgstr "Nome do idioma muito extenso (máx. 50 caracteres)."
 
-#: ../actions/profilesettings.php:52
-#: ../actions/register.php:173
+#: ../actions/profilesettings.php:52 ../actions/register.php:173
 msgid "Location"
-msgstr "Localidade"
+msgstr "Localização"
 
-#: ../actions/profilesettings.php:104
-#: ../actions/register.php:85
+#: ../actions/profilesettings.php:104 ../actions/register.php:85
 #: ../actions/updateprofile.php:108
 msgid "Location is too long (max 255 chars)."
-msgstr "Localidade muito longa (máx. 255 caracteres)."
+msgstr "A localização é 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 ../actions/login.php:106
+#: ../actions/openidlogin.php:68 ../lib/util.php:310
 msgid "Login"
-msgstr "Login"
+msgstr "Autenticação"
 
 #: ../actions/openidlogin.php:44
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "Logue-se com uma conta [OpenID](%%doc.openid%%)."
+msgstr "Autentique-se com uma conta [OpenID](%%doc.openid%%)."
 
 #: ../actions/login.php:126
 #, php-format
@@ -1043,8 +1011,8 @@ msgid ""
 "[Register](%%action.register%%) a new account, or try "
 "[OpenID](%%action.openidlogin%%). "
 msgstr ""
-"Logue-se com seus nome de usuário e senha. Não tem um usuário ainda? "
-"[Registre](%%action.register%%) uma nova conta, ou tente um login via "
+"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%%)."
 
 #: ../lib/util.php:308
@@ -1059,10 +1027,9 @@ msgstr "Nome completo, de preferência seu nome \"real\""
 msgid "Lost or forgotten password?"
 msgstr "Perdeu ou esqueceu sua senha?"
 
-#: ../actions/emailsettings.php:80
-#: ../actions/smssettings.php:89
+#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 msgid "Make a new email address for posting to; cancels the old one."
-msgstr "Crie um novo endereço de email para postar; cancele o antigo."
+msgstr "Cria um novo endereço de email para publicar e cancela o antigo."
 
 #: ../actions/emailsettings.php:27
 #, php-format
@@ -1085,15 +1052,14 @@ msgid ""
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 "Operadora móvel do seu celular. Se você conhece uma operadora que aceita "
-"SMS via email, mas não está listada aqui, nos informe. Envie um email para "
+"SMS via e-mail, mas não está listada aqui, informe-nos enviando um e-mail "
+"para %s."
 
-#: ../actions/finishopenidlogin.php:79
-#: ../actions/register.php:188
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 msgid "My text and files are available under "
 msgstr "Meus textos e arquivos estão disponíveis sob"
 
-#: ../actions/emailsettings.php:82
-#: ../actions/smssettings.php:91
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
 msgid "New"
 msgstr "Novo"
 
@@ -1104,7 +1070,9 @@ msgstr "Novo endereço de email para postar no %s"
 
 #: ../actions/emailsettings.php:297
 msgid "New incoming email address added."
-msgstr "Novo endereço para recebimento de email adicionado."
+msgstr ""
+"Foi adicionado um novo endereço de e-mail para recebimento de "
+"mensagens."
 
 #: ../actions/finishopenidlogin.php:71
 msgid "New nickname"
@@ -1114,39 +1082,36 @@ msgstr "Novo apelido"
 msgid "New notice"
 msgstr "Nova mensagem"
 
-#: ../actions/password.php:41
-#: ../actions/recoverpassword.php:179
+#: ../actions/password.php:41 ../actions/recoverpassword.php:179
 msgid "New password"
 msgstr "Nova senha"
 
 #: ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
-msgstr "Nova senha salva com sucesso. Você está logado a partir de agora."
+msgstr ""
+"A nova senha foi salva com sucesso. A partir de agora você já está "
+"autenticado."
 
-#: ../actions/login.php:101
-#: ../actions/profilesettings.php:41
+#: ../actions/login.php:101 ../actions/profilesettings.php:41
 #: ../actions/register.php:151
 msgid "Nickname"
 msgstr "Apelido"
 
-#: ../actions/finishopenidlogin.php:175
-#: ../actions/profilesettings.php:110
+#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
 #: ../actions/register.php:69
 msgid "Nickname already in use. Try another one."
-msgstr "Apelido já existe. Tente um outro."
+msgstr "Esse apelido já está em uso. Tente outro."
 
-#: ../actions/finishopenidlogin.php:165
-#: ../actions/profilesettings.php:88
-#: ../actions/register.php:67
-#: ../actions/updateprofile.php:77
+#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
+#: ../actions/register.php:67 ../actions/updateprofile.php:77
 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 sem "
-"espaços."
+"O apelido deve conter apenas letras minúsculas e/ou números e não pode "
+"ter espaços."
 
 #: ../actions/finishopenidlogin.php:170
 msgid "Nickname not allowed."
-msgstr "Apelido não permitido"
+msgstr "Esse apelido não é permitido."
 
 #: ../actions/remotesubscribe.php:72
 msgid "Nickname of the user you want to follow"
@@ -1154,7 +1119,7 @@ msgstr "Apelido do usuário que você quer seguir"
 
 #: ../actions/recoverpassword.php:162
 msgid "Nickname or email"
-msgstr "Apelido ou email"
+msgstr "Apelido ou e-mail"
 
 #: ../actions/deletenotice.php:59
 msgid "No"
@@ -1162,72 +1127,70 @@ msgstr "Não"
 
 #: ../actions/imsettings.php:156
 msgid "No Jabber ID."
-msgstr "Sem id de Jabber."
+msgstr "Nenhuma ID de Jabber."
 
 #: ../actions/userauthorization.php:129
 msgid "No authorization request!"
-msgstr "Sem pedido de autorização!"
+msgstr "Nenhum pedido de autorização!"
 
 #: ../actions/smssettings.php:181
 msgid "No carrier selected."
-msgstr "Sem operadora selecionada."
+msgstr "Não foi selecionada nenhuma operadora."
 
 #: ../actions/smssettings.php:316
 msgid "No code entered"
-msgstr "Sem código informado"
+msgstr "Não foi informado nenhum código"
 
 #: ../actions/confirmaddress.php:33
 msgid "No confirmation code."
-msgstr "Sem código de confirmação."
+msgstr "Nenhum código de confirmação."
 
 #: ../actions/newnotice.php:44
 msgid "No content!"
-msgstr "Sem conteúdo postado!"
+msgstr "Nenhum conteúdo!"
 
 #: ../actions/emailsettings.php:174
 msgid "No email address."
-msgstr "Sem endereço de email."
+msgstr "Nenhum endereço de e-mail."
 
 #: ../actions/userbyid.php:32
 msgid "No id."
-msgstr "Sem id."
+msgstr "Nenhuma ID."
 
 #: ../actions/emailsettings.php:271
 msgid "No incoming email address."
-msgstr "Sem endereço para recebimento de emails."
+msgstr "Nenhum endereço de e-mail para recebimentos."
 
 #: ../actions/finishremotesubscribe.php:65
 msgid "No nickname provided by remote server."
-msgstr "O servidor remoto não informou um apelido."
+msgstr "Nenhum apelido fornecido pelo servidor remoto."
 
 #: ../actions/avatarbynickname.php:27
 msgid "No nickname."
 msgstr "Sem apelido."
 
-#: ../actions/emailsettings.php:222
-#: ../actions/imsettings.php:206
+#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
 #: ../actions/smssettings.php:229
 msgid "No pending confirmation to cancel."
-msgstr "Sem confirmação para cancelar."
+msgstr "Nenhuma confirmação para cancelar."
 
 #: ../actions/smssettings.php:176
 msgid "No phone number."
-msgstr "Sem telefone cadastrado."
+msgstr "Nenhum telefone cadastrado."
 
 #: ../actions/finishremotesubscribe.php:72
 msgid "No profile URL returned by server."
-msgstr "Sem URL de perfil retornada pelo servidor."
+msgstr "Nenhuma URL de perfil retornada pelo servidor."
 
 #: ../actions/recoverpassword.php:226
 msgid "No registered email address for that user."
-msgstr "Sem endereço de email informado para este usuário."
+msgstr "Nenhum endereço de e-mail registrado para esse usuário."
 
 #: ../actions/userauthorization.php:49
 msgid "No request found!"
-msgstr "Requisição não encontrada!"
+msgstr "Não foi encontrada nenhuma requisição!"
 
-#: ../actions/noticesearch.php:64
-#: ../actions/peoplesearch.php:64
+#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
 msgid "No results"
 msgstr "Não foi encontrado nenhum resultado"
 
@@ -1245,41 +1208,32 @@ msgstr "Nenhum status com esse ID foi encontrado."
 
 #: ../actions/openidsettings.php:135
 msgid "No such OpenID."
-msgstr "OpenID não encontrado."
+msgstr "Essa OpenID não existe."
 
 #: ../actions/doc.php:29
 msgid "No such document."
-msgstr "Documento não encontrado."
+msgstr "Esse documento não existe."
 
-#: ../actions/shownotice.php:32
-#: ../actions/shownotice.php:83
+#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
 #: ../lib/deleteaction.php:30
 msgid "No such notice."
-msgstr "mensagem não encontrada."
+msgstr "Essa mensagem não existe."
 
 #: ../actions/recoverpassword.php:56
 msgid "No such recovery code."
-msgstr "Código de recuperação não encontrado."
+msgstr "Esse código de recuperação não existe."
 
 #: ../actions/postnotice.php:56
 msgid "No such subscription"
-msgstr "Assinatura não encontrada"
-
-#: ../actions/all.php:34
-#: ../actions/allrss.php:35
-#: ../actions/avatarbynickname.php:43
-#: ../actions/foaf.php:40
-#: ../actions/remotesubscribe.php:84
-#: ../actions/remotesubscribe.php:91
-#: ../actions/replies.php:57
-#: ../actions/repliesrss.php:35
-#: ../actions/showstream.php:110
-#: ../actions/userbyid.php:36
-#: ../actions/userrss.php:35
-#: ../actions/xrds.php:35
-#: ../lib/gallery.php:57
-#: ../lib/subs.php:33
-#: ../lib/subs.php:82
+msgstr "Essa assinatura não existe."
+
+#: ../actions/all.php:34 ../actions/allrss.php:35
+#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
+#: ../actions/remotesubscribe.php:84 ../actions/remotesubscribe.php:91
+#: ../actions/replies.php:57 ../actions/repliesrss.php:35
+#: ../actions/showstream.php:110 ../actions/userbyid.php:36
+#: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
+#: ../lib/subs.php:33 ../lib/subs.php:82
 msgid "No such user."
 msgstr "Usuário não encontrado."
 
@@ -1299,30 +1253,28 @@ msgstr "Não é um código de recuperação"
 msgid "Not a registered user."
 msgstr "Não é um usuário registrado."
 
-#: ../lib/twitterapi.php:226
-#: ../lib/twitterapi.php:247
+#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
 #: ../lib/twitterapi.php:332
 msgid "Not a supported data format."
 msgstr "Formato de dados não suportado."
 
 #: ../actions/imsettings.php:167
 msgid "Not a valid Jabber ID"
-msgstr "Não é um id de Jabber válido"
+msgstr "Não é uma ID válida de Jabber"
 
 #: ../lib/openid.php:131
 msgid "Not a valid OpenID."
-msgstr "Não é um OpenID válido."
+msgstr "Não é uma OpenID válida."
 
 #: ../actions/emailsettings.php:185
 msgid "Not a valid email address"
-msgstr "Não é um endereço de email válido."
+msgstr "Não é um endereço de e-mail válido."
 
 #: ../actions/register.php:63
 msgid "Not a valid email address."
-msgstr "Não é um endereço de email válido."
+msgstr "Não é um endereço de e-mail válido."
 
-#: ../actions/profilesettings.php:91
-#: ../actions/register.php:71
+#: ../actions/profilesettings.php:91 ../actions/register.php:71
 msgid "Not a valid nickname."
 msgstr "Não é um apelido válido."
 
@@ -1332,11 +1284,11 @@ msgstr "Não é uma URL de perfil válida (serviço incorreto)."
 
 #: ../actions/remotesubscribe.php:113
 msgid "Not a valid profile URL (no XRDS defined)."
-msgstr "Não é uma URL de perfil válida (sem XRDS definido)."
+msgstr "Não é uma URL de perfil válida (nenhum XRDS definido)."
 
 #: ../actions/remotesubscribe.php:104
 msgid "Not a valid profile URL (no YADIS document)."
-msgstr "Não é uma URL de perfil válida (sem documento YADIS)."
+msgstr "Não é uma URL de perfil válida (nenhum documento YADIS)."
 
 #: ../actions/avatar.php:95
 msgid "Not an image or corrupt file."
@@ -1348,45 +1300,41 @@ msgstr "Não autorizado."
 
 #: ../actions/finishremotesubscribe.php:38
 msgid "Not expecting this response!"
-msgstr "Retorno não esperado!"
+msgstr "Não esperava por esta resposta!"
 
 #: ../actions/twitapistatuses.php:422
 msgid "Not found"
 msgstr "Não encontrado"
 
-#: ../actions/finishaddopenid.php:29
-#: ../actions/logout.php:33
-#: ../actions/newnotice.php:29
-#: ../actions/subscribe.php:28
-#: ../actions/unsubscribe.php:25
-#: ../lib/deleteaction.php:38
+#: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
+#: ../actions/newnotice.php:29 ../actions/subscribe.php:28
+#: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
 #: ../lib/settingsaction.php:27
 msgid "Not logged in."
 msgstr "Você não está logado"
 
 #: ../lib/subs.php:91
 msgid "Not subscribed!."
-msgstr "Não assinado!"
+msgstr "Não é assinado!"
 
 #: ../actions/opensearch.php:35
 msgid "Notice Search"
-msgstr "Pesquisar mensagens"
+msgstr "Pesquisar por mensagem"
 
 #: ../actions/showstream.php:82
 #, php-format
 msgid "Notice feed for %s"
-msgstr "Feed de mensagens para %s"
+msgstr "Mensagens de %s"
 
 #: ../actions/shownotice.php:39
 msgid "Notice has no profile"
-msgstr "mensagem sem perfil associado"
+msgstr "A mensagem não está associada a nenhum perfil"
 
 #: ../actions/showstream.php:316
 msgid "Notices"
-msgstr "mensagens"
+msgstr "Mensagens"
 
-#: ../actions/tag.php:35
-#: ../actions/tag.php:81
+#: ../actions/tag.php:35 ../actions/tag.php:81
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Feed de mensagens com %s"
@@ -1395,40 +1343,35 @@ msgstr "Feed de mensagens com %s"
 msgid "Old password"
 msgstr "Senha antiga"
 
-#: ../lib/settingsaction.php:96
-#: ../lib/util.php:314
+#: ../lib/settingsaction.php:96 ../lib/util.php:314
 msgid "OpenID"
 msgstr "OpenID"
 
 #: ../actions/finishopenidlogin.php:61
 msgid "OpenID Account Setup"
-msgstr "Setup de conta OpenID"
+msgstr "Configuração da conta OpenID"
 
 #: ../lib/openid.php:180
 msgid "OpenID Auto-Submit"
-msgstr "Auto conectar OpenID"
+msgstr "Submissão automática da OpenID"
 
-#: ../actions/finishaddopenid.php:99
-#: ../actions/finishopenidlogin.php:140
+#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
 #: ../actions/openidlogin.php:60
 msgid "OpenID Login"
-msgstr "Login OpenID"
+msgstr "Autenticar-se via OpenID"
 
-#: ../actions/openidlogin.php:65
-#: ../actions/openidsettings.php:49
+#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 msgid "OpenID URL"
-msgstr "URL OpenID"
+msgstr "URL da OpenID"
 
-#: ../actions/finishaddopenid.php:42
-#: ../actions/finishopenidlogin.php:103
+#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
 msgid "OpenID authentication cancelled."
-msgstr "Autenticação OpenID cancelada."
+msgstr "A autenticação pela OpenID foi cancelada."
 
-#: ../actions/finishaddopenid.php:46
-#: ../actions/finishopenidlogin.php:107
+#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
 #, php-format
 msgid "OpenID authentication failed: %s"
-msgstr "A autenticação OpenID falhou: %s"
+msgstr "Não foi possível autenticar via OpenID: %s"
 
 #: ../lib/openid.php:133
 #, php-format
@@ -1437,11 +1380,11 @@ msgstr "Falha no OpenID: %s"
 
 #: ../actions/openidsettings.php:144
 msgid "OpenID removed."
-msgstr "OpenID removido."
+msgstr "A OpenID foi removida."
 
 #: ../actions/openidsettings.php:37
 msgid "OpenID settings"
-msgstr "Configurações do OpenID"
+msgstr "Configurações da OpenID"
 
 #: ../actions/invite.php:135
 msgid "Optionally add a personal message to the invitation."
@@ -1449,12 +1392,10 @@ msgstr "Opcionalmente adicione uma mensagem pessoal ao convite."
 
 #: ../actions/avatar.php:84
 msgid "Partial upload."
-msgstr "Upload parcial."
+msgstr "Envio parcial."
 
-#: ../actions/finishopenidlogin.php:90
-#: ../actions/login.php:102
-#: ../actions/register.php:153
-#: ../lib/settingsaction.php:93
+#: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
+#: ../actions/register.php:153 ../lib/settingsaction.php:93
 msgid "Password"
 msgstr "Senha"
 
@@ -1466,20 +1407,17 @@ msgstr "A senha e a confirmação não coincidem."
 msgid "Password must be 6 chars or more."
 msgstr "A senha deve ter 6 caracteres ou mais."
 
-#: ../actions/recoverpassword.php:261
-#: ../actions/recoverpassword.php:263
+#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
 msgid "Password recovery requested"
-msgstr "Requisição de recuperação de senha"
+msgstr "Foi solicitada a recuperação da senha"
 
-#: ../actions/password.php:89
-#: ../actions/recoverpassword.php:313
+#: ../actions/password.php:89 ../actions/recoverpassword.php:313
 msgid "Password saved."
-msgstr "Senha salva."
+msgstr "A senha foi salva."
 
-#: ../actions/password.php:61
-#: ../actions/register.php:88
+#: ../actions/password.php:61 ../actions/register.php:88
 msgid "Passwords don't match."
-msgstr "Senhas não coincidem."
+msgstr "As senhas não coincidem."
 
 #: ../lib/searchaction.php:100
 msgid "People"
@@ -1491,7 +1429,7 @@ msgstr "Busca por pessoas"
 
 #: ../actions/peoplesearch.php:33
 msgid "People search"
-msgstr "Busca por pessoas"
+msgstr "Procurar pessoas"
 
 #: ../lib/stream.php:50
 msgid "Personal"
@@ -1511,25 +1449,23 @@ msgid ""
 "user's notices. If you didn't just ask to subscribe to someone's notices, "
 "click \"Cancel\"."
 msgstr ""
-"Por favor, verifique estes detalehs para ter certeza que você quer assinar "
-"as mensagens desse usuário. Se você não desejar assinar esses mensagens, "
-"clique em \"Cancelar\"."
+"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\"."
 
 #: ../actions/imsettings.php:73
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Informar minhas mudanças de estado no Jabber/GTalk como uma mensagem."
 
-#: ../actions/emailsettings.php:85
-#: ../actions/imsettings.php:67
+#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
 #: ../actions/smssettings.php:94
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../actions/emailsettings.php:162
-#: ../actions/imsettings.php:144
+#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
 #: ../actions/smssettings.php:163
 msgid "Preferences saved."
-msgstr "Preferências salvas"
+msgstr "As preferências foram salvas."
 
 #: ../actions/profilesettings.php:57
 msgid "Preferred language"
@@ -1539,13 +1475,11 @@ msgstr "Idioma"
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: ../classes/Notice.php:95
-#: ../classes/Notice.php:106
+#: ../classes/Notice.php:95 ../classes/Notice.php:106
 msgid "Problem saving notice."
-msgstr "Problema salvando mensagem."
+msgstr "Problema no salvamento da mensagem."
 
-#: ../lib/settingsaction.php:84
-#: ../lib/stream.php:60
+#: ../lib/settingsaction.php:84 ../lib/stream.php:60
 msgid "Profile"
 msgstr "Perfil"
 
@@ -1557,14 +1491,13 @@ msgstr "URL do Perfil"
 msgid "Profile settings"
 msgstr "Configurações de perfil"
 
-#: ../actions/postnotice.php:51
-#: ../actions/updateprofile.php:52
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
 msgid "Profile unknown"
 msgstr "Perfil desconhecido"
 
 #: ../actions/public.php:54
 msgid "Public Stream Feed"
-msgstr "Feed público"
+msgstr "Fluxo de mensagens públicas"
 
 #: ../actions/public.php:33
 msgid "Public timeline"
@@ -1578,8 +1511,7 @@ msgstr "Publique um MicroID com meu Endereço de Jabber/Gtalk."
 msgid "Publish a MicroID for my email address."
 msgstr "Publique um MicroID para meu endereço de email."
 
-#: ../actions/tag.php:75
-#: ../actions/tag.php:76
+#: ../actions/tag.php:75 ../actions/tag.php:76
 msgid "Recent Tags"
 msgstr "Tags recentes"
 
@@ -1589,15 +1521,13 @@ msgstr "Recuperar"
 
 #: ../actions/recoverpassword.php:156
 msgid "Recover password"
-msgstr "Recuperar senha"
+msgstr "Recuperar a senha"
 
 #: ../actions/recoverpassword.php:67
 msgid "Recovery code for unknown user."
 msgstr "Código de confirmação para usuário desconhecido."
 
-#: ../actions/register.php:142
-#: ../actions/register.php:193
-#: ../lib/util.php:312
+#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
 msgid "Register"
 msgstr "Registrar"
 
@@ -1613,10 +1543,9 @@ msgstr "Registro completo"
 msgid "Reject"
 msgstr "Recusar"
 
-#: ../actions/login.php:103
-#: ../actions/register.php:176
+#: ../actions/login.php:103 ../actions/register.php:176
 msgid "Remember me"
-msgstr "Lembre meu login"
+msgstr "Lembrar minha autenticação nesse computador"
 
 #: ../actions/updateprofile.php:70
 msgid "Remote profile with no matching profile"
@@ -1626,12 +1555,9 @@ msgstr "Perfil remoto sem referencia local"
 msgid "Remote subscribe"
 msgstr "Assinatura remota"
 
-#: ../actions/emailsettings.php:47
-#: ../actions/emailsettings.php:75
-#: ../actions/imsettings.php:48
-#: ../actions/openidsettings.php:106
-#: ../actions/smssettings.php:50
-#: ../actions/smssettings.php:84
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
+#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
 msgid "Remove"
 msgstr "Remover"
 
@@ -1644,27 +1570,25 @@ msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 msgstr ""
-"Removendo seu único OpenID pode fazer com que seja impossível de se logar! "
-"Se você precisa removê-lo, adicione um outro antes."
+"Remover a sua única OpenID pode fazer com que seja impossível você se "
+"autenticar novamente! Se deseja realmente, adicione outra OpenID antes."
 
 #: ../lib/stream.php:55
 msgid "Replies"
 msgstr "Respostas"
 
-#: ../actions/replies.php:47
-#: ../actions/repliesrss.php:76
-#: ../lib/stream.php:56
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
 #, php-format
 msgid "Replies to %s"
 msgstr "Respostas para %s"
 
 #: ../actions/recoverpassword.php:183
 msgid "Reset"
-msgstr "Resetar"
+msgstr "Restaurar"
 
 #: ../actions/recoverpassword.php:173
 msgid "Reset password"
-msgstr "Resetar senha"
+msgstr "Restaurar a senha"
 
 #: ../lib/settingsaction.php:99
 msgid "SMS"
@@ -1690,21 +1614,18 @@ msgstr "Igual à senha acima"
 msgid "Same as password above. Required."
 msgstr "Igual à senha acima. Obrigatório"
 
-#: ../actions/emailsettings.php:97
-#: ../actions/imsettings.php:81
-#: ../actions/profilesettings.php:67
-#: ../actions/smssettings.php:100
+#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
+#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
 msgid "Save"
 msgstr "Salvar"
 
-#: ../lib/searchaction.php:84
-#: ../lib/util.php:300
+#: ../lib/searchaction.php:84 ../lib/util.php:300
 msgid "Search"
 msgstr "Pesquisar"
 
 #: ../actions/noticesearch.php:80
 msgid "Search Stream Feed"
-msgstr "Pesquisar nos Feeds"
+msgstr "Pesquisar no fluxo de mensagens"
 
 #: ../actions/noticesearch.php:30
 #, php-format
@@ -1712,8 +1633,8 @@ msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
 "by spaces; they must be 3 characters or more."
 msgstr ""
-"Pesquisar por mensagens no %%site.name%% por seus conteúdos. Separe os "
-"termos da busca com espaços; eles devem ter 3 caracteres ou mais."
+"Pesquisar por mensagens em %%site.name%% por seu conteúdo. Separe os termos "
+"da busca com espaços; eles devem ter 3 caracteres ou mais."
 
 #: ../actions/peoplesearch.php:28
 #, php-format
@@ -1721,7 +1642,7 @@ 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 ""
-"Pesquisar por pessoas no %%site.name%% por seus nomes, localidade ou "
+"Pesquisar por pessoas em %%site.name%% por seus nomes, localidade ou "
 "interesses. Separe os termos da busca com espaços; eles devem ter 3 "
 "caracteres ou mais."
 
@@ -1729,13 +1650,11 @@ msgstr ""
 msgid "Select a carrier"
 msgstr "Escolha uma operadora"
 
-#: ../actions/invite.php:137
-#: ../lib/util.php:1172
+#: ../actions/invite.php:137 ../lib/util.php:1172
 msgid "Send"
 msgstr "Enviar"
 
-#: ../actions/emailsettings.php:73
-#: ../actions/smssettings.php:82
+#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
 msgid "Send email to this address to post new notices."
 msgstr "Envie emails para esse endereço para postar novas mensagens."
 
@@ -1745,7 +1664,7 @@ msgstr "Me envie as mensagens de novos seguidores via email."
 
 #: ../actions/imsettings.php:70
 msgid "Send me notices through Jabber/GTalk."
-msgstr "Me envie as mensagens via Jabber/GTalk."
+msgstr "Envie-me as mensagens via Jabber/GTalk."
 
 #: ../actions/smssettings.php:97
 msgid ""
@@ -1767,7 +1686,7 @@ msgstr "Configurações"
 
 #: ../actions/profilesettings.php:192
 msgid "Settings saved."
-msgstr "Configurações salvas."
+msgstr "As configurações foram salvas."
 
 #: ../actions/tag.php:60
 msgid "Showing most popular tags from the last week"
@@ -1775,12 +1694,11 @@ msgstr "Exibindo tags mais populares da última semana"
 
 #: ../actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
-msgstr "Alguém já tem este OpenID."
+msgstr "Alguém já está usando esta OpenID."
 
-#: ../actions/finishopenidlogin.php:42
-#: ../actions/openidsettings.php:126
+#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
 msgid "Something weird happened."
-msgstr "Algo estranho aconteceu."
+msgstr "Aconteceu alguma coisa estranha..."
 
 #: ../scripts/maildaemon.php:58
 msgid "Sorry, no incoming email allowed."
@@ -1798,42 +1716,37 @@ msgstr "Fonte"
 msgid "Statistics"
 msgstr "Estatísticas"
 
-#: ../actions/finishopenidlogin.php:182
-#: ../actions/finishopenidlogin.php:246
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
 msgid "Stored OpenID not found."
-msgstr "OpenID armazenado não encontrado."
+msgstr "O OpenID armazenado não foi encontrado."
 
-#: ../actions/remotesubscribe.php:75
-#: ../actions/showstream.php:188
+#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
 #: ../actions/showstream.php:197
 msgid "Subscribe"
 msgstr "Assinar"
 
-#: ../actions/showstream.php:313
-#: ../actions/subscribers.php:27
+#: ../actions/showstream.php:313 ../actions/subscribers.php:27
 msgid "Subscribers"
 msgstr "Assinantes"
 
 #: ../actions/userauthorization.php:310
 msgid "Subscription authorized"
-msgstr "Assinatura autorizada"
+msgstr "A assinatura foi autorizada"
 
 #: ../actions/userauthorization.php:320
 msgid "Subscription rejected"
-msgstr "Assinatura recusada"
+msgstr "A assinatura foi recusada"
 
-#: ../actions/showstream.php:230
-#: ../actions/showstream.php:307
+#: ../actions/showstream.php:230 ../actions/showstream.php:307
 #: ../actions/subscriptions.php:27
 msgid "Subscriptions"
 msgstr "Assinaturas"
 
 #: ../actions/avatar.php:87
 msgid "System error uploading file."
-msgstr "Erro no sistema ao enviar arquivo."
+msgstr "Erro no sistema durante o envio do arquivo."
 
-#: ../actions/tag.php:41
-#: ../lib/util.php:301
+#: ../actions/tag.php:41 ../lib/util.php:301
 msgid "Tags"
 msgstr "Tags"
 
@@ -1847,15 +1760,15 @@ msgstr "Pesquisa no conteúdo"
 
 #: ../actions/openidsettings.php:140
 msgid "That OpenID does not belong to you."
-msgstr "Este OpenID não pertence à você."
+msgstr "Essa OpenID não pertence à você."
 
 #: ../actions/confirmaddress.php:52
 msgid "That address has already been confirmed."
-msgstr "Este endereço já foi confirmado."
+msgstr "Esse endereço já foi confirmado."
 
 #: ../actions/confirmaddress.php:43
 msgid "That confirmation code is not for you!"
-msgstr "Este código de confirmação não é seu!"
+msgstr "Esse código de confirmação não é seu!"
 
 #: ../actions/emailsettings.php:191
 msgid "That email address already belongs to another user."
@@ -1863,11 +1776,11 @@ msgstr "Este endereço de email já pertence à outro usuário."
 
 #: ../actions/avatar.php:80
 msgid "That file is too big."
-msgstr "Este arquivo é muito grande."
+msgstr "Esse arquivo é muito grande."
 
 #: ../actions/imsettings.php:170
 msgid "That is already your Jabber ID."
-msgstr "Este já é seu id de Jabber."
+msgstr "Essa já é sua ID do Jabber."
 
 #: ../actions/emailsettings.php:188
 msgid "That is already your email address."
@@ -1879,7 +1792,7 @@ msgstr "Este já é seu número de telefone."
 
 #: ../actions/imsettings.php:233
 msgid "That is not your Jabber ID."
-msgstr "Este não é seu id de Jabber."
+msgstr "Essa não é sua ID do Jabber."
 
 #: ../actions/emailsettings.php:249
 msgid "That is not your email address."
@@ -1889,10 +1802,9 @@ msgstr "Este não é seu endereço de email."
 msgid "That is not your phone number."
 msgstr "Este não é seu número de telefone."
 
-#: ../actions/emailsettings.php:226
-#: ../actions/imsettings.php:210
+#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
 msgid "That is the wrong IM address."
-msgstr "Este endereço de IM está incorreto."
+msgstr "Esse endereço do comunicador instantâneo está incorreto."
 
 #: ../actions/smssettings.php:233
 msgid "That is the wrong confirmation number."
@@ -1902,10 +1814,9 @@ msgstr "O código de confirmação informado está incorreto."
 msgid "That phone number already belongs to another user."
 msgstr "Este número de telefone já pertence à outro usuário."
 
-#: ../actions/newnotice.php:49
-#: ../actions/twitapistatuses.php:408
+#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
 msgid "That's too long. Max notice size is 140 chars."
-msgstr "Está muito longo.. O tamanho máximo é de 140 caracteres."
+msgstr "Está muito extenso. O tamanho máximo é de 140 caracteres."
 
 #: ../actions/twitapiaccount.php:74
 msgid "That's too long. Max notice size is 255 chars."
@@ -1916,8 +1827,7 @@ msgstr "Está muito longo.. O tamanho máximo é de 255 caracteres."
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "O endereço \"%s\" foi confirmado para sua conta."
 
-#: ../actions/emailsettings.php:264
-#: ../actions/imsettings.php:250
+#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
 #: ../actions/smssettings.php:274
 msgid "The address was removed."
 msgstr "O endereço foi removido."
@@ -1928,9 +1838,9 @@ msgid ""
 "with the site's instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
-"A assinatura foi autorizada, but nenhuma URL válida foi informada. "
-"Verifique as instruções do site para detalhes sobre como autorizar a "
-"assinatura. Seu código de assinatura é:"
+"A assinatura foi autorizada, mas não foi informada nenhuma URL de retorno "
+"válida. Verifique as instruções do site para detalhes sobre como "
+"autorizar a assinatura. Seu código de assinatura é:"
 
 #: ../actions/userauthorization.php:322
 msgid ""
@@ -1938,18 +1848,18 @@ msgid ""
 "with the site's instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
-"A assinatura foi rejeitada, mas nenhuma URL de callback foi informada. "
-"Verifique as instruções para detalhes em como rejeitar completamente a "
-"assinatura."
+"A assinatura foi rejeitada, mas não foi informada nenhuma URL de retorno "
+"válida. Verifique as instruções do site para maiores detalhes em como "
+"rejeitar completamente a assinatura."
 
 #: ../actions/subscribers.php:35
 #, php-format
 msgid "These are the people who listen to %s's notices."
-msgstr "Estas são as pessoas que seguem as mensagens de %s."
+msgstr "Estas são as pessoas que acompanham as mensagens de %s."
 
 #: ../actions/subscribers.php:33
 msgid "These are the people who listen to your notices."
-msgstr "Estas são as pessoas que seguem suas mensagens."
+msgstr "Estas são as pessoas que acompanham as suas mensagens."
 
 #: ../actions/subscriptions.php:35
 #, php-format
@@ -1964,8 +1874,7 @@ msgstr "Estas são as pessoas cujas mensagens você acompanha."
 msgid ""
 "These people are already users and you were automatically subscribed to "
 "them:"
-msgstr ""
-"Estas pessoas já são usuários e você está automaticamente seguindo a "
+msgstr "Estas pessoas já são usuários e você está automaticamente seguindo a "
 
 #: ../actions/recoverpassword.php:88
 msgid "This confirmation code is too old. Please start again."
@@ -1976,8 +1885,8 @@ msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr ""
-"Este formulário deve ser enviado automaticamente. Se não, clique no botão "
-"\"Enviar\" para ir para seu provedor de OpenID."
+"Este formulário deve enviar-se automaticamente. Caso isso não ocorra, "
+"clique no botão \"Enviar\" para ir para seu provedor de OpenID."
 
 #: ../actions/finishopenidlogin.php:56
 #, php-format
@@ -1986,17 +1895,15 @@ msgid ""
 "to a local account. You can either create a new account, or connect with "
 "your existing account, if you have one."
 msgstr ""
-"Esta é a primeira vez que você logou em %s então nós precisamos conectar "
-"seu OpenID com uma conta local. Você pode tanto criar uma nova conta, ou "
-"conectar com sua conta existente, se você tiver uma."
+"Esta é a primeira vez que você autenticou-se em %s. Por isso nós "
+"precisamos conectar sua OpenID a uma conta local. Você pode criar uma conta "
+"nova, ou conectar a uma conta sua já existente, caso tenha uma."
 
-#: ../actions/twitapifriendships.php:108
-#: ../actions/twitapistatuses.php:586
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
 msgid "This method requires a POST or DELETE."
 msgstr "Este método requer POST ou DELETE."
 
-#: ../actions/twitapiaccount.php:65
-#: ../actions/twitapifriendships.php:44
+#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
 #: ../actions/twitapistatuses.php:381
 msgid "This method requires a POST."
 msgstr "Este método requer um POST."
@@ -2021,34 +1928,31 @@ msgid ""
 "account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
 "your profile URL below."
 msgstr ""
-"Para assinar, voc6e pode [logar-se](%%action.login%%), ou "
+"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 microblogging compatível](%%doc.openmublog%%),  informe a "
-"URL do seu perfil abaixo."
+"em um [site de microblog compatível](%%doc.openmublog%%),  informe a URL do "
+"seu perfil abaixo."
 
 #: ../actions/twitapifriendships.php:163
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Dois usuários com IDs ou logins devem ser informados."
 
-#: ../actions/profilesettings.php:48
-#: ../actions/register.php:169
+#: ../actions/profilesettings.php:48 ../actions/register.php:169
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL para seu site, blog ou perfil em outro site"
 
 #: ../actions/remotesubscribe.php:74
 msgid "URL of your profile on another compatible microblogging service"
-msgstr "URL para seu perfil em outro serviço de microblogging compatível"
+msgstr "URL para seu perfil em outro serviço de microblog compatível"
 
-#: ../actions/emailsettings.php:130
-#: ../actions/imsettings.php:110
-#: ../actions/recoverpassword.php:39
-#: ../actions/smssettings.php:135
+#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
+#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
 msgid "Unexpected form submission."
-msgstr "Erro ao submeter os dados."
+msgstr "Submissão inesperada de formulário."
 
 #: ../actions/recoverpassword.php:276
 msgid "Unexpected password reset."
-msgstr "Erro ao resetar senha."
+msgstr "Restauração inesperada de senha."
 
 #: ../index.php:57
 msgid "Unknown action"
@@ -2063,22 +1967,21 @@ msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
 msgstr ""
-"A menos que especificado, o conteúdo deste site é direito reservado dos "
-"contribuidores e disponível sob a"
+"Caso não seja especificado, os colaboradores deste site possuem direito "
+"autoral sobre seu conteúdo e ele está disponível sob"
 
 #: ../actions/confirmaddress.php:48
 #, php-format
 msgid "Unrecognized address type %s"
-msgstr "Tipo de endereço desconhecido %s"
+msgstr "Tipo de endereço %s desconhecido"
 
 #: ../actions/showstream.php:209
 msgid "Unsubscribe"
-msgstr "Deixar de assinar"
+msgstr "Cancelar"
 
-#: ../actions/postnotice.php:44
-#: ../actions/updateprofile.php:45
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
 msgid "Unsupported OMB version"
-msgstr "Versão OMB não suportada"
+msgstr "Versão do OMB não suportada"
 
 #: ../actions/avatar.php:105
 msgid "Unsupported image file format."
@@ -2104,7 +2007,7 @@ msgstr "Atualizações de %1$s no %2$s!"
 
 #: ../actions/avatar.php:68
 msgid "Upload"
-msgstr "Upload"
+msgstr "Enviar"
 
 #: ../actions/avatar.php:27
 msgid ""
@@ -2113,9 +2016,10 @@ msgid ""
 "site license, also. Use a picture that belongs to you and that you want to "
 "share."
 msgstr ""
-"Envie uma nova imagem de exibição aqui. Você não poderá editar a imagem "
-"depois de enviar, então certifique-se que o formato dela está mais ou "
-"menos quadrado."
+"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 também. Use uma "
+"imagem que pertença a você e que você queira compartilhar."
 
 #: ../lib/settingsaction.php:91
 msgid "Upload a new profile image"
@@ -2129,23 +2033,18 @@ msgstr ""
 "Use esse formulário para convidar seus amigos e colegas para usar este "
 "serviço."
 
-#: ../actions/register.php:159
-#: ../actions/register.php:162
+#: ../actions/register.php:159 ../actions/register.php:162
 msgid "Used only for updates, announcements, and password recovery"
-msgstr "Usado apenas para atualizações, anuncios e recuperações de senha"
+msgstr "Usado apenas para atualizações, anúncios e recuperações de senha"
 
 #: ../actions/finishremotesubscribe.php:86
 msgid "User being listened to doesn't exist."
-msgstr "Usuário sendo seguido não existe."
-
-#: ../actions/all.php:41
-#: ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:47
-#: ../actions/replies.php:41
-#: ../actions/showstream.php:44
-#: ../actions/twitapiaccount.php:82
-#: ../actions/twitapistatuses.php:319
-#: ../actions/twitapistatuses.php:685
+msgstr "O usuário que está está sendo acompanhado não existe."
+
+#: ../actions/all.php:41 ../actions/avatarbynickname.php:48
+#: ../actions/foaf.php:47 ../actions/replies.php:41
+#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
+#: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
 #: ../actions/twitapiusers.php:82
 msgid "User has no profile."
 msgstr "O usuário não tem perfil."
@@ -2167,10 +2066,9 @@ msgstr "Que fuso horário você normalmente está?"
 msgid "What's up, %s?"
 msgstr "E aí, %s?"
 
-#: ../actions/profilesettings.php:54
-#: ../actions/register.php:175
+#: ../actions/profilesettings.php:54 ../actions/register.php:175
 msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Onde você está, ex: \"Cidade, Região, País, etc.\""
+msgstr "Onde você está, ex: \"cidade, estado, país\""
 
 #: ../actions/updateprofile.php:128
 #, php-format
@@ -2182,14 +2080,13 @@ msgstr "Tipo de imagem errado para '%s'"
 msgid "Wrong size image at '%s'"
 msgstr "Tamanho da imagem errado em '%s'"
 
-#: ../actions/deletenotice.php:63
-#: ../actions/deletenotice.php:72
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 msgid "Yes"
 msgstr "Sim"
 
 #: ../actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
-msgstr "Você já tem esse OpenID!"
+msgstr "Você já tem esta OpenID!"
 
 #: ../actions/deletenotice.php:37
 msgid ""
@@ -2201,7 +2098,7 @@ msgstr ""
 
 #: ../actions/recoverpassword.php:31
 msgid "You are already logged in!"
-msgstr "Você já está logado!"
+msgstr "Você já está autenticado!"
 
 #: ../actions/invite.php:81
 msgid "You are already subscribed to these users:"
@@ -2213,11 +2110,11 @@ msgstr "Você não é amigo do usuário especificado."
 
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
-msgstr "Você pode alterar sua senha aqui. Escolha uma boa!"
+msgstr "Você pode alterar sua senha aqui. Faça uma boa escolha!"
 
 #: ../actions/register.php:135
 msgid "You can create a new account to start posting notices."
-msgstr "Você pode criar uma nova conta para começar a postar mensagens."
+msgstr "Você pode criar uma nova conta para começar a publicar mensagens."
 
 #: ../actions/smssettings.php:28
 #, php-format
@@ -2229,7 +2126,7 @@ msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
-"Você pode remover um OpenID da sua conta, clicando no botão "
+"Você pode remover uma OpenID da sua conta, clicando no botão "
 "\"Remover\"."
 
 #: ../actions/imsettings.php:28
@@ -2238,8 +2135,9 @@ 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 [IMs](%%doc.im%%) "
-"Jabber/GTalk. Configure seu endereço e opções abaixo."
+"Você pode enviar e receber mensagens através dos [mensageiros "
+"instantâneos](%%doc.im%%) Jabber/GTalk. Configure seu endereço e opções "
+"abaixo."
 
 #: ../actions/profilesettings.php:27
 msgid ""
@@ -2249,19 +2147,17 @@ msgstr ""
 "Você pode atualizar suas informações pessoais aqui, para que as pessoas "
 "saibam mais sobre você."
 
-#: ../actions/finishremotesubscribe.php:31
-#: ../actions/remotesubscribe.php:31
+#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
 msgid "You can use the local subscription!"
 msgstr "Você pode usar a assinatura local!"
 
-#: ../actions/finishopenidlogin.php:33
-#: ../actions/register.php:61
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 msgid "You can't register if you don't agree to the license."
 msgstr "Você não pode se registrar se não aceitar a licença."
 
 #: ../actions/updateprofile.php:63
 msgid "You did not send us that profile"
-msgstr "Você não nos enviou este perfil"
+msgstr "Você não nos enviou esse perfil"
 
 #: ../lib/mail.php:147
 #, php-format
@@ -2318,8 +2214,8 @@ msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
-"O [OpenID](%%doc.openid%%) permite que você se logue em vários sites com a "
-"mesma conta de usuário. Gerencie seus OpenIDs associados aqui."
+"A [OpenID](%%doc.openid%%) permite que você autentique-se em vários sites "
+"com a mesma conta de usuário. Gerencie suas OpenIDs associadas aqui."
 
 #: ../lib/util.php:943
 msgid "a few seconds ago"
@@ -2365,19 +2261,16 @@ msgstr "aproximadamente um ano atrás"
 msgid "about an hour ago"
 msgstr "aproximadamente uma hora atrás"
 
-#: ../actions/showstream.php:423
-#: ../lib/stream.php:132
+#: ../actions/showstream.php:423 ../lib/stream.php:132
 msgid "delete"
 msgstr "apagar"
 
-#: ../actions/noticesearch.php:130
-#: ../actions/showstream.php:408
+#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
 #: ../lib/stream.php:117
 msgid "in reply to..."
-msgstr "Em resposta à..."
+msgstr "em resposta à..."
 
-#: ../actions/noticesearch.php:137
-#: ../actions/showstream.php:415
+#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
 #: ../lib/stream.php:124
 msgid "reply"
 msgstr "responder"
@@ -2393,3 +2286,592 @@ msgstr "Formato de imagem não suportado"
 #: ../lib/util.php:1309
 msgid "« After"
 msgstr "« Depois"
+
+#: actions/deletenotice.php:74 actions/disfavor.php:43
+#: actions/emailsettings.php:127 actions/favor.php:45
+#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
+#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
+#: actions/openidsettings.php:123 actions/profilesettings.php:47
+#: actions/recoverpassword.php:282 actions/register.php:42
+#: actions/remotesubscribe.php:40 actions/smssettings.php:124
+#: actions/subscribe.php:44 actions/twittersettings.php:97
+#: actions/unsubscribe.php:41 actions/userauthorization.php:35
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/disfavor.php:55
+msgid "This notice is not a favorite!"
+msgstr ""
+
+#: actions/disfavor.php:63
+msgid "Could not delete favorite."
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Favor"
+msgstr ""
+
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+
+#: actions/emailsettings.php:95
+msgid "Send me email when someone sends me a private message."
+msgstr ""
+
+#: actions/favor.php:53 actions/twitapifavorites.php:142
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132
+msgid "Could not create favorite."
+msgstr ""
+
+#: actions/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#, php-format
+msgid "%s favorite notices"
+msgstr ""
+
+#: actions/favoritesrss.php:64
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr ""
+
+#: actions/inbox.php:28
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+
+#: actions/invite.php:178
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+msgstr ""
+
+#: actions/login.php:104
+msgid "Automatically login in the future; "
+msgstr ""
+
+#: actions/login.php:122
+msgid "For security reasons, please re-enter your "
+msgstr ""
+
+#: actions/login.php:126
+msgid "Login with your username and password. "
+msgstr ""
+
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+msgid "That's too long. Max message size is 140 chars."
+msgstr ""
+
+#: actions/newmessage.php:65
+msgid "No recipient specified."
+msgstr ""
+
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206
+msgid "You can't send a message to this user."
+msgstr ""
+
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly "
+"instead."
+msgstr ""
+
+#: actions/newmessage.php:108
+msgid "No such user"
+msgstr ""
+
+#: actions/newmessage.php:117
+msgid "New message"
+msgstr ""
+
+#: actions/noticesearch.php:95
+msgid "Notice without matching profile"
+msgstr ""
+
+#: actions/openidsettings.php:28
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr ""
+
+#: actions/openidsettings.php:46
+msgid "If you want to add an OpenID to your account, "
+msgstr ""
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr ""
+
+#: actions/openidsettings.php:87
+msgid "You can remove an OpenID from your account "
+msgstr ""
+
+#: actions/outbox.php:28
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr ""
+
+#: actions/outbox.php:30
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#: actions/outbox.php:53
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+
+#: actions/peoplesearch.php:28
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+msgstr ""
+
+#: actions/profilesettings.php:27
+msgid "You can update your personal profile info here "
+msgstr ""
+
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+msgid "User without matching profile"
+msgstr ""
+
+#: actions/recoverpassword.php:91
+msgid "This confirmation code is too old. "
+msgstr ""
+
+#: actions/recoverpassword.php:141
+msgid "If you've forgotten or lost your"
+msgstr ""
+
+#: actions/recoverpassword.php:154
+msgid "You've been identified. Enter a "
+msgstr ""
+
+#: actions/recoverpassword.php:169
+msgid "Your nickname on this server, "
+msgstr ""
+
+#: actions/recoverpassword.php:271
+msgid "Instructions for recovering your password "
+msgstr ""
+
+#: actions/recoverpassword.php:327
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95
+msgid "Password must be 6 or more characters."
+msgstr ""
+
+#: actions/register.php:216
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
+msgstr ""
+
+#: actions/register.php:227
+msgid "(You should receive a message by email momentarily, with "
+msgstr ""
+
+#: actions/remotesubscribe.php:51
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
+msgstr ""
+
+#: actions/showfavorites.php:61
+#, php-format
+msgid "Feed for favorites of %s"
+msgstr ""
+
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+msgid "Could not retrieve favorite notices."
+msgstr ""
+
+#: actions/showmessage.php:33
+msgid "No such message."
+msgstr ""
+
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
+msgstr ""
+
+#: actions/showmessage.php:61
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr ""
+
+#: actions/showmessage.php:66
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr ""
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr ""
+
+#: actions/smssettings.php:312
+#, php-format
+msgid "Mobile carrier for your phone. "
+msgstr ""
+
+#: actions/twitapidirect_messages.php:76
+#, php-format
+msgid "Direct messages to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:77
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:81
+msgid "Direct Messages You've Sent"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:82
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:128
+msgid "No message text!"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:138
+msgid "Recipient user not found."
+msgstr ""
+
+#: actions/twitapidirect_messages.php:141
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
+#: actions/twitapifavorites.php:92
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr ""
+
+#: actions/twitapifavorites.php:95
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr ""
+
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#, php-format
+msgid "%s added your notice as a favorite"
+msgstr ""
+
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+msgstr ""
+
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+msgstr ""
+
+#: actions/twittersettings.php:41
+msgid "Twitter settings"
+msgstr ""
+
+#: actions/twittersettings.php:48
+msgid "Twitter Account"
+msgstr ""
+
+#: actions/twittersettings.php:56
+msgid "Current verified Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr ""
+
+#: actions/twittersettings.php:65
+msgid "No spaces, please."
+msgstr ""
+
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr ""
+
+#: actions/twittersettings.php:72
+msgid "Automatically send my notices to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:75
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:78
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+
+#: actions/twittersettings.php:128
+msgid "Could not verify your Twitter credentials!"
+msgstr ""
+
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+msgid "Unable to save your Twitter settings!"
+msgstr ""
+
+#: actions/twittersettings.php:174
+msgid "Twitter settings saved."
+msgstr ""
+
+#: actions/twittersettings.php:192
+msgid "That is not your Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+msgid "Couldn't remove Twitter user."
+msgstr ""
+
+#: actions/twittersettings.php:212
+msgid "Twitter account removed."
+msgstr ""
+
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+msgid "Couldn't save Twitter preferences."
+msgstr ""
+
+#: actions/twittersettings.php:245
+msgid "Twitter preferences saved."
+msgstr ""
+
+#: actions/userauthorization.php:84
+msgid "Please check these details to make sure "
+msgstr ""
+
+#: actions/userauthorization.php:324
+msgid "The subscription has been authorized, but no "
+msgstr ""
+
+#: actions/userauthorization.php:334
+msgid "The subscription has been rejected, but no "
+msgstr ""
+
+#: classes/Channel.php:113
+msgid "Command results"
+msgstr ""
+
+#: classes/Channel.php:148
+msgid "Command complete"
+msgstr ""
+
+#: classes/Channel.php:158
+msgid "Command failed"
+msgstr ""
+
+#: classes/Command.php:39
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: classes/Command.php:96
+#, php-format
+msgid "Subscriptions: %1$s\n"
+msgstr ""
+
+#: classes/Command.php:125 classes/Command.php:242
+msgid "User has no last notice"
+msgstr ""
+
+#: classes/Command.php:146
+msgid "Notice marked as fave."
+msgstr ""
+
+#: classes/Command.php:166
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr ""
+
+#: classes/Command.php:169
+#, php-format
+msgid "Fullname: %s"
+msgstr ""
+
+#: classes/Command.php:172
+#, php-format
+msgid "Location: %s"
+msgstr ""
+
+#: classes/Command.php:175
+#, php-format
+msgid "Homepage: %s"
+msgstr ""
+
+#: classes/Command.php:178
+#, php-format
+msgid "About: %s"
+msgstr ""
+
+#: classes/Command.php:200
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
+
+#: classes/Command.php:214
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
+
+#: classes/Command.php:216
+msgid "Error sending direct message."
+msgstr ""
+
+#: classes/Command.php:263
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: classes/Command.php:270
+#, php-format
+msgid "Subscribed to %s"
+msgstr ""
+
+#: classes/Command.php:288
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
+
+#: classes/Command.php:295
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr ""
+
+#: classes/Command.php:310 classes/Command.php:330
+msgid "Command not yet implemented."
+msgstr ""
+
+#: classes/Command.php:313
+msgid "Notification off."
+msgstr ""
+
+#: classes/Command.php:315
+msgid "Can't turn off notification."
+msgstr ""
+
+#: classes/Command.php:333
+msgid "Notification on."
+msgstr ""
+
+#: classes/Command.php:335
+msgid "Can't turn on notification."
+msgstr ""
+
+#: classes/Command.php:344
+msgid "Commands:\n"
+msgstr ""
+
+#: classes/Message.php:53
+msgid "Could not insert message."
+msgstr ""
+
+#: classes/Message.php:63
+msgid "Could not update message with new URI."
+msgstr ""
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr ""
+
+#: lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:249
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:253
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+msgstr ""
+
+#: lib/mailbox.php:43
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/openid.php:195
+msgid "This form should automatically submit itself. "
+msgstr ""
+
+#: lib/personal.php:65
+msgid "Favorites"
+msgstr ""
+
+#: lib/personal.php:66
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
+#: lib/personal.php:66
+msgid "User"
+msgstr ""
+
+#: lib/personal.php:75
+msgid "Inbox"
+msgstr ""
+
+#: lib/personal.php:76
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personal.php:80
+msgid "Outbox"
+msgstr ""
+
+#: lib/personal.php:81
+msgid "Your sent messages"
+msgstr ""
+
+#: lib/settingsaction.php:99
+msgid "Twitter"
+msgstr ""
+
+#: lib/settingsaction.php:100
+msgid "Twitter integration options"
+msgstr ""
+
+#: lib/util.php:1718
+msgid "To"
+msgstr ""
+
+#: scripts/maildaemon.php:45
+msgid "Could not parse message."
+msgstr ""
diff --git a/locale/ru_RU/LC_MESSAGES/laconica.mo b/locale/ru_RU/LC_MESSAGES/laconica.mo
new file mode 100644
index 000000000..1adc55b88
--- /dev/null
+++ 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 ec51b3884..fc08785b7 100644
--- a/locale/ru_RU/LC_MESSAGES/laconica.po
+++ b/locale/ru_RU/LC_MESSAGES/laconica.po
@@ -1,3 +1,4 @@
+# #-#-#-#-#  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.
@@ -6,9 +7,22 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"#-#-#-#-#  laconica.po (0.6)  #-#-#-#-#\n"
+"Project-Id-Version: 0.6\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-08-27 14:57-0400\n"
+"PO-Revision-Date: \n"
+"Last-Translator: Doktor Bro <admin@stosorok.com>\n"
+"Language-Team: Doktor Bro <info@stosorok.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Russian\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-10-13 21:07+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,21 +30,24 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../actions/noticesearchrss.php:64
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
 msgid ""
-" except this private data: password, email address, IM address, phone number."
+" except this private data: password, email address, IM address, phone "
+"number."
 msgstr ""
+", за и�ключением моих ча�тных данных: "
+"пароль, почта, ме��енджер, телефон."
 
 #: ../actions/showstream.php:400 ../lib/stream.php:109
 msgid " from "
-msgstr ""
+msgstr " из"
 
-#: ../actions/twitapistatuses.php:478
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr ""
@@ -38,7 +55,7 @@ msgstr ""
 #: ../actions/invite.php:168
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
+msgstr "%1$s приглашает теб� запи�ать�� на %2$s"
 
 #: ../actions/invite.php:170
 #, php-format
@@ -70,8 +87,23 @@ 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:124 lib/mail.php:126
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr ""
@@ -86,23 +118,29 @@ 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:482 actions/twitapistatuses.php:415
 #, 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:45
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr ""
 
-#: ../actions/invite.php:84 ../actions/invite.php:92
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
 #, php-format
 msgid "%s (%s)"
 msgstr ""
 
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
 #, php-format
 msgid "%s Public Stream"
 msgstr ""
@@ -111,24 +149,24 @@ msgstr ""
 #: ../actions/twitapistatuses.php:238 ../lib/stream.php:51
 #, php-format
 msgid "%s and friends"
-msgstr ""
+msgstr "%s и друзь�"
 
-#: ../actions/twitapistatuses.php:49
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
 #, php-format
 msgid "%s public timeline"
 msgstr ""
 
-#: ../lib/mail.php:206
+#: ../lib/mail.php:206 lib/mail.php:212
 #, php-format
 msgid "%s status"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:338
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
 #, php-format
 msgid "%s timeline"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:52
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
@@ -139,58 +177,58 @@ msgid ""
 "to confirm your email address.)"
 msgstr ""
 
-#: ../lib/util.php:257
+#: ../lib/util.php:257 lib/util.php:273
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** is a microblogging service brought to you by "
+"[%%site.broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
 
-#: ../lib/util.php:259
+#: ../lib/util.php:259 lib/util.php:275
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr ""
 
-#: ../lib/util.php:274
+#: ../lib/util.php:274 lib/util.php:290
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 буквы или цифры нижнего реги�тра, без "
+msgstr "1-64 латин�ких �трочных букв или цифр, без "
 
 #: ../actions/register.php:152
-#, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64 буквы или цифры нижнего реги�тра, без "
+msgstr ""
+"1-64 латин�ких �трочных букв или цифр, без "
+"пробелов и знаков препинани�. Об�зательно."
 
 #: ../actions/password.php:42
 msgid "6 or more characters"
-msgstr "6 или более �имволов"
+msgstr "6 или больше знаков"
 
-#: ../actions/recoverpassword.php:180
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
 msgid "6 or more characters, and don't forget it!"
-msgstr "6 или более �имволов, не забудьте его!"
+msgstr ""
 
 #: ../actions/register.php:154
-#, fuzzy
 msgid "6 or more characters. Required."
-msgstr "6 или более �имволов"
+msgstr "6 или больше букв. Об�зательно."
 
-#: ../actions/imsettings.php:197
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+"A confirmation code was sent to the IM address you added. You must approve "
+"%s for sending messages to you."
 msgstr ""
 
-#: ../actions/emailsettings.php:213
+#: ../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 ""
 
-#: ../actions/smssettings.php:216
+#: ../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."
@@ -199,7 +237,14 @@ msgstr ""
 #: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
 #: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
 #: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55
 msgid "API method not found!"
 msgstr ""
 
@@ -212,12 +257,18 @@ msgstr ""
 #: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
 #: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
 #: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
+#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
+#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
+#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
+#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
+#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
+#: actions/twitapistatuses.php:690
 msgid "API method under construction."
 msgstr ""
 
 #: ../lib/util.php:324
 msgid "About"
-msgstr ""
+msgstr "О проекте"
 
 #: ../actions/userauthorization.php:119
 msgid "Accept"
@@ -228,63 +279,65 @@ msgstr "Прин�ть"
 msgid "Add"
 msgstr "Добавить"
 
-#: ../actions/openidsettings.php:43
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
 msgid "Add OpenID"
-msgstr "Добавить OpenID"
+msgstr ""
 
-#: ../lib/settingsaction.php:97
-#, fuzzy
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
 msgid "Add or remove OpenIDs"
-msgstr "Добавить OpenID"
+msgstr ""
 
 #: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
 #: ../actions/smssettings.php:39
 msgid "Address"
-msgstr "�дре� "
+msgstr "�дре�"
 
 #: ../actions/invite.php:131
 msgid "Addresses of friends to invite (one per line)"
-msgstr ""
+msgstr "�дре�а друзей, которых ты хочешь пригла�ить (по одному на �трочку)"
 
 #: ../actions/showstream.php:273
 msgid "All subscriptions"
 msgstr "В�е подпи�ки"
 
-#: ../actions/publicrss.php:64
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
 #, php-format
 msgid "All updates for %s"
-msgstr "В�е обновлени� дл� %s"
+msgstr ""
 
-#: ../actions/noticesearchrss.php:66
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
 #: ../actions/openidlogin.php:29 ../actions/register.php:30
+#: actions/finishopenidlogin.php:29 actions/login.php:31
+#: actions/openidlogin.php:29 actions/register.php:30
 msgid "Already logged in."
-msgstr "Вы уже авторизованы."
+msgstr ""
 
-#: ../lib/subs.php:42
+#: ../lib/subs.php:42 lib/subs.php:42
 msgid "Already subscribed!."
 msgstr ""
 
 #: ../actions/deletenotice.php:54
 msgid "Are you sure you want to delete this notice?"
-msgstr ""
+msgstr "Ты точно хочешь удалить �ту заметку?"
 
-#: ../actions/userauthorization.php:77
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 msgid "Authorize subscription"
 msgstr ""
 
 #: ../actions/login.php:104 ../actions/register.php:178
 msgid "Automatically login in the future; not for shared computers!"
-msgstr ""
+msgstr "В �ледующий раз зайти автоматиче�ки. �е дл� обще�твенных компьютеров!"
 
 #: ../actions/profilesettings.php:65
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr ""
+"Automatically subscribe to whoever subscribes to me (best for "
+"non-humans)"
+msgstr "�втоматиче�ки подпи�ывать�� на в�ех, кто "
 
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 msgid "Avatar"
@@ -292,9 +345,9 @@ msgstr "�ватар"
 
 #: ../actions/avatar.php:113
 msgid "Avatar updated."
-msgstr "�ватар обновлен."
+msgstr "�ватар обновлён."
 
-#: ../actions/imsettings.php:55
+#: ../actions/imsettings.php:55 actions/imsettings.php:56
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -306,51 +359,55 @@ msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
+"Ждём подтверждени� �того адре�а. Проверь "
+"�вой почтовый �щик (и папку дл� �пама!), там будут дальнейшие ин�трукции."
 
-#: ../actions/smssettings.php:58
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
 #: ../lib/util.php:1318
 msgid "Before »"
-msgstr "Ранее »"
+msgstr "Предыдущие »"
 
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 msgid "Bio"
-msgstr "О �ебе"
+msgstr "Интере�ы"
 
 #: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103
+#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
+#: actions/register.php:89 actions/updateprofile.php:104
 msgid "Bio is too long (max 140 chars)."
-msgstr "Тек�т \"О �ебе\" не может быть длиннее 140 �имволов"
+msgstr ""
 
 #: ../lib/deleteaction.php:41
 msgid "Can't delete this notice."
-msgstr ""
+msgstr "Заметка не удал�ет��."
 
-#: ../actions/updateprofile.php:119
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 #, php-format
 msgid "Can't read avatar URL '%s'"
-msgstr "�е могу прочитать URL аватара '%s'"
+msgstr ""
 
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
+#: actions/profilesettings.php:404 actions/recoverpassword.php:313
 msgid "Can't save new password."
-msgstr "�е могу �охранить новый пароль"
+msgstr ""
 
 #: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
 #: ../actions/smssettings.php:62
 msgid "Cancel"
 msgstr "Отменить"
 
-#: ../lib/openid.php:121
+#: ../lib/openid.php:121 lib/openid.php:121
 msgid "Cannot instantiate OpenID consumer object."
 msgstr ""
 
-#: ../actions/imsettings.php:163
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
 msgid "Cannot normalize that Jabber ID"
 msgstr ""
 
-#: ../actions/emailsettings.php:181
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
 msgid "Cannot normalize that email address"
 msgstr ""
 
@@ -358,7 +415,7 @@ msgstr ""
 msgid "Change"
 msgstr "Изменить"
 
-#: ../lib/settingsaction.php:88
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
 msgid "Change email handling"
 msgstr ""
 
@@ -367,12 +424,10 @@ msgid "Change password"
 msgstr "Изменить пароль"
 
 #: ../lib/settingsaction.php:94
-#, fuzzy
 msgid "Change your password"
 msgstr "Изменить пароль"
 
 #: ../lib/settingsaction.php:85
-#, fuzzy
 msgid "Change your profile settings"
 msgstr "�а�тройки профил�"
 
@@ -386,18 +441,18 @@ msgid "Confirm Address"
 msgstr "Подтвердить адре�"
 
 #: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245
+#: ../actions/smssettings.php:245 actions/emailsettings.php:256
+#: actions/imsettings.php:230 actions/smssettings.php:253
 msgid "Confirmation cancelled."
-msgstr "Подтверждение отменено."
+msgstr ""
 
-#: ../actions/smssettings.php:63
-#, fuzzy
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
 msgid "Confirmation code"
-msgstr "Код подтверждени� не был найден. "
+msgstr ""
 
-#: ../actions/confirmaddress.php:38
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 msgid "Confirmation code not found."
-msgstr "Код подтверждени� не был найден. "
+msgstr ""
 
 #: ../actions/register.php:202
 #, php-format
@@ -420,95 +475,102 @@ msgstr ""
 
 #: ../actions/finishopenidlogin.php:91
 msgid "Connect"
-msgstr "Соединить�� "
+msgstr "Соединить"
 
-#: ../actions/finishopenidlogin.php:86
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
 msgid "Connect existing account"
-msgstr "Подключить�� к �уще�твующей учетной запи�и"
+msgstr ""
 
 #: ../lib/util.php:332
 msgid "Contact"
-msgstr "Контакт "
+msgstr "Св�зь"
 
-#: ../lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr ""
 
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #, 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:53
 msgid "Could not follow user: User not found."
 msgstr ""
 
-#: ../lib/openid.php:160
+#: ../lib/openid.php:160 lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr ""
 
-#: ../actions/updateprofile.php:162
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
 msgid "Could not save avatar info"
 msgstr ""
 
-#: ../actions/updateprofile.php:155
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
 msgid "Could not save new profile info"
 msgstr ""
 
-#: ../lib/subs.php:54
+#: ../lib/subs.php:54 lib/subs.php:61
 msgid "Could not subscribe other to you."
 msgstr ""
 
-#: ../lib/subs.php:46
-#, fuzzy
+#: ../lib/subs.php:46 lib/subs.php:46
 msgid "Could not subscribe."
-msgstr "Удаленна� подпи�ка"
+msgstr ""
 
-#: ../actions/recoverpassword.php:102
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
 msgid "Could not update user with confirmed email address."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:99
+#: actions/finishremotesubscribe.php:101
 msgid "Couldn't convert request tokens to access tokens."
 msgstr ""
 
 #: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
 #: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#: actions/confirmaddress.php:84 actions/emailsettings.php:252
+#: actions/imsettings.php:226 actions/smssettings.php:249
 msgid "Couldn't delete email confirmation."
 msgstr ""
 
-#: ../lib/subs.php:103
+#: ../lib/subs.php:103 lib/subs.php:116
 msgid "Couldn't delete subscription."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:93
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
 msgid "Couldn't find any statuses."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:127
+#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
 msgid "Couldn't get a request token."
 msgstr ""
 
 #: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206
+#: ../actions/smssettings.php:206 actions/emailsettings.php:223
+#: actions/imsettings.php:195 actions/smssettings.php:214
 msgid "Couldn't insert confirmation code."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182
 msgid "Couldn't insert new subscription."
 msgstr ""
 
 #: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
 msgid "Couldn't save profile."
 msgstr ""
 
-#: ../actions/profilesettings.php:161
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
 msgid "Couldn't update user for autosubscribe."
 msgstr ""
 
 #: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
 msgid "Couldn't update user record."
 msgstr ""
 
@@ -516,6 +578,10 @@ msgstr ""
 #: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
 #: ../actions/imsettings.php:243 ../actions/profilesettings.php:141
 #: ../actions/smssettings.php:157 ../actions/smssettings.php:269
+#: actions/confirmaddress.php:72 actions/emailsettings.php:174
+#: actions/emailsettings.php:277 actions/imsettings.php:146
+#: actions/imsettings.php:251 actions/profilesettings.php:256
+#: actions/smssettings.php:165 actions/smssettings.php:277
 msgid "Couldn't update user."
 msgstr ""
 
@@ -523,185 +589,190 @@ msgstr ""
 msgid "Create"
 msgstr "Создать"
 
-#: ../actions/finishopenidlogin.php:70
+#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
 msgid "Create a new user with this nickname."
-msgstr "Создать нового пользовател� � таким п�евдонимом."
+msgstr ""
 
 #: ../actions/finishopenidlogin.php:68
 msgid "Create new account"
-msgstr "Создать новую учетную запи�ь"
+msgstr "Создать новый учёт"
 
-#: ../actions/finishopenidlogin.php:191
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
 msgid "Creating new account for OpenID that already has a user."
 msgstr ""
 
-#: ../actions/imsettings.php:45
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
 msgid "Current confirmed Jabber/GTalk address."
 msgstr ""
 
-#: ../actions/smssettings.php:46
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
-#: ../actions/emailsettings.php:44
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
 msgid "Current confirmed email address."
 msgstr ""
 
 #: ../actions/showstream.php:356
 msgid "Currently"
-msgstr ""
+msgstr "Сейча�"
 
-#: ../classes/Notice.php:72
+#: ../classes/Notice.php:72 classes/Notice.php:86
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: ../lib/util.php:1061
+#: ../lib/util.php:1061 lib/util.php:1110
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr ""
 
 #: ../actions/deletenotice.php:41
-#, fuzzy
 msgid "Delete notice"
-msgstr "�овое уведомление"
+msgstr "Удалить заметку"
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 msgid "Describe yourself and your interests in 140 chars"
-msgstr ""
+msgstr "Опиши �еб� и �вои увлечени� � помощью 140 букв"
 
 #: ../actions/register.php:158 ../actions/register.php:161
 #: ../lib/settingsaction.php:87
 msgid "Email"
-msgstr ""
+msgstr "Почта"
 
 #: ../actions/emailsettings.php:59
-#, fuzzy
 msgid "Email Address"
-msgstr "�дре� "
+msgstr "Почтовый адре�"
 
 #: ../actions/emailsettings.php:32
-#, fuzzy
 msgid "Email Settings"
-msgstr "�а�тройки"
+msgstr "�а�тройка почты"
 
-#: ../actions/register.php:73
+#: ../actions/register.php:73 actions/register.php:80
 msgid "Email address already exists."
 msgstr ""
 
-#: ../lib/mail.php:90
+#: ../lib/mail.php:90 lib/mail.php:90
 msgid "Email address confirmation"
 msgstr ""
 
-#: ../actions/emailsettings.php:61
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 
 #: ../actions/invite.php:129
 msgid "Email addresses"
-msgstr ""
+msgstr "Почтовые адре�а"
 
-#: ../actions/recoverpassword.php:191
+#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 msgid "Enter a nickname or email address."
 msgstr ""
 
-#: ../actions/smssettings.php:64
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
 msgid "Enter the code you received on your phone."
 msgstr ""
 
-#: ../actions/userauthorization.php:137
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 msgid "Error authorizing token"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:253
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
 msgid "Error connecting user to OpenID."
 msgstr ""
 
-#: ../actions/finishaddopenid.php:78
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
 msgid "Error connecting user."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153
 msgid "Error inserting avatar"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:143
+#: actions/finishremotesubscribe.php:145
 msgid "Error inserting new profile"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169
 msgid "Error inserting remote profile"
 msgstr ""
 
-#: ../actions/recoverpassword.php:240
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
 msgid "Error saving address confirmation."
 msgstr ""
 
-#: ../actions/userauthorization.php:140
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
 msgid "Error saving remote profile"
 msgstr ""
 
-#: ../lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226
 msgid "Error saving the profile."
 msgstr ""
 
-#: ../lib/openid.php:237
+#: ../lib/openid.php:237 lib/openid.php:237
 msgid "Error saving the user."
 msgstr ""
 
-#: ../actions/password.php:80
+#: ../actions/password.php:80 actions/profilesettings.php:399
 msgid "Error saving user; invalid."
 msgstr ""
 
 #: ../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
 msgid "Error setting user."
 msgstr ""
 
-#: ../actions/finishaddopenid.php:83
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
 msgid "Error updating profile"
-msgstr "Ошибка обновлени� профил�"
+msgstr ""
 
 #: ../actions/finishremotesubscribe.php:161
+#: actions/finishremotesubscribe.php:163
 msgid "Error updating remote profile"
-msgstr "Ошибка обновлени� удаленного профил�"
+msgstr ""
 
-#: ../actions/recoverpassword.php:80
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
 msgid "Error with confirmation code."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:89
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
 msgid "Existing nickname"
-msgstr "Уже �уще�твующий п�евдоним"
+msgstr ""
 
 #: ../lib/util.php:326
 msgid "FAQ"
-msgstr "ЧаВО"
+msgstr "Ч�ВО"
 
-#: ../actions/avatar.php:115
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
 msgid "Failed updating avatar."
-msgstr "Ошибка при обновлении аватара."
+msgstr ""
 
-#: ../actions/all.php:61 ../actions/allrss.php:64
+#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
+#: actions/allrss.php:64
 #, 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
 #, php-format
 msgid "Feed for replies to %s"
 msgstr ""
 
-#: ../actions/tag.php:55
+#: ../actions/tag.php:55 actions/tag.php:55
 #, php-format
 msgid "Feed for tag %s"
 msgstr ""
 
-#: ../lib/searchaction.php:105
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
 msgid "Find content of notices"
 msgstr ""
 
-#: ../lib/searchaction.php:101
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
 msgid "Find people on this site"
 msgstr ""
 
@@ -718,7 +789,7 @@ msgstr "Полное им�"
 #: ../actions/profilesettings.php:98 ../actions/register.php:79
 #: ../actions/updateprofile.php:93
 msgid "Full name is too long (max 255 chars)."
-msgstr "Полное им� �лишком длинное (мак�имум 255 �имволов)"
+msgstr "Полное им� �лишком длинное (мак�имум 255 букв)."
 
 #: ../lib/util.php:322
 msgid "Help"
@@ -726,35 +797,34 @@ msgstr "Помощь"
 
 #: ../lib/util.php:298
 msgid "Home"
-msgstr "Домой"
+msgstr "Моё"
 
 #: ../actions/profilesettings.php:46 ../actions/register.php:167
-#, fuzzy
 msgid "Homepage"
-msgstr "Лична� �траница"
+msgstr "Страница"
 
 #: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: actions/profilesettings.php:210 actions/register.php:83
 msgid "Homepage is not a valid URL."
 msgstr ""
 
-#: ../actions/emailsettings.php:91
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
 msgid "I want to post notices by email."
 msgstr ""
 
-#: ../lib/settingsaction.php:102
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
 msgid "IM"
 msgstr ""
 
-#: ../actions/imsettings.php:60
-#, fuzzy
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
 msgid "IM Address"
-msgstr "�дре� IM"
+msgstr ""
 
-#: ../actions/imsettings.php:33
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
 msgid "IM Settings"
-msgstr "�а�тройки IM"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:88
+#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -773,20 +843,21 @@ msgid ""
 msgstr ""
 
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
 msgid "Incoming email"
 msgstr ""
 
-#: ../actions/emailsettings.php:283
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
 msgid "Incoming email address removed."
 msgstr ""
 
-#: ../actions/password.php:69
+#: ../actions/password.php:69 actions/profilesettings.php:388
 msgid "Incorrect old password"
-msgstr "Старый пароль не верен"
+msgstr ""
 
-#: ../actions/login.php:67
+#: ../actions/login.php:67 actions/login.php:67
 msgid "Incorrect username or password."
-msgstr "�еверное им� пользовател� или пароль."
+msgstr ""
 
 #: ../actions/recoverpassword.php:265
 msgid ""
@@ -794,89 +865,91 @@ msgid ""
 "address registered to your account."
 msgstr ""
 
-#: ../actions/updateprofile.php:114
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
 #, php-format
 msgid "Invalid avatar URL '%s'"
-msgstr "�еверный аватар URL '%s'"
+msgstr ""
 
-#: ../actions/invite.php:55
+#: ../actions/invite.php:55 actions/invite.php:62
 #, php-format
 msgid "Invalid email address: %s"
 msgstr ""
 
-#: ../actions/updateprofile.php:98
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr ""
 
-#: ../actions/updateprofile.php:82
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr ""
 
-#: ../actions/postnotice.php:61
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
 msgid "Invalid notice content"
 msgstr ""
 
-#: ../actions/postnotice.php:67
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
 msgid "Invalid notice uri"
 msgstr ""
 
-#: ../actions/postnotice.php:72
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
 msgid "Invalid notice url"
 msgstr ""
 
-#: ../actions/updateprofile.php:87
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:96
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
 msgid "Invalid profile URL (bad format)"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79
 msgid "Invalid profile URL returned by server."
 msgstr ""
 
-#: ../actions/avatarbynickname.php:37
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
 msgid "Invalid size."
-msgstr "�еправильный размер. "
+msgstr ""
 
 #: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111
+#: ../actions/register.php:111 actions/finishopenidlogin.php:241
+#: actions/register.php:103 actions/register.php:121
 msgid "Invalid username or password."
-msgstr "�е правильное им� пользовател� или пароль."
+msgstr ""
 
-#: ../actions/invite.php:79
+#: ../actions/invite.php:79 actions/invite.php:86
 msgid "Invitation(s) sent"
 msgstr ""
 
-#: ../actions/invite.php:97
+#: ../actions/invite.php:97 actions/invite.php:104
 msgid "Invitation(s) sent to the following people:"
 msgstr ""
 
 #: ../lib/util.php:306
 msgid "Invite"
-msgstr ""
+msgstr "Пригла�ить"
 
-#: ../actions/invite.php:123
+#: ../actions/invite.php:123 actions/invite.php:130
 msgid "Invite new users"
 msgstr ""
 
-#: ../lib/util.php:261
+#: ../lib/util.php:261 lib/util.php:277
 #, 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)."
+"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 ""
 
-#: ../actions/imsettings.php:173
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
 msgid "Jabber ID already belongs to another user."
-msgstr "Jabber ID уже принадлежит другому пользователю."
+msgstr ""
 
-#: ../actions/imsettings.php:62
+#: ../actions/imsettings.php:62 actions/imsettings.php:63
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -885,28 +958,28 @@ msgstr ""
 
 #: ../actions/profilesettings.php:57
 msgid "Language"
-msgstr ""
+msgstr "Язык"
 
-#: ../actions/profilesettings.php:113
-#, fuzzy
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
 msgid "Language is too long (max 50 chars)."
-msgstr "Полное им� �лишком длинное (мак�имум 255 �имволов)"
+msgstr ""
 
 #: ../actions/profilesettings.php:52 ../actions/register.php:173
 msgid "Location"
-msgstr "Ме�тонахождение"
+msgstr "Ме�то житель�тва"
 
 #: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108
+#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
+#: actions/register.php:92 actions/updateprofile.php:109
 msgid "Location is too long (max 255 chars)."
 msgstr ""
 
 #: ../actions/login.php:97 ../actions/login.php:106
 #: ../actions/openidlogin.php:68 ../lib/util.php:310
 msgid "Login"
-msgstr ""
+msgstr "Вход"
 
-#: ../actions/openidlogin.php:44
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr ""
@@ -914,37 +987,38 @@ msgstr ""
 #: ../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%"
-"%). "
+"Login with your username and password. Don't have a username yet? "
+"[Register](%%action.register%%) a new account, or try "
+"[OpenID](%%action.openidlogin%%). "
 msgstr ""
 
 #: ../lib/util.php:308
 msgid "Logout"
-msgstr "Выход"
+msgstr "Выйти"
 
 #: ../actions/register.php:166
 msgid "Longer name, preferably your \"real\" name"
-msgstr ""
+msgstr "Полное им�, лучше в�его на�то�щее"
 
-#: ../actions/login.php:110
+#: ../actions/login.php:110 actions/login.php:110
 msgid "Lost or forgotten password?"
-msgstr "Забыли или потер�ли пароль?"
+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 ""
 
-#: ../actions/emailsettings.php:27
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
 #: ../actions/showstream.php:300
 msgid "Member since"
-msgstr "Уча�тник �"
+msgstr "Реги�траци�"
 
-#: ../actions/userrss.php:70
+#: ../actions/userrss.php:70 actions/userrss.php:67
 #, php-format
 msgid "Microblog by %s"
 msgstr ""
@@ -958,28 +1032,29 @@ msgstr ""
 
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 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
 msgid "New"
 msgstr ""
 
-#: ../lib/mail.php:144
+#: ../lib/mail.php:144 lib/mail.php:144
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
 
-#: ../actions/emailsettings.php:297
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
 msgid "New incoming email address added."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:71
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
 msgid "New nickname"
-msgstr "�овый п�евдоним"
+msgstr ""
 
-#: ../actions/newnotice.php:87
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
 msgid "New notice"
-msgstr "�овое уведомление"
+msgstr ""
 
 #: ../actions/password.php:41 ../actions/recoverpassword.php:179
 msgid "New password"
@@ -987,142 +1062,148 @@ msgstr "�овый пароль"
 
 #: ../actions/recoverpassword.php:314
 msgid "New password successfully saved. You are now logged in."
-msgstr "�овый пароль у�пешно �охранен. Вы теперь авторизованы. "
+msgstr ""
 
 #: ../actions/login.php:101 ../actions/profilesettings.php:41
 #: ../actions/register.php:151
-#, fuzzy
 msgid "Nickname"
-msgstr "П�евдоним"
+msgstr "Кличка"
 
 #: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69
+#: ../actions/register.php:69 actions/finishopenidlogin.php:181
+#: actions/profilesettings.php:225 actions/register.php:76
 msgid "Nickname already in use. Try another one."
-msgstr "Им� пользовател� уже и�пользует��. Попробуйте другое."
+msgstr ""
 
 #: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
 #: ../actions/register.php:67 ../actions/updateprofile.php:77
-#, fuzzy
+#: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
+#: actions/register.php:74 actions/updateprofile.php:78
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
-"Им� пользовател� должно �о�то�ть из букв (в нижнего реги�тре), цифр и не "
-"должно �одержать пробелов."
 
-#: ../actions/finishopenidlogin.php:170
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
 msgid "Nickname not allowed."
-msgstr "Им� пользовател� не разрешено"
+msgstr ""
 
-#: ../actions/remotesubscribe.php:72
+#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
 msgid "Nickname of the user you want to follow"
 msgstr ""
 
-#: ../actions/recoverpassword.php:162
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
 msgid "Nickname or email"
 msgstr ""
 
 #: ../actions/deletenotice.php:59
 msgid "No"
-msgstr ""
+msgstr "�ет"
 
-#: ../actions/imsettings.php:156
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
 msgid "No Jabber ID."
 msgstr ""
 
-#: ../actions/userauthorization.php:129
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
 msgid "No authorization request!"
 msgstr ""
 
-#: ../actions/smssettings.php:181
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
 msgid "No carrier selected."
 msgstr ""
 
-#: ../actions/smssettings.php:316
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
 msgid "No code entered"
 msgstr ""
 
-#: ../actions/confirmaddress.php:33
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
 msgid "No confirmation code."
 msgstr ""
 
-#: ../actions/newnotice.php:44
+#: ../actions/newnotice.php:44 actions/newmessage.php:53
+#: actions/newnotice.php:44 classes/Command.php:197
 msgid "No content!"
 msgstr ""
 
-#: ../actions/emailsettings.php:174
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
 msgid "No email address."
 msgstr ""
 
-#: ../actions/userbyid.php:32
+#: ../actions/userbyid.php:32 actions/userbyid.php:32
 msgid "No id."
 msgstr ""
 
-#: ../actions/emailsettings.php:271
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
 msgid "No incoming email address."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:65
+#: actions/finishremotesubscribe.php:67
 msgid "No nickname provided by remote server."
 msgstr ""
 
-#: ../actions/avatarbynickname.php:27
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 msgid "No nickname."
 msgstr ""
 
 #: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229
+#: ../actions/smssettings.php:229 actions/emailsettings.php:240
+#: actions/imsettings.php:214 actions/smssettings.php:237
 msgid "No pending confirmation to cancel."
 msgstr ""
 
-#: ../actions/smssettings.php:176
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
 msgid "No phone number."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:72
+#: actions/finishremotesubscribe.php:74
 msgid "No profile URL returned by server."
 msgstr ""
 
-#: ../actions/recoverpassword.php:226
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
 msgid "No registered email address for that user."
 msgstr ""
 
-#: ../actions/userauthorization.php:49
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
 msgid "No request found!"
 msgstr ""
 
 #: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
+#: actions/noticesearch.php:69 actions/peoplesearch.php:69
 msgid "No results"
-msgstr "�ет результатов"
+msgstr ""
 
-#: ../actions/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
 msgid "No size."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:595
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520
 msgid "No status found with that ID."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:555
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
 msgid "No status with that ID found."
 msgstr ""
 
-#: ../actions/openidsettings.php:135
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
 msgid "No such OpenID."
 msgstr ""
 
-#: ../actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29
 msgid "No such document."
 msgstr ""
 
 #: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30
+#: ../lib/deleteaction.php:30 actions/shownotice.php:32
+#: actions/shownotice.php:83 lib/deleteaction.php:30
 msgid "No such notice."
 msgstr ""
 
-#: ../actions/recoverpassword.php:56
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
 msgid "No such recovery code."
 msgstr ""
 
-#: ../actions/postnotice.php:56
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
 msgid "No such subscription"
 msgstr ""
 
@@ -1132,110 +1213,126 @@ msgstr ""
 #: ../actions/replies.php:57 ../actions/repliesrss.php:35
 #: ../actions/showstream.php:110 ../actions/userbyid.php:36
 #: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
-#: ../lib/subs.php:33 ../lib/subs.php:82
+#: ../lib/subs.php:33 ../lib/subs.php:82 actions/all.php:34
+#: actions/allrss.php:35 actions/avatarbynickname.php:43
+#: actions/favoritesrss.php:35 actions/foaf.php:40 actions/ical.php:31
+#: actions/remotesubscribe.php:93 actions/remotesubscribe.php:100
+#: actions/replies.php:57 actions/repliesrss.php:35
+#: actions/showfavorites.php:34 actions/showstream.php:110
+#: actions/userbyid.php:36 actions/userrss.php:35 actions/xrds.php:35
+#: classes/Command.php:120 classes/Command.php:162 classes/Command.php:203
+#: classes/Command.php:237 lib/gallery.php:62 lib/mailbox.php:36
+#: lib/subs.php:33 lib/subs.php:95
 msgid "No such user."
 msgstr ""
 
-#: ../actions/recoverpassword.php:211
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
 msgid "No user with that email address or username."
 msgstr ""
 
-#: ../lib/gallery.php:80
-#, fuzzy
+#: ../lib/gallery.php:80 lib/gallery.php:85
 msgid "Nobody to show!"
-msgstr "�екого показывать!"
+msgstr ""
 
-#: ../actions/recoverpassword.php:60
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
 msgid "Not a recovery code."
 msgstr ""
 
-#: ../scripts/maildaemon.php:50
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
 msgid "Not a registered user."
 msgstr ""
 
 #: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332
+#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
+#: lib/twitterapi.php:502
 msgid "Not a supported data format."
 msgstr ""
 
-#: ../actions/imsettings.php:167
+#: ../actions/imsettings.php:167 actions/imsettings.php:175
 msgid "Not a valid Jabber ID"
 msgstr ""
 
-#: ../lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131
 msgid "Not a valid OpenID."
 msgstr ""
 
-#: ../actions/emailsettings.php:185
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
 msgid "Not a valid email address"
 msgstr ""
 
-#: ../actions/register.php:63
+#: ../actions/register.php:63 actions/register.php:70
 msgid "Not a valid email address."
 msgstr ""
 
 #: ../actions/profilesettings.php:91 ../actions/register.php:71
+#: actions/profilesettings.php:206 actions/register.php:78
 msgid "Not a valid nickname."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:120
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
 msgid "Not a valid profile URL (incorrect services)."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:113
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:104
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
 msgid "Not a valid profile URL (no YADIS document)."
 msgstr ""
 
-#: ../actions/avatar.php:95
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
 msgid "Not an image or corrupt file."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53
 msgid "Not authorized."
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38
 msgid "Not expecting this response!"
 msgstr ""
 
 #: ../actions/twitapistatuses.php:422
 msgid "Not found"
-msgstr ""
+msgstr "�е нашли"
 
 #: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
 #: ../actions/newnotice.php:29 ../actions/subscribe.php:28
 #: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
-#: ../lib/settingsaction.php:27
+#: ../lib/settingsaction.php:27 actions/disfavor.php:29 actions/favor.php:30
+#: actions/finishaddopenid.php:29 actions/logout.php:33
+#: actions/newmessage.php:28 actions/newnotice.php:29 actions/subscribe.php:28
+#: actions/unsubscribe.php:25 lib/deleteaction.php:38
+#: lib/settingsaction.php:27
 msgid "Not logged in."
 msgstr ""
 
-#: ../lib/subs.php:91
+#: ../lib/subs.php:91 lib/subs.php:104
 msgid "Not subscribed!."
 msgstr ""
 
-#: ../actions/opensearch.php:35
-#, fuzzy
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
 msgid "Notice Search"
-msgstr "Пои�к"
+msgstr ""
 
-#: ../actions/showstream.php:82
+#: ../actions/showstream.php:82 actions/showstream.php:82
 #, php-format
 msgid "Notice feed for %s"
 msgstr ""
 
-#: ../actions/shownotice.php:39
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
 msgid "Notice has no profile"
 msgstr ""
 
 #: ../actions/showstream.php:316
 msgid "Notices"
-msgstr ""
+msgstr "Заметки"
 
-#: ../actions/tag.php:35 ../actions/tag.php:81
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
@@ -1244,54 +1341,59 @@ msgstr ""
 msgid "Old password"
 msgstr "Старый пароль"
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314
+#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
+#: lib/util.php:330
 msgid "OpenID"
-msgstr "OpenID"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:61
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
 msgid "OpenID Account Setup"
 msgstr ""
 
-#: ../lib/openid.php:180
+#: ../lib/openid.php:180 lib/openid.php:180
 msgid "OpenID Auto-Submit"
 msgstr ""
 
 #: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60
+#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
+#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 msgid "OpenID Login"
 msgstr ""
 
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
+#: actions/openidlogin.php:74 actions/openidsettings.php:50
 msgid "OpenID URL"
 msgstr ""
 
 #: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
+#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
 msgid "OpenID authentication cancelled."
 msgstr ""
 
 #: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr ""
 
-#: ../lib/openid.php:133
+#: ../lib/openid.php:133 lib/openid.php:133
 #, php-format
 msgid "OpenID failure: %s"
 msgstr ""
 
-#: ../actions/openidsettings.php:144
+#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
 msgid "OpenID removed."
 msgstr ""
 
-#: ../actions/openidsettings.php:37
+#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
 msgid "OpenID settings"
 msgstr ""
 
 #: ../actions/invite.php:135
 msgid "Optionally add a personal message to the invitation."
-msgstr ""
+msgstr "Дополнительно добавь к приглашению личное �ообщение."
 
-#: ../actions/avatar.php:84
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
 msgid "Partial upload."
 msgstr ""
 
@@ -1300,53 +1402,52 @@ msgstr ""
 msgid "Password"
 msgstr "Пароль"
 
-#: ../actions/recoverpassword.php:288
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
 msgid "Password and confirmation do not match."
-msgstr "Пароль и подтверждение парол� не �овпадают."
+msgstr ""
 
-#: ../actions/recoverpassword.php:284
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
 msgid "Password must be 6 chars or more."
-msgstr "Пароль должен быть не короче 6 �имволов."
+msgstr ""
 
 #: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#, fuzzy
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
 msgid "Password recovery requested"
-msgstr "Запрошено во��тановление парол� "
+msgstr ""
 
 #: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: actions/profilesettings.php:408 actions/recoverpassword.php:326
 msgid "Password saved."
-msgstr "Пароль �охранен."
+msgstr ""
 
 #: ../actions/password.php:61 ../actions/register.php:88
+#: actions/profilesettings.php:380 actions/register.php:98
 msgid "Passwords don't match."
-msgstr "Пароли не �овпадают."
+msgstr ""
 
 #: ../lib/searchaction.php:100
-#, fuzzy
 msgid "People"
-msgstr "Пои�к людей"
+msgstr "Люди"
 
-#: ../actions/opensearch.php:33
-#, fuzzy
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
 msgid "People Search"
-msgstr "Пои�к людей"
+msgstr ""
 
-#: ../actions/peoplesearch.php:33
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
 msgid "People search"
-msgstr "Пои�к людей"
+msgstr ""
 
 #: ../lib/stream.php:50
 msgid "Personal"
-msgstr ""
+msgstr "Свои"
 
 #: ../actions/invite.php:133
 msgid "Personal message"
-msgstr ""
+msgstr "Личное �ообщение"
 
-#: ../actions/smssettings.php:69
-#, fuzzy
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
 msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "1-64 буквы или цифры нижнего реги�тра, без "
+msgstr ""
 
 #: ../actions/userauthorization.php:78
 msgid ""
@@ -1355,30 +1456,31 @@ msgid ""
 "click \"Cancel\"."
 msgstr ""
 
-#: ../actions/imsettings.php:73
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
 #: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
 #: ../actions/smssettings.php:94
 msgid "Preferences"
-msgstr "�а�тройки"
+msgstr "Предпочтени�"
 
 #: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163
+#: ../actions/smssettings.php:163 actions/emailsettings.php:180
+#: actions/imsettings.php:152 actions/smssettings.php:171
 msgid "Preferences saved."
 msgstr ""
 
 #: ../actions/profilesettings.php:57
-#, fuzzy
 msgid "Preferred language"
-msgstr "�а�тройки"
+msgstr "Любимый �зык"
 
 #: ../lib/util.php:328
 msgid "Privacy"
-msgstr "Приватно�ть"
+msgstr "Ча�тное"
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106
+#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
+#: classes/Notice.php:119
 msgid "Problem saving notice."
 msgstr ""
 
@@ -1386,64 +1488,65 @@ msgstr ""
 msgid "Profile"
 msgstr "Профиль"
 
-#: ../actions/remotesubscribe.php:73
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
 msgid "Profile URL"
-msgstr "С�ылка на профиль "
+msgstr ""
 
 #: ../actions/profilesettings.php:34
 msgid "Profile settings"
 msgstr "�а�тройки профил�"
 
 #: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: actions/postnotice.php:52 actions/updateprofile.php:53
 msgid "Profile unknown"
-msgstr "Профиль неизве�тен "
+msgstr ""
 
-#: ../actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54
 msgid "Public Stream Feed"
 msgstr ""
 
 #: ../actions/public.php:33
 msgid "Public timeline"
-msgstr ""
+msgstr "Публична� дорожка"
 
-#: ../actions/imsettings.php:79
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
-#: ../actions/emailsettings.php:94
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
-#: ../actions/tag.php:75 ../actions/tag.php:76
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
 msgid "Recent Tags"
 msgstr ""
 
-#: ../actions/recoverpassword.php:166
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
 msgid "Recover"
-msgstr "Во��тановить "
+msgstr ""
 
-#: ../actions/recoverpassword.php:156
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
 msgid "Recover password"
-msgstr "Во��тановить пароль"
+msgstr ""
 
-#: ../actions/recoverpassword.php:67
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
 msgid "Recovery code for unknown user."
 msgstr ""
 
 #: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
 msgid "Register"
-msgstr "Реги�траци�"
+msgstr "Учёт"
 
-#: ../actions/register.php:28
-#, fuzzy
+#: ../actions/register.php:28 actions/register.php:28
 msgid "Registration not allowed."
-msgstr "Им� пользовател� не разрешено"
+msgstr ""
 
-#: ../actions/register.php:200
+#: ../actions/register.php:200 actions/register.php:214
 msgid "Registration successful"
 msgstr ""
 
-#: ../actions/userauthorization.php:120
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
 msgid "Reject"
 msgstr ""
 
@@ -1451,21 +1554,25 @@ msgstr ""
 msgid "Remember me"
 msgstr "Запомнить мен�"
 
-#: ../actions/updateprofile.php:70
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
 msgid "Remote profile with no matching profile"
 msgstr ""
 
-#: ../actions/remotesubscribe.php:65
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
 msgid "Remote subscribe"
-msgstr "Удаленна� подпи�ка"
+msgstr ""
 
 #: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
 #: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59
 msgid "Remove"
 msgstr ""
 
-#: ../actions/openidsettings.php:68
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
 msgid "Remove OpenID"
 msgstr ""
 
@@ -1480,42 +1587,42 @@ msgid "Replies"
 msgstr "Ответы"
 
 #: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
 #, php-format
 msgid "Replies to %s"
-msgstr "Ответы дл� %s"
+msgstr ""
 
-#: ../actions/recoverpassword.php:183
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
 msgid "Reset"
 msgstr ""
 
-#: ../actions/recoverpassword.php:173
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
 msgid "Reset password"
 msgstr ""
 
-#: ../lib/settingsaction.php:99
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 msgid "SMS"
 msgstr ""
 
-#: ../actions/smssettings.php:67
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
 msgid "SMS Phone number"
 msgstr ""
 
-#: ../actions/smssettings.php:33
-#, fuzzy
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
 msgid "SMS Settings"
-msgstr "�а�тройки IM"
+msgstr ""
 
-#: ../lib/mail.php:219
+#: ../lib/mail.php:219 lib/mail.php:225
 msgid "SMS confirmation"
 msgstr ""
 
-#: ../actions/recoverpassword.php:182
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
 msgid "Same as password above"
 msgstr ""
 
 #: ../actions/register.php:156
 msgid "Same as password above. Required."
-msgstr ""
+msgstr "Тот же пароль что и �верху. Об�зательно."
 
 #: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
 #: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
@@ -1526,7 +1633,7 @@ msgstr "Сохранить"
 msgid "Search"
 msgstr "Пои�к"
 
-#: ../actions/noticesearch.php:80
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
 msgid "Search Stream Feed"
 msgstr ""
 
@@ -1536,6 +1643,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 буквы."
 
 #: ../actions/peoplesearch.php:28
 #, php-format
@@ -1543,38 +1652,40 @@ 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 буквы."
 
-#: ../actions/smssettings.php:296
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
 msgid "Select a carrier"
 msgstr ""
 
 #: ../actions/invite.php:137 ../lib/util.php:1172
 msgid "Send"
-msgstr "Отправить"
+msgstr "По�лать"
 
 #: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
+#: actions/emailsettings.php:74 actions/smssettings.php:82
 msgid "Send email to this address to post new notices."
 msgstr ""
 
 #: ../actions/emailsettings.php:88
-#, fuzzy
 msgid "Send me notices of new subscriptions through email."
-msgstr "Отправл�ть мне уведомлени� через Jabber/GTalk."
+msgstr "Уведомл�ть мен� о новых подпи�чиках по почте."
 
-#: ../actions/imsettings.php:70
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
-msgstr "Отправл�ть мне уведомлени� через Jabber/GTalk."
+msgstr ""
 
-#: ../actions/smssettings.php:97
+#: ../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
-#, fuzzy
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr "Отправл�ть мне уведомлени� через Jabber/GTalk."
+msgstr ""
 
 #: ../lib/util.php:304
 msgid "Settings"
@@ -1584,152 +1695,152 @@ msgstr "�а�тройки"
 msgid "Settings saved."
 msgstr "�а�тройки �охранены."
 
-#: ../actions/tag.php:60
+#: ../actions/tag.php:60 actions/tag.php:60
 msgid "Showing most popular tags from the last week"
 msgstr ""
 
-#: ../actions/finishaddopenid.php:66
+#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
+#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
 msgid "Something weird happened."
 msgstr ""
 
-#: ../scripts/maildaemon.php:58
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
 msgid "Sorry, no incoming email allowed."
 msgstr ""
 
-#: ../scripts/maildaemon.php:54
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
 msgid "Sorry, that is not your incoming email address."
 msgstr ""
 
 #: ../lib/util.php:330
 msgid "Source"
-msgstr "И�точник"
+msgstr "И�ходник"
 
 #: ../actions/showstream.php:296
 msgid "Statistics"
 msgstr "Стати�тика"
 
 #: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
 msgid "Stored OpenID not found."
-msgstr "Хранимый OpenID не найден."
+msgstr ""
 
 #: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
 #: ../actions/showstream.php:197
 msgid "Subscribe"
-msgstr "Подпи�ка"
+msgstr "Подпи�ать��"
 
 #: ../actions/showstream.php:313 ../actions/subscribers.php:27
 msgid "Subscribers"
 msgstr "Подпи�чики"
 
-#: ../actions/userauthorization.php:310
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
 msgid "Subscription authorized"
-msgstr "Подпи�ка авторизована  "
+msgstr ""
 
-#: ../actions/userauthorization.php:320
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
 msgid "Subscription rejected"
-msgstr "Подпи�ка отклонена"
+msgstr ""
 
 #: ../actions/showstream.php:230 ../actions/showstream.php:307
 #: ../actions/subscriptions.php:27
 msgid "Subscriptions"
-msgstr "Подпи�ки"
+msgstr "Подпи�ка"
 
-#: ../actions/avatar.php:87
-#, fuzzy
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
 msgid "System error uploading file."
-msgstr "Си�темна� ошибка при загрузке файла."
+msgstr ""
 
 #: ../actions/tag.php:41 ../lib/util.php:301
 msgid "Tags"
-msgstr ""
+msgstr "Метки"
 
 #: ../lib/searchaction.php:104
 msgid "Text"
-msgstr ""
+msgstr "Тек�т"
 
-#: ../actions/noticesearch.php:34
-#, fuzzy
+#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
 msgid "Text search"
-msgstr "Пои�к тек�та"
+msgstr ""
 
-#: ../actions/openidsettings.php:140
+#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
 msgid "That OpenID does not belong to you."
 msgstr ""
 
-#: ../actions/confirmaddress.php:52
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
 msgid "That address has already been confirmed."
 msgstr ""
 
-#: ../actions/confirmaddress.php:43
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
 msgid "That confirmation code is not for you!"
 msgstr ""
 
-#: ../actions/emailsettings.php:191
-#, fuzzy
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
 msgid "That email address already belongs to another user."
-msgstr "Jabber ID уже принадлежит другому пользователю."
+msgstr ""
 
-#: ../actions/avatar.php:80
-#, fuzzy
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
 msgid "That file is too big."
-msgstr "Файл �лишком большой."
+msgstr ""
 
-#: ../actions/imsettings.php:170
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
 msgid "That is already your Jabber ID."
 msgstr ""
 
-#: ../actions/emailsettings.php:188
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
 msgid "That is already your email address."
 msgstr ""
 
-#: ../actions/smssettings.php:188
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
 msgid "That is already your phone number."
 msgstr ""
 
-#: ../actions/imsettings.php:233
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
 msgid "That is not your Jabber ID."
 msgstr ""
 
-#: ../actions/emailsettings.php:249
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
 msgid "That is not your email address."
 msgstr ""
 
-#: ../actions/smssettings.php:257
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
 msgid "That is not your phone number."
 msgstr ""
 
 #: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
+#: actions/emailsettings.php:244 actions/imsettings.php:218
 msgid "That is the wrong IM address."
 msgstr ""
 
-#: ../actions/smssettings.php:233
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
 msgid "That is the wrong confirmation number."
 msgstr ""
 
-#: ../actions/smssettings.php:191
-#, fuzzy
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
 msgid "That phone number already belongs to another user."
-msgstr "Jabber ID уже принадлежит другому пользователю."
+msgstr ""
 
 #: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: actions/newnotice.php:49 actions/twitapistatuses.php:330
 msgid "That's too long. Max notice size is 140 chars."
 msgstr ""
 
-#: ../actions/twitapiaccount.php:74
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
 msgid "That's too long. Max notice size is 255 chars."
 msgstr ""
 
-#: ../actions/confirmaddress.php:92
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
 
 #: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274
+#: ../actions/smssettings.php:274 actions/emailsettings.php:282
+#: actions/imsettings.php:258 actions/smssettings.php:282
 msgid "The address was removed."
 msgstr ""
 
@@ -1747,27 +1858,28 @@ msgid ""
 "subscription."
 msgstr ""
 
-#: ../actions/subscribers.php:35
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr ""
 
-#: ../actions/subscribers.php:33
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
 msgid "These are the people who listen to your notices."
 msgstr ""
 
-#: ../actions/subscriptions.php:35
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr ""
 
-#: ../actions/subscriptions.php:33
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
 msgid "These are the people whose notices you listen to."
 msgstr ""
 
-#: ../actions/invite.php:89
+#: ../actions/invite.php:89 actions/invite.php:96
 msgid ""
-"These people are already users and you were automatically subscribed to them:"
+"These people are already users and you were automatically subscribed to "
+"them:"
 msgstr ""
 
 #: ../actions/recoverpassword.php:88
@@ -1780,7 +1892,7 @@ msgid ""
 "button to go to your OpenID provider."
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:56
+#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -1789,107 +1901,117 @@ msgid ""
 msgstr ""
 
 #: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511
 msgid "This method requires a POST or DELETE."
 msgstr ""
 
 #: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381
+#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
+#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
+#: actions/twitapistatuses.php:303
 msgid "This method requires a POST."
 msgstr ""
 
-#: ../lib/util.php:164
+#: ../lib/util.php:164 lib/util.php:246
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
 #: ../actions/profilesettings.php:63
 msgid "Timezone"
-msgstr ""
+msgstr "Ча�овой по��"
 
-#: ../actions/profilesettings.php:107
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
 msgid "Timezone not selected."
 msgstr ""
 
 #: ../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."
+"To subscribe, you can [login](%%action.login%%), or "
+"[register](%%action.register%%) a new  account. If you already have an "
+"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
+"your profile URL below."
 msgstr ""
 
-#: ../actions/twitapifriendships.php:163
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
 #: ../actions/profilesettings.php:48 ../actions/register.php:169
 msgid "URL of your homepage, blog, or profile on another site"
-msgstr ""
+msgstr "�дре� твоей �траницы, дневника или профил� на другом портале"
 
-#: ../actions/remotesubscribe.php:74
+#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
 msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
 #: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
 #: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: actions/emailsettings.php:144 actions/imsettings.php:118
+#: actions/recoverpassword.php:39 actions/smssettings.php:143
+#: actions/twittersettings.php:108
 msgid "Unexpected form submission."
 msgstr ""
 
-#: ../actions/recoverpassword.php:276
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
 msgid "Unexpected password reset."
 msgstr ""
 
-#: ../index.php:57
+#: ../index.php:57 index.php:57
 msgid "Unknown action"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:58
+#: actions/finishremotesubscribe.php:60
 msgid "Unknown version of OMB protocol."
-msgstr "�еизве�тна� вер�и� OMB протокола. "
+msgstr ""
 
-#: ../lib/util.php:269
+#: ../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 ""
 
-#: ../actions/confirmaddress.php:48
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
 #, php-format
 msgid "Unrecognized address type %s"
 msgstr ""
 
 #: ../actions/showstream.php:209
 msgid "Unsubscribe"
-msgstr ""
+msgstr "�ннулировать подпи�ку"
 
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: actions/postnotice.php:45 actions/updateprofile.php:46
 msgid "Unsupported OMB version"
 msgstr ""
 
-#: ../actions/avatar.php:105
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
 msgid "Unsupported image file format."
 msgstr ""
 
-#: ../lib/settingsaction.php:100
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
 msgid "Updates by SMS"
 msgstr ""
 
-#: ../lib/settingsaction.php:103
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:241
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:341
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
 #: ../actions/avatar.php:68
 msgid "Upload"
-msgstr "Загрузка"
+msgstr "Загрузить"
 
 #: ../actions/avatar.php:27
 msgid ""
@@ -1905,14 +2027,16 @@ msgstr ""
 
 #: ../actions/invite.php:114
 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."
+msgstr "В �том формул�ре ты можешь пригла�ить друзей и коллег на наш �ерви�."
 
 #: ../actions/register.php:159 ../actions/register.php:162
 msgid "Used only for updates, announcements, and password recovery"
-msgstr ""
+msgstr "�ужна только дл� обновлений, о�ведомлений и во��тановлени� парол�."
 
 #: ../actions/finishremotesubscribe.php:86
+#: actions/finishremotesubscribe.php:88
 msgid "User being listened to doesn't exist."
 msgstr ""
 
@@ -1920,65 +2044,69 @@ msgstr ""
 #: ../actions/foaf.php:47 ../actions/replies.php:41
 #: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
 #: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
-#: ../actions/twitapiusers.php:82
+#: ../actions/twitapiusers.php:82 actions/all.php:41
+#: actions/avatarbynickname.php:48 actions/foaf.php:47 actions/replies.php:41
+#: actions/showfavorites.php:41 actions/showstream.php:44
+#: actions/twitapiaccount.php:80 actions/twitapifavorites.php:68
+#: actions/twitapistatuses.php:235 actions/twitapistatuses.php:609
+#: actions/twitapiusers.php:87 lib/mailbox.php:50
 msgid "User has no profile."
 msgstr ""
 
-#: ../actions/remotesubscribe.php:71
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
 msgid "User nickname"
 msgstr ""
 
 #: ../actions/twitapiusers.php:75
-#, fuzzy
 msgid "User not found."
-msgstr "Хранимый OpenID не найден."
+msgstr "Пользователь не найден."
 
 #: ../actions/profilesettings.php:63
 msgid "What timezone are you normally in?"
-msgstr ""
+msgstr "В каком ча�овом по��е ты обычно находишь��?"
 
 #: ../lib/util.php:1159
-#, fuzzy, php-format
+#, php-format
 msgid "What's up, %s?"
-msgstr "Как дела, %s?"
+msgstr "Что �лышно, %s?"
 
 #: ../actions/profilesettings.php:54 ../actions/register.php:175
 msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr ""
+msgstr "Где ты находишь��, например «Город, Страна»"
 
-#: ../actions/updateprofile.php:128
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr ""
 
-#: ../actions/updateprofile.php:123
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr ""
 
 #: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
 msgid "Yes"
-msgstr ""
+msgstr "Да"
 
-#: ../actions/finishaddopenid.php:64
+#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr ""
 
-#: ../actions/deletenotice.php:37
+#: ../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 ""
 
-#: ../actions/recoverpassword.php:31
+#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
 msgid "You are already logged in!"
-msgstr "Вы уже авторизованы!"
+msgstr ""
 
-#: ../actions/invite.php:81
+#: ../actions/invite.php:81 actions/invite.php:88
 msgid "You are already subscribed to these users:"
 msgstr ""
 
-#: ../actions/twitapifriendships.php:128
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
 msgid "You are not friends with the specified user."
 msgstr ""
 
@@ -1988,9 +2116,9 @@ msgstr ""
 
 #: ../actions/register.php:135
 msgid "You can create a new account to start posting notices."
-msgstr ""
+msgstr "Ты можешь в�тать на учёт и пи�ать �вои заметки."
 
-#: ../actions/smssettings.php:28
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
@@ -2001,27 +2129,29 @@ msgid ""
 "\"Remove\"."
 msgstr ""
 
-#: ../actions/imsettings.php:28
+#: ../actions/imsettings.php:28 actions/imsettings.php:28
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about you."
+"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
 msgid "You can use the local subscription!"
 msgstr ""
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 msgid "You can't register if you don't agree to the license."
-msgstr ""
+msgstr "Ты не можешь в�тать на учёт, е�ли ты не �огла�ен � лицензией."
 
-#: ../actions/updateprofile.php:63
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
 msgid "You did not send us that profile"
 msgstr ""
 
@@ -2038,16 +2168,16 @@ msgid ""
 "%4$s"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:612
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
 msgid "You may not delete another user's status."
 msgstr ""
 
-#: ../actions/invite.php:31
+#: ../actions/invite.php:31 actions/invite.php:31
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr ""
 
-#: ../actions/invite.php:103
+#: ../actions/invite.php:103 actions/invite.php:110
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
@@ -2057,10 +2187,9 @@ msgstr ""
 msgid "You've been identified. Enter a  new password below. "
 msgstr ""
 
-#: ../actions/openidlogin.php:67
-#, fuzzy
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
 msgid "Your OpenID URL"
-msgstr "С�ылка на ваш OpenID"
+msgstr ""
 
 #: ../actions/recoverpassword.php:164
 msgid "Your nickname on this server, or your registered email address."
@@ -2075,51 +2204,51 @@ msgstr ""
 
 #: ../lib/util.php:943
 msgid "a few seconds ago"
-msgstr ""
+msgstr "пару �екунд назад"
 
 #: ../lib/util.php:955
 #, php-format
 msgid "about %d days ago"
-msgstr ""
+msgstr "%d дней назад"
 
 #: ../lib/util.php:951
 #, php-format
 msgid "about %d hours ago"
-msgstr ""
+msgstr "%d ча�ов назад"
 
 #: ../lib/util.php:947
 #, php-format
 msgid "about %d minutes ago"
-msgstr ""
+msgstr "%d минут назад"
 
 #: ../lib/util.php:959
 #, php-format
 msgid "about %d months ago"
-msgstr ""
+msgstr "%d ме��цев назад"
 
 #: ../lib/util.php:953
 msgid "about a day ago"
-msgstr ""
+msgstr "день назад"
 
 #: ../lib/util.php:945
 msgid "about a minute ago"
-msgstr ""
+msgstr "минуту назад"
 
 #: ../lib/util.php:957
 msgid "about a month ago"
-msgstr ""
+msgstr "ме��ц назад"
 
 #: ../lib/util.php:961
 msgid "about a year ago"
-msgstr ""
+msgstr "год назад"
 
 #: ../lib/util.php:949
 msgid "about an hour ago"
-msgstr ""
+msgstr "ча� назад"
 
 #: ../actions/showstream.php:423 ../lib/stream.php:132
 msgid "delete"
-msgstr ""
+msgstr "удалить"
 
 #: ../actions/noticesearch.php:130 ../actions/showstream.php:408
 #: ../lib/stream.php:117
@@ -2129,19 +2258,605 @@ msgstr "в ответ на..."
 #: ../actions/noticesearch.php:137 ../actions/showstream.php:415
 #: ../lib/stream.php:124
 msgid "reply"
-msgstr ""
+msgstr "ответить"
 
 #: ../actions/password.php:44
 msgid "same as password above"
-msgstr ""
+msgstr "повторить пароль �верху"
 
-#: ../actions/twitapistatuses.php:755
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
 msgid "unsupported file type"
 msgstr ""
 
 #: ../lib/util.php:1309
 msgid "« After"
+msgstr "« Следующие"
+
+#: actions/deletenotice.php:74 actions/disfavor.php:43
+#: actions/emailsettings.php:127 actions/favor.php:45
+#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
+#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
+#: actions/openidsettings.php:123 actions/profilesettings.php:47
+#: actions/recoverpassword.php:282 actions/register.php:42
+#: actions/remotesubscribe.php:40 actions/smssettings.php:124
+#: actions/subscribe.php:44 actions/twittersettings.php:97
+#: actions/unsubscribe.php:41 actions/userauthorization.php:35
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/disfavor.php:55
+msgid "This notice is not a favorite!"
+msgstr ""
+
+#: actions/disfavor.php:63
+msgid "Could not delete favorite."
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Favor"
+msgstr ""
+
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+
+#: actions/emailsettings.php:95
+msgid "Send me email when someone sends me a private message."
+msgstr ""
+
+#: actions/favor.php:53 actions/twitapifavorites.php:142
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132
+msgid "Could not create favorite."
+msgstr ""
+
+#: actions/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#, php-format
+msgid "%s favorite notices"
+msgstr ""
+
+#: actions/favoritesrss.php:64
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr ""
+
+#: actions/inbox.php:28
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+
+#: actions/invite.php:178
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+msgstr ""
+
+#: actions/login.php:104
+msgid "Automatically login in the future; "
+msgstr ""
+
+#: actions/login.php:122
+msgid "For security reasons, please re-enter your "
+msgstr ""
+
+#: actions/login.php:126
+msgid "Login with your username and password. "
+msgstr ""
+
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+msgid "That's too long. Max message size is 140 chars."
+msgstr ""
+
+#: actions/newmessage.php:65
+msgid "No recipient specified."
+msgstr ""
+
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206
+msgid "You can't send a message to this user."
+msgstr ""
+
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly "
+"instead."
+msgstr ""
+
+#: actions/newmessage.php:108
+msgid "No such user"
+msgstr ""
+
+#: actions/newmessage.php:117
+msgid "New message"
+msgstr ""
+
+#: actions/noticesearch.php:95
+msgid "Notice without matching profile"
+msgstr ""
+
+#: actions/openidsettings.php:28
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr ""
+
+#: actions/openidsettings.php:46
+msgid "If you want to add an OpenID to your account, "
+msgstr ""
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr ""
+
+#: actions/openidsettings.php:87
+msgid "You can remove an OpenID from your account "
+msgstr ""
+
+#: actions/outbox.php:28
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr ""
+
+#: actions/outbox.php:30
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#: actions/outbox.php:53
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+
+#: actions/peoplesearch.php:28
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+msgstr ""
+
+#: actions/profilesettings.php:27
+msgid "You can update your personal profile info here "
+msgstr ""
+
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+msgid "User without matching profile"
+msgstr ""
+
+#: actions/recoverpassword.php:91
+msgid "This confirmation code is too old. "
+msgstr ""
+
+#: actions/recoverpassword.php:141
+msgid "If you've forgotten or lost your"
+msgstr ""
+
+#: actions/recoverpassword.php:154
+msgid "You've been identified. Enter a "
+msgstr ""
+
+#: actions/recoverpassword.php:169
+msgid "Your nickname on this server, "
+msgstr ""
+
+#: actions/recoverpassword.php:271
+msgid "Instructions for recovering your password "
+msgstr ""
+
+#: actions/recoverpassword.php:327
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95
+msgid "Password must be 6 or more characters."
+msgstr ""
+
+#: actions/register.php:216
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
+msgstr ""
+
+#: actions/register.php:227
+msgid "(You should receive a message by email momentarily, with "
+msgstr ""
+
+#: actions/remotesubscribe.php:51
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
+msgstr ""
+
+#: actions/showfavorites.php:61
+#, php-format
+msgid "Feed for favorites of %s"
+msgstr ""
+
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+msgid "Could not retrieve favorite notices."
+msgstr ""
+
+#: actions/showmessage.php:33
+msgid "No such message."
+msgstr ""
+
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
+msgstr ""
+
+#: actions/showmessage.php:61
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr ""
+
+#: actions/showmessage.php:66
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr ""
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr ""
+
+#: actions/smssettings.php:312
+#, php-format
+msgid "Mobile carrier for your phone. "
+msgstr ""
+
+#: actions/twitapidirect_messages.php:76
+#, php-format
+msgid "Direct messages to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:77
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:81
+msgid "Direct Messages You've Sent"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:82
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:128
+msgid "No message text!"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:138
+msgid "Recipient user not found."
+msgstr ""
+
+#: actions/twitapidirect_messages.php:141
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
+#: actions/twitapifavorites.php:92
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr ""
+
+#: actions/twitapifavorites.php:95
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr ""
+
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#, php-format
+msgid "%s added your notice as a favorite"
+msgstr ""
+
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+msgstr ""
+
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+msgstr ""
+
+#: actions/twittersettings.php:41
+msgid "Twitter settings"
+msgstr ""
+
+#: actions/twittersettings.php:48
+msgid "Twitter Account"
+msgstr ""
+
+#: actions/twittersettings.php:56
+msgid "Current verified Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr ""
+
+#: actions/twittersettings.php:65
+msgid "No spaces, please."
+msgstr ""
+
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr ""
+
+#: actions/twittersettings.php:72
+msgid "Automatically send my notices to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:75
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:78
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+
+#: actions/twittersettings.php:128
+msgid "Could not verify your Twitter credentials!"
+msgstr ""
+
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+msgid "Unable to save your Twitter settings!"
+msgstr ""
+
+#: actions/twittersettings.php:174
+msgid "Twitter settings saved."
+msgstr ""
+
+#: actions/twittersettings.php:192
+msgid "That is not your Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+msgid "Couldn't remove Twitter user."
+msgstr ""
+
+#: actions/twittersettings.php:212
+msgid "Twitter account removed."
+msgstr ""
+
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+msgid "Couldn't save Twitter preferences."
+msgstr ""
+
+#: actions/twittersettings.php:245
+msgid "Twitter preferences saved."
+msgstr ""
+
+#: actions/userauthorization.php:84
+msgid "Please check these details to make sure "
+msgstr ""
+
+#: actions/userauthorization.php:324
+msgid "The subscription has been authorized, but no "
+msgstr ""
+
+#: actions/userauthorization.php:334
+msgid "The subscription has been rejected, but no "
 msgstr ""
 
-#~ msgid "Public"
-#~ msgstr "Публичное "
+#: classes/Channel.php:113
+msgid "Command results"
+msgstr ""
+
+#: classes/Channel.php:148
+msgid "Command complete"
+msgstr ""
+
+#: classes/Channel.php:158
+msgid "Command failed"
+msgstr ""
+
+#: classes/Command.php:39
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: classes/Command.php:96
+#, php-format
+msgid "Subscriptions: %1$s\n"
+msgstr ""
+
+#: classes/Command.php:125 classes/Command.php:242
+msgid "User has no last notice"
+msgstr ""
+
+#: classes/Command.php:146
+msgid "Notice marked as fave."
+msgstr ""
+
+#: classes/Command.php:166
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr ""
+
+#: classes/Command.php:169
+#, php-format
+msgid "Fullname: %s"
+msgstr ""
+
+#: classes/Command.php:172
+#, php-format
+msgid "Location: %s"
+msgstr ""
+
+#: classes/Command.php:175
+#, php-format
+msgid "Homepage: %s"
+msgstr ""
+
+#: classes/Command.php:178
+#, php-format
+msgid "About: %s"
+msgstr ""
+
+#: classes/Command.php:200
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
+
+#: classes/Command.php:214
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
+
+#: classes/Command.php:216
+msgid "Error sending direct message."
+msgstr ""
+
+#: classes/Command.php:263
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: classes/Command.php:270
+#, php-format
+msgid "Subscribed to %s"
+msgstr ""
+
+#: classes/Command.php:288
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
+
+#: classes/Command.php:295
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr ""
+
+#: classes/Command.php:310 classes/Command.php:330
+msgid "Command not yet implemented."
+msgstr ""
+
+#: classes/Command.php:313
+msgid "Notification off."
+msgstr ""
+
+#: classes/Command.php:315
+msgid "Can't turn off notification."
+msgstr ""
+
+#: classes/Command.php:333
+msgid "Notification on."
+msgstr ""
+
+#: classes/Command.php:335
+msgid "Can't turn on notification."
+msgstr ""
+
+#: classes/Command.php:344
+msgid "Commands:\n"
+msgstr ""
+
+#: classes/Message.php:53
+msgid "Could not insert message."
+msgstr ""
+
+#: classes/Message.php:63
+msgid "Could not update message with new URI."
+msgstr ""
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr ""
+
+#: lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:249
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:253
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+msgstr ""
+
+#: lib/mailbox.php:43
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/openid.php:195
+msgid "This form should automatically submit itself. "
+msgstr ""
+
+#: lib/personal.php:65
+msgid "Favorites"
+msgstr ""
+
+#: lib/personal.php:66
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
+#: lib/personal.php:66
+msgid "User"
+msgstr ""
+
+#: lib/personal.php:75
+msgid "Inbox"
+msgstr ""
+
+#: lib/personal.php:76
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personal.php:80
+msgid "Outbox"
+msgstr ""
+
+#: lib/personal.php:81
+msgid "Your sent messages"
+msgstr ""
+
+#: lib/settingsaction.php:99
+msgid "Twitter"
+msgstr ""
+
+#: lib/settingsaction.php:100
+msgid "Twitter integration options"
+msgstr ""
+
+#: lib/util.php:1718
+msgid "To"
+msgstr ""
+
+#: scripts/maildaemon.php:45
+msgid "Could not parse message."
+msgstr ""
diff --git a/locale/sv_SE/LC_MESSAGES/laconica.mo b/locale/sv_SE/LC_MESSAGES/laconica.mo
index 92b763545..0c11e0867 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 581afe20a..0b73e98fa 100644
--- a/locale/sv_SE/LC_MESSAGES/laconica.po
+++ b/locale/sv_SE/LC_MESSAGES/laconica.po
@@ -6,9 +6,20 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-27 14:57-0400\n"
+"POT-Creation-Date: 2008-07-14 21:07+1200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-10-13 21:07+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,64 +32,20 @@ msgstr ""
 msgid " Search Stream for \"%s\""
 msgstr "Sök i strömmen efter \"%s\""
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
 msgid ""
-" except this private data: password, email address, IM address, phone number."
+" except this private data: password, email address, IM address, phone "
+"number."
 msgstr ""
 "förutom det här, som är privat: lösenord, epostadress, IM-adress, "
 "telefonnummer."
 
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-msgid " from "
-msgstr ""
-
-#: ../actions/twitapistatuses.php:478
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/invite.php:168
-#, fuzzy, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s lyssnar nu på dina meddelanden i %2$s."
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-
-#: ../lib/mail.php:124
+#: ../actions/subscribe.php:84
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s lyssnar nu på dina meddelanden i %2$s."
 
-#: ../lib/mail.php:126
+#: ../actions/subscribe.php:86
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -93,154 +60,70 @@ msgstr ""
 "\tHälsningar,\n"
 "%4$s.\n"
 
-#: ../actions/twitapistatuses.php:482
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-
 #: ../actions/shownotice.php:45
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s's status den %2$s"
 
-#: ../actions/invite.php:84 ../actions/invite.php:92
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:60
 #, php-format
 msgid "%s Public Stream"
 msgstr "%s Publik Ström"
 
-#: ../actions/all.php:47 ../actions/allrss.php:60
-#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51
+#: ../actions/all.php:47 ../actions/allrss.php:70 ../lib/stream.php:45
 #, php-format
 msgid "%s and friends"
 msgstr "%s med vänner"
 
-#: ../actions/twitapistatuses.php:49
-#, fuzzy, php-format
-msgid "%s public timeline"
-msgstr "Publik tidslinje"
-
-#: ../lib/mail.php:206
-#, fuzzy, php-format
-msgid "%s status"
-msgstr "%1$s's status den %2$s"
-
-#: ../actions/twitapistatuses.php:338
-#, fuzzy, php-format
-msgid "%s timeline"
-msgstr "Publik tidslinje"
-
-#: ../actions/twitapistatuses.php:52
-#, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:213
-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:233
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** is a microblogging service brought to you by "
+"[%%site.broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
-"**%%site.name%%** är en mikroblogg service för dig ifrån [%%site.broughtby%%]"
-"(%%site.broughtbyurl%%)"
+"**%%site.name%%** är en mikroblogg service för dig ifrån "
+"[%%site.broughtby%%](%%site.broughtbyurl%%)"
 
-#: ../lib/util.php:259
+#: ../lib/util.php:235
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** är en mikroblogg service."
 
-#: ../lib/util.php:274
+#: ../lib/util.php:250
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ". Användarna är tydligt markerade med sitt fulla namn eller smeknamn."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
+#: ../actions/register.php:176
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag"
 
-#: ../actions/register.php:152
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag"
-
-#: ../actions/password.php:42
+#: ../actions/password.php:42 ../actions/register.php:178
 msgid "6 or more characters"
 msgstr "Minst 6 tecken"
 
-#: ../actions/recoverpassword.php:180
+#: ../actions/recoverpassword.php:165
 msgid "6 or more characters, and don't forget it!"
 msgstr "Minst 6 tecken och glöm inte bort det!"
 
-#: ../actions/register.php:154
-#, fuzzy
-msgid "6 or more characters. Required."
-msgstr "Minst 6 tecken"
-
-#: ../actions/imsettings.php:197
+#: ../actions/imsettings.php:188
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+"A confirmation code was sent to the IM address you added. You must approve "
+"%s for sending messages to you."
 msgstr ""
 "En bekräftelsekod har skickats till den IM-adress som du angav. Du måste "
 "godkänna att %s får skicka meddelanden till dig."
 
-#: ../actions/emailsettings.php:213
-#, fuzzy
-msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
-msgstr ""
-"En bekräftelsekod har skickats till den IM-adress som du angav. Du måste "
-"godkänna att %s får skicka meddelanden till dig."
-
-#: ../actions/smssettings.php:216
-#, fuzzy
-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 ""
-"En bekräftelsekod har skickats till den IM-adress som du angav. Du måste "
-"godkänna att %s får skicka meddelanden till dig."
-
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122
-msgid "API method not found!"
-msgstr ""
-
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-msgid "API method under construction."
-msgstr ""
-
-#: ../lib/util.php:324
+#: ../lib/util.php:296
 msgid "About"
 msgstr "Om"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/userauthorization.php:118
 msgid "Accept"
 msgstr "Acceptera"
 
-#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
-#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
 msgid "Add"
 msgstr "Lägg till"
 
@@ -248,25 +131,15 @@ msgstr "Lägg till"
 msgid "Add OpenID"
 msgstr "Lägg till OpenID"
 
-#: ../lib/settingsaction.php:97
-#, fuzzy
-msgid "Add or remove OpenIDs"
-msgstr "Ta bort OpenID"
-
-#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39
+#: ../actions/imsettings.php:39
 msgid "Address"
 msgstr "Adress"
 
-#: ../actions/invite.php:131
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../actions/showstream.php:273
+#: ../actions/showstream.php:254
 msgid "All subscriptions"
 msgstr "Alla prenumerationer"
 
-#: ../actions/publicrss.php:64
+#: ../actions/publicrss.php:62
 #, php-format
 msgid "All updates for %s"
 msgstr "%s alla uppdateringar"
@@ -276,33 +149,24 @@ msgstr "%s alla uppdateringar"
 msgid "All updates matching search term \"%s\""
 msgstr "Alla uppdateringar som matchar söksträngen \"%s\""
 
-#: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
-#: ../actions/openidlogin.php:29 ../actions/register.php:30
+#: ../actions/finishopenidlogin.php:29 ../actions/login.php:27
+#: ../actions/openidlogin.php:29 ../actions/register.php:28
 msgid "Already logged in."
 msgstr "Redan inloggad."
 
-#: ../lib/subs.php:42
+#: ../actions/subscribe.php:48
 msgid "Already subscribed!."
 msgstr "Det finns redan en prenumeration!"
 
-#: ../actions/deletenotice.php:54
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/userauthorization.php:77
+#: ../actions/userauthorization.php:76
 msgid "Authorize subscription"
 msgstr "Tillåt prenumeration."
 
-#: ../actions/login.php:104 ../actions/register.php:178
+#: ../actions/login.php:100 ../actions/register.php:184
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Logga in automatiskt i framtiden; Ej för publika datorer!"
 
-#: ../actions/profilesettings.php:65
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr ""
-
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: ../actions/avatar.php:32
 msgid "Avatar"
 msgstr "Användarbild"
 
@@ -316,51 +180,31 @@ 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 ""
-"Väntar bekräftelse på denna adress. Kontrollera ditt Jabber/GTalk konto för "
-"vidare instruktioner. (La du till %s i din vännerlista?)"
-
-#: ../actions/emailsettings.php:54
-#, fuzzy
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-msgstr ""
-"Väntar bekräftelse på denna adress. Kontrollera ditt Jabber/GTalk konto för "
-"vidare instruktioner. (La du till %s i din vännerlista?)"
+"Väntar bekräftelse på denna adress. Kontrollera ditt Jabber/GTalk konto "
+"för vidare instruktioner. (La du till %s i din vännerlista?)"
 
-#: ../actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
-
-#: ../lib/util.php:1318
+#: ../lib/util.php:1136
 msgid "Before »"
 msgstr "Tidigare »"
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: ../actions/profilesettings.php:52
 msgid "Bio"
 msgstr "Biografi"
 
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103
+#: ../actions/profilesettings.php:93 ../actions/updateprofile.php:102
 msgid "Bio is too long (max 140 chars)."
 msgstr "Biografin är för lång (max 140 tecken)"
 
-#: ../lib/deleteaction.php:41
-#, fuzzy
-msgid "Can't delete this notice."
-msgstr "Kunde inte radera epost bekräftelsen."
-
-#: ../actions/updateprofile.php:119
+#: ../actions/updateprofile.php:118
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Kan inte läsa användarbild URL '%s'"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
+#: ../actions/password.php:85 ../actions/recoverpassword.php:261
 msgid "Can't save new password."
 msgstr "Kan inte spara nya lösenordet."
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62
+#: ../actions/imsettings.php:59
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -368,79 +212,35 @@ msgstr "Avbryt"
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "Kan inte initiera OpenID objekt."
 
-#: ../actions/imsettings.php:163
+#: ../actions/imsettings.php:154
 msgid "Cannot normalize that Jabber ID"
 msgstr "Kan inte normalisera det Jabber ID"
 
-#: ../actions/emailsettings.php:181
-#, fuzzy
-msgid "Cannot normalize that email address"
-msgstr "Kan inte normalisera det Jabber ID"
-
 #: ../actions/password.php:45
 msgid "Change"
 msgstr "Ändra"
 
-#: ../lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
 #: ../actions/password.php:32
 msgid "Change password"
 msgstr "Byt lösenord"
 
-#: ../lib/settingsaction.php:94
-#, fuzzy
-msgid "Change your password"
-msgstr "Byt lösenord"
-
-#: ../lib/settingsaction.php:85
-#, fuzzy
-msgid "Change your profile settings"
-msgstr "Profil inställningar"
-
-#: ../actions/password.php:43 ../actions/recoverpassword.php:181
-#: ../actions/register.php:155 ../actions/smssettings.php:65
+#: ../actions/password.php:43 ../actions/recoverpassword.php:166
+#: ../actions/register.php:179
 msgid "Confirm"
 msgstr "Bekräfta"
 
-#: ../actions/confirmaddress.php:90
+#: ../actions/confirmaddress.php:84
 msgid "Confirm Address"
 msgstr "Bekräfta adress"
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245
+#: ../actions/imsettings.php:213
 msgid "Confirmation cancelled."
 msgstr "Verifikation avbruten"
 
-#: ../actions/smssettings.php:63
-#, fuzzy
-msgid "Confirmation code"
-msgstr "Ingen bekräftelsekod."
-
 #: ../actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr "Verifikation koden finns ej."
 
-#: ../actions/register.php:202
-#, php-format
-msgid ""
-"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."
-msgstr ""
-
 #: ../actions/finishopenidlogin.php:91
 msgid "Connect"
 msgstr "Anslut"
@@ -449,7 +249,7 @@ msgstr "Anslut"
 msgid "Connect existing account"
 msgstr "Anslut till existerande konto"
 
-#: ../lib/util.php:332
+#: ../lib/util.php:304
 msgid "Contact"
 msgstr "Kontakta"
 
@@ -458,67 +258,45 @@ msgstr "Kontakta"
 msgid "Could not create OpenID form: %s"
 msgstr "Kan inte skapa OpenID formulär: %s"
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr ""
-
 #: ../lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Kunde inte skicka vidare till servern: %s"
 
-#: ../actions/updateprofile.php:162
+#: ../actions/updateprofile.php:161
 msgid "Could not save avatar info"
 msgstr "Kunde inte spara informationen om användarbild"
 
-#: ../actions/updateprofile.php:155
+#: ../actions/updateprofile.php:154
 msgid "Could not save new profile info"
 msgstr "Kunde inte spara informationen om den nya profilen"
 
-#: ../lib/subs.php:54
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../lib/subs.php:46
-#, fuzzy
-msgid "Could not subscribe."
-msgstr "Ingen prenumerant!"
-
-#: ../actions/recoverpassword.php:102
-#, fuzzy
-msgid "Could not update user with confirmed email address."
-msgstr "Kunde inte lägga till bekräftelsekoden."
+#: ../actions/profilesettings.php:146
+msgid "Couldn't confirm email."
+msgstr "Kunde inte bekräfta epost"
 
 #: ../actions/finishremotesubscribe.php:99
 msgid "Couldn't convert request tokens to access tokens."
 msgstr "Kunde inte konvertera förfrågan tokens till Access tokens."
 
-#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
-#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#: ../actions/subscribe.php:59
+msgid "Couldn't create subscription."
+msgstr "Kunde inte skapa prenumeration."
+
+#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
 msgid "Couldn't delete email confirmation."
 msgstr "Kunde inte radera epost bekräftelsen."
 
-#: ../lib/subs.php:103
+#: ../actions/unsubscribe.php:56
 msgid "Couldn't delete subscription."
 msgstr "Kunde inte radera prenumerationen. "
 
-#: ../actions/twitapistatuses.php:93
-#, fuzzy
-msgid "Couldn't find any statuses."
-msgstr "Kunde inte uppdatera användare."
-
-#: ../actions/remotesubscribe.php:127
-#, fuzzy
+#: ../actions/remotesubscribe.php:125 ../actions/remotesubscribe.php:127
+#: actions/remotesubscribe.php:136
 msgid "Couldn't get a request token."
 msgstr "Kunde inte få en förfrågan token."
 
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206
+#: ../actions/imsettings.php:178
 msgid "Couldn't insert confirmation code."
 msgstr "Kunde inte lägga till bekräftelsekoden."
 
@@ -526,24 +304,12 @@ msgstr "Kunde inte lägga till bekräftelsekoden."
 msgid "Couldn't insert new subscription."
 msgstr "Kunde inte lägga till ny prenumeration."
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: ../actions/profilesettings.php:175
 msgid "Couldn't save profile."
 msgstr "Kunde inte spara profil."
 
-#: ../actions/profilesettings.php:161
-#, fuzzy
-msgid "Couldn't update user for autosubscribe."
-msgstr "Kunde inte uppdatera användare."
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#, fuzzy
-msgid "Couldn't update user record."
-msgstr "Kunde inte uppdatera användare."
-
-#: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
-#: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
-#: ../actions/imsettings.php:243 ../actions/profilesettings.php:141
-#: ../actions/smssettings.php:157 ../actions/smssettings.php:269
+#: ../actions/confirmaddress.php:70 ../actions/imsettings.php:129
+#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
 msgid "Couldn't update user."
 msgstr "Kunde inte uppdatera användare."
 
@@ -567,84 +333,45 @@ msgstr "Skapar ett nytt konto för OpenID som redan har en användare"
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Aktuell bekräftad Jabber/Gtalk-adress."
 
-#: ../actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:44
-#, fuzzy
-msgid "Current confirmed email address."
-msgstr "Aktuell bekräftad Jabber/Gtalk-adress."
-
-#: ../actions/showstream.php:356
+#: ../actions/showstream.php:337
 msgid "Currently"
 msgstr "Just nu"
 
-#: ../classes/Notice.php:72
-#, fuzzy, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "Databasfel för svar: %s"
-
-#: ../lib/util.php:1061
+#: ../lib/util.php:893
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Databasfel för svar: %s"
 
-#: ../actions/deletenotice.php:41
-#, fuzzy
-msgid "Delete notice"
-msgstr "Nytt inlägg"
-
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: ../actions/profilesettings.php:54
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Berätta om dig själv och dina intressen inom 140 tecken"
 
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87
+#: ../actions/register.php:181
 msgid "Email"
 msgstr "Epost"
 
-#: ../actions/emailsettings.php:59
-#, fuzzy
-msgid "Email Address"
+#: ../actions/profilesettings.php:46
+msgid "Email address"
 msgstr "Epostadress"
 
-#: ../actions/emailsettings.php:32
-#, fuzzy
-msgid "Email Settings"
-msgstr "Inställningar"
-
-#: ../actions/register.php:73
+#: ../actions/profilesettings.php:102 ../actions/register.php:63
 msgid "Email address already exists."
 msgstr "Epostadressen finns redan."
 
-#: ../lib/mail.php:90
+#: ../lib/mail.php:82
 msgid "Email address confirmation"
 msgstr "Bekräfta epostadress"
 
-#: ../actions/emailsettings.php:61
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/invite.php:129
-#, fuzzy
-msgid "Email addresses"
-msgstr "Epostadress"
-
-#: ../actions/recoverpassword.php:191
+#: ../actions/recoverpassword.php:176
 msgid "Enter a nickname or email address."
 msgstr "Skriv in ett smeknamn eller en epostadress."
 
-#: ../actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/userauthorization.php:137
-#, fuzzy
+#: ../actions/userauthorization.php:136 ../actions/userauthorization.php:137
+#: actions/userauthorization.php:144
 msgid "Error authorizing token"
 msgstr "Felaktig bekräftelse av token"
 
-#: ../actions/finishopenidlogin.php:253
+#: ../actions/finishopenidlogin.php:282
 msgid "Error connecting user to OpenID."
 msgstr "Lyckades inte ansluta användaren till OpenID."
 
@@ -660,19 +387,23 @@ msgstr "Fel uppstog när användarbild skulle läggas till"
 msgid "Error inserting new profile"
 msgstr "Fel uppstog när nya profilen skulle läggas till"
 
+#: ../actions/postnotice.php:88
+msgid "Error inserting notice"
+msgstr "Fel uppstog när inlägget skulle läggas till"
+
 #: ../actions/finishremotesubscribe.php:167
 msgid "Error inserting remote profile"
 msgstr "Fel uppstog när fjärrprofilen skulle läggas till"
 
-#: ../actions/recoverpassword.php:240
+#: ../actions/recoverpassword.php:201
 msgid "Error saving address confirmation."
 msgstr "Fel uppstog när adressen skulle bekräftas."
 
-#: ../actions/userauthorization.php:140
+#: ../actions/userauthorization.php:139
 msgid "Error saving remote profile"
 msgstr "Fel uppstog när fjärrprofil skulle sparas"
 
-#: ../lib/openid.php:226
+#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
 msgid "Error saving the profile."
 msgstr "Fel uppstog när profilen skulle sparas."
 
@@ -684,8 +415,8 @@ msgstr "Fel uppstog när användaren skulle sparas."
 msgid "Error saving user; invalid."
 msgstr "Fel uppstog när användare skulle sparas."
 
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
+#: ../actions/login.php:43 ../actions/login.php:69
+#: ../actions/recoverpassword.php:268 ../actions/register.php:73
 msgid "Error setting user."
 msgstr "Fel uppstog i användarens inställning"
 
@@ -697,7 +428,7 @@ msgstr "Fel uppstog vid uppdatering av profilen"
 msgid "Error updating remote profile"
 msgstr "Fel uppstog under uppdatering av fjärranvändare"
 
-#: ../actions/recoverpassword.php:80
+#: ../actions/recoverpassword.php:79
 msgid "Error with confirmation code."
 msgstr "Fel uppstog med bekräftelsekoden."
 
@@ -705,7 +436,7 @@ msgstr "Fel uppstog med bekräftelsekoden."
 msgid "Existing nickname"
 msgstr "Nuvarande smeknamn"
 
-#: ../lib/util.php:326
+#: ../lib/util.php:298
 msgid "FAQ"
 msgstr "Frågor & svar"
 
@@ -713,71 +444,49 @@ msgstr "Frågor & svar"
 msgid "Failed updating avatar."
 msgstr "Uppdatering av profilbild misslyckades."
 
-#: ../actions/all.php:61 ../actions/allrss.php:64
+#: ../actions/all.php:61 ../actions/allrss.php:74
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "Flöden för $s vänner"
 
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: ../actions/replies.php:61 ../actions/repliesrss.php:80
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Flöde för svar till %s"
 
-#: ../actions/tag.php:55
-#, fuzzy, php-format
-msgid "Feed for tag %s"
-msgstr "Flöde för svar till %s"
-
-#: ../lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/login.php:122
+#: ../actions/login.php:118
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
-"Av säkerhetsskäl, var vänlig skriv in ditt användarnamn och lösenord innan "
-"du ändrar dina inställningar."
+"Av säkerhetsskäl, var vänlig skriv in ditt användarnamn och lösenord "
+"innan du ändrar dina inställningar."
 
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: ../actions/profilesettings.php:44
 msgid "Full name"
 msgstr "Ditt fulla namn."
 
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93
+#: ../actions/profilesettings.php:90 ../actions/updateprofile.php:92
 msgid "Full name is too long (max 255 chars)."
 msgstr "Ditt namn är för långt (max 255 tecken)."
 
-#: ../lib/util.php:322
+#: ../lib/util.php:279
 msgid "Help"
 msgstr "Hjälp"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:274
 msgid "Home"
 msgstr "Hem"
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: ../actions/profilesettings.php:49
 msgid "Homepage"
 msgstr "Hemsida"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: ../actions/profilesettings.php:87
 msgid "Homepage is not a valid URL."
 msgstr "Hemsidan har ingen giltig URL"
 
-#: ../actions/emailsettings.php:91
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102
-msgid "IM"
-msgstr ""
-
-#: ../actions/imsettings.php:60
+#: ../actions/imsettings.php:61
 msgid "IM Address"
 msgstr "IM adress"
 
@@ -790,67 +499,52 @@ msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
 msgstr ""
-"Om du redan har ett konto, logga in med ditt användarnamn och lösenord för "
-"att koppla det till ditt OpenID"
+"Om du redan har ett konto, logga in med ditt användarnamn och lösenord "
+"för att koppla det till ditt 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 ""
-"Om du vill lägga till OpenID till ditt konto, fyll i fältet nedan och tryck "
-"på \"Add\""
+"Om du vill lägga till OpenID till ditt konto, fyll i fältet nedan och "
+"tryck på \"Add\""
 
-#: ../actions/recoverpassword.php:137
-#, fuzzy
+#: ../actions/recoverpassword.php:122
 msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
+"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 ""
 "Om du har förlorat eller glömt bort ditt lösenord så kan du få ett nytt "
 "skickat till din epost, kopplat till ditt konto."
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283
-#, fuzzy
-msgid "Incoming email address removed."
-msgstr "Adressen är borttagen."
-
 #: ../actions/password.php:69
 msgid "Incorrect old password"
 msgstr "Felaktigt, gammalt lösenord"
 
-#: ../actions/login.php:67
+#: ../actions/login.php:63
 msgid "Incorrect username or password."
 msgstr "Felaktigt användarnamn eller lösenord."
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:226
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
-"Instruktioner om hur du återställer ditt lösenord har sänts till din e-"
-"postadress "
+"Instruktioner om hur du återställer ditt lösenord har sänts till din "
+"e-postadress "
 
-#: ../actions/updateprofile.php:114
+#: ../actions/updateprofile.php:113
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "Ogiltig användarbild URL '%s'"
 
-#: ../actions/invite.php:55
-#, fuzzy, php-format
-msgid "Invalid email address: %s"
-msgstr "Det är ingen giltig epost adress."
-
-#: ../actions/updateprofile.php:98
+#: ../actions/updateprofile.php:97
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "Ogiltig hemsideadress '%s'"
 
-#: ../actions/updateprofile.php:82
+#: ../actions/updateprofile.php:81
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "Ogiltig licens URL '%s'"
@@ -867,7 +561,7 @@ msgstr "Ogiltig inlägg uri"
 msgid "Invalid notice url"
 msgstr "Ogiltig inlägg url"
 
-#: ../actions/updateprofile.php:87
+#: ../actions/updateprofile.php:86
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "Ogiltig profil URL '%s' "
@@ -884,43 +578,27 @@ msgstr "Felaktig profil URL skickades åter av servern."
 msgid "Invalid size."
 msgstr "Felaktig storlek"
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111
+#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
+#: ../actions/register.php:84
 msgid "Invalid username or password."
 msgstr "Felaktigt användarnamn eller lösenord."
 
-#: ../actions/invite.php:79
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123
-msgid "Invite new users"
-msgstr ""
-
-#: ../lib/util.php:261
+#: ../lib/util.php:237
 #, 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)."
+"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 ""
-"Det drivs med [Laconica](http://laconi.ca/) mikroblogging software, version %"
-"s, tillgängligt under [GNU Affero General Public License](http://www.fsf.org/"
-"licensing/licenses/agpl-3.0.html)."
+"Det drivs med [Laconica](http://laconi.ca/) mikroblogging software, version "
+"%s, tillgängligt under [GNU Affero General Public "
+"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#: ../actions/imsettings.php:173
+#: ../actions/imsettings.php:164
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID används redan utav en annan användare."
 
-#: ../actions/imsettings.php:62
+#: ../actions/imsettings.php:63
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -929,26 +607,16 @@ msgstr ""
 "Jabber eller GTalk adress liknande \"användare@exempel.se\". Först se till "
 "att lägga till %s i din vännerlista i IM klienten eller GTalk."
 
-#: ../actions/profilesettings.php:57
-msgid "Language"
-msgstr ""
-
-#: ../actions/profilesettings.php:113
-#, fuzzy
-msgid "Language is too long (max 50 chars)."
-msgstr "Platse är för lång (max 255 tecken)."
-
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: ../actions/profilesettings.php:55
 msgid "Location"
 msgstr "Plats"
 
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108
+#: ../actions/profilesettings.php:96 ../actions/updateprofile.php:107
 msgid "Location is too long (max 255 chars)."
 msgstr "Platse är för lång (max 255 tecken)."
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310
+#: ../actions/login.php:93 ../actions/login.php:102
+#: ../actions/openidlogin.php:68 ../lib/util.php:286
 msgid "Login"
 msgstr "Logga in"
 
@@ -957,39 +625,26 @@ msgstr "Logga in"
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Logga in med ett [OpenID](%%doc.openid%%) konto."
 
-#: ../actions/login.php:126
+#: ../actions/login.php:122
 #, 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%"
-"%). "
+"Login with your username and password. Don't have a username yet? "
+"[Register](%%action.register%%) a new account, or try "
+"[OpenID](%%action.openidlogin%%). "
 msgstr ""
-"Logga in med ditt användarnamn och lösenord. Har du inget användarnamn ännu? "
-"[Registrera](%%action.register%%) ett nytt konto, eller testa [OpenID](%%"
-"action.openidlogin%%)."
+"Logga in med ditt användarnamn och lösenord. Har du inget användarnamn "
+"ännu? [Registrera](%%action.register%%) ett nytt konto, eller testa "
+"[OpenID](%%action.openidlogin%%)."
 
-#: ../lib/util.php:308
+#: ../lib/util.php:284
 msgid "Logout"
 msgstr "Logga ut"
 
-#: ../actions/register.php:166
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
-
-#: ../actions/login.php:110
+#: ../actions/login.php:106
 msgid "Lost or forgotten password?"
 msgstr "Glömt bort lösenord?"
 
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr ""
-
-#: ../actions/showstream.php:300
+#: ../actions/showstream.php:281
 msgid "Member since"
 msgstr "Medlem sedan"
 
@@ -998,62 +653,42 @@ msgstr "Medlem sedan"
 msgid "Microblog by %s"
 msgstr "Mikroblogg av %s"
 
-#: ../actions/smssettings.php:304
-#, php-format
-msgid ""
-"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
-"email but isn't listed here, send email to let us know at %s."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
 msgid "My text and files are available under "
 msgstr "Min text och filer finns tillgängliga under"
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-msgid "New"
-msgstr ""
-
-#: ../lib/mail.php:144
-#, fuzzy, php-format
-msgid "New email address for posting to %s"
-msgstr "Ingen registrerad epost adress för den användaren."
-
-#: ../actions/emailsettings.php:297
-#, fuzzy
-msgid "New incoming email address added."
-msgstr "Det är ingen giltig epost adress."
-
 #: ../actions/finishopenidlogin.php:71
 msgid "New nickname"
 msgstr "Nytt användarnamn"
 
-#: ../actions/newnotice.php:87
+#: ../actions/newnotice.php:100
 msgid "New notice"
 msgstr "Nytt inlägg"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
+#: ../actions/password.php:41 ../actions/recoverpassword.php:164
 msgid "New password"
 msgstr "Nytt lösenord"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:275
 msgid "New password successfully saved. You are now logged in."
 msgstr "Nya lösenordet har blivit sparat. Du är nu även inloggad."
 
-#: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151
+#: ../actions/login.php:97 ../actions/profilesettings.php:41
+#: ../actions/register.php:175
 msgid "Nickname"
 msgstr "Smeknamn"
 
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69
+#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:99
+#: ../actions/register.php:59
 msgid "Nickname already in use. Try another one."
 msgstr "Användarnamnet används redan, försök med ett annat."
 
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:67 ../actions/updateprofile.php:77
+#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:80
+#: ../actions/register.php:57 ../actions/updateprofile.php:76
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
-"Smeknamnet får endast innehålla små bokstäver eller siffror, inga mellanslag."
+"Smeknamnet får endast innehålla små bokstäver eller siffror, inga "
+"mellanslag."
 
 #: ../actions/finishopenidlogin.php:170
 msgid "Nickname not allowed."
@@ -1063,53 +698,30 @@ msgstr "Inget giltigt smeknamn."
 msgid "Nickname of the user you want to follow"
 msgstr "Smeknamnet på användaren du vill följa"
 
-#: ../actions/recoverpassword.php:162
+#: ../actions/recoverpassword.php:147
 msgid "Nickname or email"
 msgstr "Smeknamn eller epost"
 
-#: ../actions/deletenotice.php:59
-msgid "No"
-msgstr ""
-
-#: ../actions/imsettings.php:156
+#: ../actions/imsettings.php:147
 msgid "No Jabber ID."
 msgstr "Inget Jabber ID."
 
-#: ../actions/userauthorization.php:129
+#: ../actions/userauthorization.php:128
 msgid "No authorization request!"
 msgstr "Ingen rättighet förfrågan!"
 
-#: ../actions/smssettings.php:181
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316
-#, fuzzy
-msgid "No code entered"
-msgstr "Inget innehåll!"
-
 #: ../actions/confirmaddress.php:33
 msgid "No confirmation code."
 msgstr "Ingen bekräftelsekod."
 
-#: ../actions/newnotice.php:44
+#: ../actions/newnotice.php:49
 msgid "No content!"
 msgstr "Inget innehåll!"
 
-#: ../actions/emailsettings.php:174
-#, fuzzy
-msgid "No email address."
-msgstr "Epostadress"
-
-#: ../actions/userbyid.php:32
+#: ../actions/userbyid.php:27
 msgid "No id."
 msgstr "Inget id."
 
-#: ../actions/emailsettings.php:271
-#, fuzzy
-msgid "No incoming email address."
-msgstr "Det är ingen giltig epost adress."
-
 #: ../actions/finishremotesubscribe.php:65
 msgid "No nickname provided by remote server."
 msgstr "Inget smeknamn lämnades ut av fjärrservern."
@@ -1118,25 +730,19 @@ msgstr "Inget smeknamn lämnades ut av fjärrservern."
 msgid "No nickname."
 msgstr "Inget användarnamn"
 
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229
+#: ../actions/imsettings.php:197
 msgid "No pending confirmation to cancel."
 msgstr "Ingen väntande bekräftelse att avbryta."
 
-#: ../actions/smssettings.php:176
-#, fuzzy
-msgid "No phone number."
-msgstr "Ingen sådan användare"
-
 #: ../actions/finishremotesubscribe.php:72
 msgid "No profile URL returned by server."
 msgstr "Ingen profil URL lämnades ut av servern."
 
-#: ../actions/recoverpassword.php:226
+#: ../actions/recoverpassword.php:189
 msgid "No registered email address for that user."
 msgstr "Ingen registrerad epost adress för den användaren."
 
-#: ../actions/userauthorization.php:49
+#: ../actions/userauthorization.php:48
 msgid "No request found!"
 msgstr "Ingen begäran funnen!"
 
@@ -1148,14 +754,6 @@ msgstr "Inget resultat"
 msgid "No size."
 msgstr "Ingen storlek"
 
-#: ../actions/twitapistatuses.php:595
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555
-msgid "No status with that ID found."
-msgstr ""
-
 #: ../actions/openidsettings.php:135
 msgid "No such OpenID."
 msgstr "Det existerar inget sådant OpenID"
@@ -1164,8 +762,7 @@ msgstr "Det existerar inget sådant OpenID"
 msgid "No such document."
 msgstr "Inget sådant dokument."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30
+#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
 msgid "No such notice."
 msgstr "Inget sådant inlägg."
 
@@ -1178,21 +775,16 @@ msgid "No such subscription"
 msgstr "Ingen sådan prenumeration"
 
 #: ../actions/all.php:34 ../actions/allrss.php:35
-#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
-#: ../actions/remotesubscribe.php:84 ../actions/remotesubscribe.php:91
-#: ../actions/replies.php:57 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:110 ../actions/userbyid.php:36
-#: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
-#: ../lib/subs.php:33 ../lib/subs.php:82
+#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:36
+#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
+#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
+#: ../actions/showstream.php:95 ../actions/subscribe.php:43
+#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
+#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
 msgid "No such user."
 msgstr "Ingen sådan användare"
 
-#: ../actions/recoverpassword.php:211
-#, fuzzy
-msgid "No user with that email address or username."
-msgstr "Ingen registrerad epost adress för den användaren."
-
-#: ../lib/gallery.php:80
+#: ../lib/gallery.php:76
 msgid "Nobody to show!"
 msgstr "Finns inget att visa!"
 
@@ -1200,18 +792,7 @@ msgstr "Finns inget att visa!"
 msgid "Not a recovery code."
 msgstr "Det är ingen kod för återställning."
 
-#: ../scripts/maildaemon.php:50
-#, fuzzy
-msgid "Not a registered user."
-msgstr "Det är ingen kod för återställning."
-
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332
-#, fuzzy
-msgid "Not a supported data format."
-msgstr "Bildfilens format stödjs inte."
-
-#: ../actions/imsettings.php:167
+#: ../actions/imsettings.php:158
 msgid "Not a valid Jabber ID"
 msgstr "Det är inget giltigt Jabber ID"
 
@@ -1219,24 +800,19 @@ msgstr "Det är inget giltigt Jabber ID"
 msgid "Not a valid OpenID."
 msgstr "Det är inget giltigt OpenID."
 
-#: ../actions/emailsettings.php:185
-#, fuzzy
-msgid "Not a valid email address"
-msgstr "Det är ingen giltig epost adress."
-
-#: ../actions/register.php:63
+#: ../actions/profilesettings.php:75 ../actions/register.php:53
 msgid "Not a valid email address."
 msgstr "Det är ingen giltig epost adress."
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
+#: ../actions/profilesettings.php:83 ../actions/register.php:61
 msgid "Not a valid nickname."
 msgstr "Det är inget giltigt användarnamn."
 
-#: ../actions/remotesubscribe.php:120
+#: ../actions/remotesubscribe.php:118
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "Det är ingen giltig profil URL (felaktig service)."
 
-#: ../actions/remotesubscribe.php:113
+#: ../actions/remotesubscribe.php:111
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "Det är ingen giltig profil URL (ingen XRDS angiven)."
 
@@ -1256,27 +832,16 @@ msgstr "Inte tillstånd ännu."
 msgid "Not expecting this response!"
 msgstr "Väntade mig inte detta svar!"
 
-#: ../actions/twitapistatuses.php:422
-#, fuzzy
-msgid "Not found"
-msgstr "Ingen begäran funnen!"
-
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:28
-#: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
-#: ../lib/settingsaction.php:27
+#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
+#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
+#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
 msgid "Not logged in."
 msgstr "Inte inloggad."
 
-#: ../lib/subs.php:91
+#: ../actions/unsubscribe.php:43
 msgid "Not subscribed!."
 msgstr "Ingen prenumerant!"
 
-#: ../actions/opensearch.php:35
-#, fuzzy
-msgid "Notice Search"
-msgstr "Sök"
-
 #: ../actions/showstream.php:82
 #, php-format
 msgid "Notice feed for %s"
@@ -1286,20 +851,15 @@ msgstr "Inlägg flöde för %s"
 msgid "Notice has no profile"
 msgstr "Inlägget har ingen profil"
 
-#: ../actions/showstream.php:316
+#: ../actions/showstream.php:297
 msgid "Notices"
 msgstr "Inlägg"
 
-#: ../actions/tag.php:35 ../actions/tag.php:81
-#, fuzzy, php-format
-msgid "Notices tagged with %s"
-msgstr "Inlägg flöde för %s"
-
 #: ../actions/password.php:39
 msgid "Old password"
 msgstr "Gammalt lösenord"
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314
+#: ../lib/util.php:288
 msgid "OpenID"
 msgstr "OpenID"
 
@@ -1342,68 +902,44 @@ msgstr "OpenID borttagen."
 msgid "OpenID settings"
 msgstr "OpenID inställningar"
 
-#: ../actions/invite.php:135
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
 #: ../actions/avatar.php:84
 msgid "Partial upload."
 msgstr "Bitvis uppladdad."
 
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
-#: ../actions/register.php:153 ../lib/settingsaction.php:93
+#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
+#: ../actions/register.php:177
 msgid "Password"
 msgstr "Lösenord"
 
-#: ../actions/recoverpassword.php:288
+#: ../actions/recoverpassword.php:249
 msgid "Password and confirmation do not match."
 msgstr "Lösenord och bekräftelse matchar inte."
 
-#: ../actions/recoverpassword.php:284
+#: ../actions/recoverpassword.php:245
 msgid "Password must be 6 chars or more."
 msgstr "Lösenordet måste vara 6 tecken eller fler."
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
 msgid "Password recovery requested"
 msgstr "Förfrågan om återställning av lösenord"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: ../actions/password.php:89 ../actions/recoverpassword.php:274
 msgid "Password saved."
 msgstr "Lösenord är sparat."
 
-#: ../actions/password.php:61 ../actions/register.php:88
+#: ../actions/password.php:61 ../actions/register.php:65
 msgid "Passwords don't match."
 msgstr "Lösenorden matchar inte."
 
-#: ../lib/searchaction.php:100
-#, fuzzy
-msgid "People"
-msgstr "Sökning personer"
-
-#: ../actions/opensearch.php:33
-#, fuzzy
-msgid "People Search"
-msgstr "Sökning personer"
-
 #: ../actions/peoplesearch.php:33
 msgid "People search"
 msgstr "Sökning personer"
 
-#: ../lib/stream.php:50
+#: ../lib/stream.php:44
 msgid "Personal"
 msgstr "Personlig"
 
-#: ../actions/invite.php:133
-#, fuzzy
-msgid "Personal message"
-msgstr "Personlig"
-
-#: ../actions/smssettings.php:69
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag"
-
-#: ../actions/userauthorization.php:78
+#: ../actions/userauthorization.php:77
 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, "
@@ -1413,35 +949,27 @@ msgstr ""
 "prenumerera på denna användares inlägg. Om du inte frågade efter att "
 "prenumerera på någons inlägg, klicka på \"Cancel\""
 
-#: ../actions/imsettings.php:73
+#: ../actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Posta ett inlägg när min Jabber/GTalk status ändras."
 
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94
+#: ../actions/imsettings.php:68
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163
+#: ../actions/imsettings.php:135
 msgid "Preferences saved."
 msgstr "Inställningar sparade."
 
-#: ../actions/profilesettings.php:57
-#, fuzzy
-msgid "Preferred language"
-msgstr "Inställningar"
-
-#: ../lib/util.php:328
-#, fuzzy
+#: ../lib/util.php:300 ../lib/util.php:328 lib/util.php:344
 msgid "Privacy"
-msgstr "Privacy"
+msgstr "Sekretesspolicy"
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106
+#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
 msgid "Problem saving notice."
 msgstr "Det var ett problem när inlägget sparades."
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60
+#: ../lib/stream.php:54
 msgid "Profile"
 msgstr "Profil"
 
@@ -1453,10 +981,14 @@ msgstr "Profil URL"
 msgid "Profile settings"
 msgstr "Profil inställningar"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
 msgid "Profile unknown"
 msgstr "Okänd profil"
 
+#: ../lib/util.php:276
+msgid "Public"
+msgstr "Publik"
+
 #: ../actions/public.php:54
 msgid "Public Stream Feed"
 msgstr "Publik ström"
@@ -1465,25 +997,11 @@ msgstr "Publik ström"
 msgid "Public timeline"
 msgstr "Publik tidslinje"
 
-#: ../actions/imsettings.php:79
-#, fuzzy
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Aktuell bekräftad Jabber/Gtalk-adress."
-
-#: ../actions/emailsettings.php:94
-#, fuzzy
-msgid "Publish a MicroID for my email address."
-msgstr "Skriv in ett smeknamn eller en epostadress."
-
-#: ../actions/tag.php:75 ../actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
-
-#: ../actions/recoverpassword.php:166
+#: ../actions/recoverpassword.php:151
 msgid "Recover"
 msgstr "Återställ"
 
-#: ../actions/recoverpassword.php:156
+#: ../actions/recoverpassword.php:141
 msgid "Recover password"
 msgstr "Återställ lösenord"
 
@@ -1491,28 +1009,19 @@ msgstr "Återställ lösenord"
 msgid "Recovery code for unknown user."
 msgstr "Kod för återställning av okänd användare."
 
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: ../actions/register.php:171 ../actions/register.php:195 ../lib/util.php:287
 msgid "Register"
 msgstr "Registrera"
 
-#: ../actions/register.php:28
-#, fuzzy
-msgid "Registration not allowed."
-msgstr "Inget giltigt smeknamn."
-
-#: ../actions/register.php:200
-msgid "Registration successful"
-msgstr ""
-
-#: ../actions/userauthorization.php:120
+#: ../actions/userauthorization.php:119
 msgid "Reject"
 msgstr "Avvisa"
 
-#: ../actions/login.php:103 ../actions/register.php:176
+#: ../actions/login.php:99 ../actions/register.php:183
 msgid "Remember me"
 msgstr "Kom ihåg mig"
 
-#: ../actions/updateprofile.php:70
+#: ../actions/updateprofile.php:69
 msgid "Remote profile with no matching profile"
 msgstr "Fjärrprofil utan motsvarande profil"
 
@@ -1520,9 +1029,7 @@ msgstr "Fjärrprofil utan motsvarande profil"
 msgid "Remote subscribe"
 msgstr "Fjärrprenumerera"
 
-#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
-#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
 msgid "Remove"
 msgstr "Ta bort"
 
@@ -1535,59 +1042,35 @@ msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 msgstr ""
-"Tar du bort din OpenID så gör du det omöjligt att logga in! Om du behöver ta "
-"bort den, lägg till en annan OpenID först."
+"Tar du bort din OpenID så gör du det omöjligt att logga in! Om du "
+"behöver ta bort den, lägg till en annan OpenID först."
 
-#: ../lib/stream.php:55
+#: ../lib/stream.php:49
 msgid "Replies"
 msgstr "Svar"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
 #, php-format
 msgid "Replies to %s"
 msgstr "Svarat på %s"
 
-#: ../actions/recoverpassword.php:183
+#: ../actions/recoverpassword.php:168
 msgid "Reset"
 msgstr "Återställ"
 
-#: ../actions/recoverpassword.php:173
+#: ../actions/recoverpassword.php:158
 msgid "Reset password"
 msgstr "Återställ lösenord"
 
-#: ../lib/settingsaction.php:99
-msgid "SMS"
-msgstr ""
-
-#: ../actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
-
-#: ../actions/smssettings.php:33
-#, fuzzy
-msgid "SMS Settings"
-msgstr "IM inställningar"
-
-#: ../lib/mail.php:219
-#, fuzzy
-msgid "SMS confirmation"
-msgstr "Ingen bekräftelsekod."
-
-#: ../actions/recoverpassword.php:182
+#: ../actions/recoverpassword.php:167 ../actions/register.php:180
 msgid "Same as password above"
 msgstr "Samma som lösenordet ovan"
 
-#: ../actions/register.php:156
-#, fuzzy
-msgid "Same as password above. Required."
-msgstr "Samma som lösenordet ovan"
-
-#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
-#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
+#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
 msgid "Save"
 msgstr "Spara"
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300
+#: ../lib/searchaction.php:73 ../lib/util.php:277
 msgid "Search"
 msgstr "Sök"
 
@@ -1610,53 +1093,26 @@ 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 ""
-"Sök efter personer på %%site.name%% efter deras namn, plats eller intressen. "
-"Skilj söktermerna åt med mellanslag; de måste vara minst tre tecken långa. "
-
-#: ../actions/smssettings.php:296
-msgid "Select a carrier"
-msgstr ""
+"Sök efter personer på %%site.name%% efter deras namn, plats eller "
+"intressen. Skilj söktermerna åt med mellanslag; de måste vara minst tre "
+"tecken långa. "
 
-#: ../actions/invite.php:137 ../lib/util.php:1172
+#: ../lib/util.php:982
 msgid "Send"
 msgstr "Skicka"
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
-msgstr ""
-
-#: ../actions/emailsettings.php:88
-#, fuzzy
-msgid "Send me notices of new subscriptions through email."
-msgstr "Skicka inlägg till mig via Jabber/GTalk."
-
-#: ../actions/imsettings.php:70
+#: ../actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Skicka inlägg till mig via Jabber/GTalk."
 
-#: ../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
-#, fuzzy
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr "Skicka inlägg till mig via Jabber/GTalk."
-
-#: ../lib/util.php:304
+#: ../lib/util.php:282
 msgid "Settings"
 msgstr "Inställningar"
 
-#: ../actions/profilesettings.php:192
+#: ../actions/profilesettings.php:183
 msgid "Settings saved."
 msgstr "Inställningar sparade."
 
-#: ../actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
 #: ../actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr "Någon annan använder redan denna OpenID."
@@ -1665,45 +1121,36 @@ msgstr "Någon annan använder redan denna OpenID."
 msgid "Something weird happened."
 msgstr "Någonting konstigt inträffade."
 
-#: ../scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54
-#, fuzzy
-msgid "Sorry, that is not your incoming email address."
-msgstr "Det är fel IM adress."
-
-#: ../lib/util.php:330
+#: ../lib/util.php:302
 msgid "Source"
 msgstr "Källa"
 
-#: ../actions/showstream.php:296
+#: ../actions/showstream.php:277
 msgid "Statistics"
 msgstr "Statistik"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
 msgid "Stored OpenID not found."
 msgstr "Sparade OpenID kunde inte hittas."
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197
+#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
+#: ../actions/showstream.php:181
 msgid "Subscribe"
 msgstr "Prenumerera"
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: ../actions/showstream.php:294 ../actions/subscribers.php:27
 msgid "Subscribers"
-msgstr "Prenumeranter"
+msgstr "Prenumerant"
 
-#: ../actions/userauthorization.php:310
+#: ../actions/userauthorization.php:309
 msgid "Subscription authorized"
 msgstr "Prenumeration accepterad"
 
-#: ../actions/userauthorization.php:320
+#: ../actions/userauthorization.php:319
 msgid "Subscription rejected"
 msgstr "Prenumeration avvisad"
 
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
+#: ../actions/showstream.php:212 ../actions/showstream.php:288
 #: ../actions/subscriptions.php:27
 msgid "Subscriptions"
 msgstr "Prenumerationer"
@@ -1712,14 +1159,6 @@ msgstr "Prenumerationer"
 msgid "System error uploading file."
 msgstr "Systemfel när filen laddades upp."
 
-#: ../actions/tag.php:41 ../lib/util.php:301
-msgid "Tags"
-msgstr ""
-
-#: ../lib/searchaction.php:104
-msgid "Text"
-msgstr ""
-
 #: ../actions/noticesearch.php:34
 msgid "Text search"
 msgstr "Text sökning"
@@ -1736,78 +1175,36 @@ msgstr "Den adressen har redan blivit bekräftad en gång."
 msgid "That confirmation code is not for you!"
 msgstr "Den bekräftelsekoden är inte för dig!"
 
-#: ../actions/emailsettings.php:191
-#, fuzzy
-msgid "That email address already belongs to another user."
-msgstr "Jabber ID används redan utav en annan användare."
-
 #: ../actions/avatar.php:80
 msgid "That file is too big."
 msgstr "Filen är för stor."
 
-#: ../actions/imsettings.php:170
+#: ../actions/imsettings.php:161
 msgid "That is already your Jabber ID."
 msgstr "Det är redan din Jabber ID."
 
-#: ../actions/emailsettings.php:188
-#, fuzzy
-msgid "That is already your email address."
-msgstr "Det är redan din Jabber ID."
-
-#: ../actions/smssettings.php:188
-#, fuzzy
-msgid "That is already your phone number."
-msgstr "Det är redan din Jabber ID."
-
-#: ../actions/imsettings.php:233
+#: ../actions/imsettings.php:224
 msgid "That is not your Jabber ID."
 msgstr "Det är inte ditt Jabber ID."
 
-#: ../actions/emailsettings.php:249
-#, fuzzy
-msgid "That is not your email address."
-msgstr "Det är fel IM adress."
-
-#: ../actions/smssettings.php:257
-#, fuzzy
-msgid "That is not your phone number."
-msgstr "Det är inte ditt Jabber ID."
-
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
+#: ../actions/imsettings.php:201
 msgid "That is the wrong IM address."
 msgstr "Det är fel IM adress."
 
-#: ../actions/smssettings.php:233
-#, fuzzy
-msgid "That is the wrong confirmation number."
-msgstr "Det är fel IM adress."
-
-#: ../actions/smssettings.php:191
-#, fuzzy
-msgid "That phone number already belongs to another user."
-msgstr "Jabber ID används redan utav en annan användare."
-
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: ../actions/newnotice.php:52
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "För långt. Maximalt 140 tecken"
 
-#: ../actions/twitapiaccount.php:74
-#, fuzzy
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "För långt. Maximalt 140 tecken"
-
-#: ../actions/confirmaddress.php:92
+#: ../actions/confirmaddress.php:86
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Adressen \"%s\" har blivit bekräftad för ditt konto."
 
-#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274
+#: ../actions/imsettings.php:241
 msgid "The address was removed."
 msgstr "Adressen är borttagen."
 
-#: ../actions/userauthorization.php:312
-#, fuzzy
+#: ../actions/userauthorization.php:311 ../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 "
@@ -1817,8 +1214,7 @@ msgstr ""
 "med sidans instruktioner hur du bekräftar en prenumeration. Din "
 "prenumerering token är:"
 
-#: ../actions/userauthorization.php:322
-#, fuzzy
+#: ../actions/userauthorization.php:321 ../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 "
@@ -1845,12 +1241,7 @@ msgstr "Detta är personer och inlägg som %s lyssnar på."
 msgid "These are the people whose notices you listen to."
 msgstr "Detta är personer och inlägg som du lyssnar på."
 
-#: ../actions/invite.php:89
-msgid ""
-"These people are already users and you were automatically subscribed to them:"
-msgstr ""
-
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:87
 msgid "This confirmation code is too old. Please start again."
 msgstr "Denna bekräftelsekod är för gammal. Du får starta om på nytt igen."
 
@@ -1859,8 +1250,8 @@ msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr ""
-"Detta formulär skall automatiskt skicka själv. Om den inte gör det, klicka "
-"på skicka för att gå dit där du skapade ditt OpenID."
+"Detta formulär skall automatiskt skicka själv. Om den inte gör det, "
+"klicka på skicka för att gå dit där du skapade ditt OpenID."
 
 #: ../actions/finishopenidlogin.php:56
 #, php-format
@@ -1869,48 +1260,28 @@ msgid ""
 "to a local account. You can either create a new account, or connect with "
 "your existing account, if you have one."
 msgstr ""
-"Detta är första gången du loggade in till %s så vi måste koppla sitt OpenID "
-"till ett lokalt konto. Du kan antingen skapa ett nytt konto eller med ett "
-"existerande konto, om du har något."
+"Detta är första gången du loggade in till %s så vi måste koppla sitt "
+"OpenID till ett lokalt konto. Du kan antingen skapa ett nytt konto eller med "
+"ett existerande konto, om du har något."
 
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-msgid "This method requires a POST or DELETE."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381
-msgid "This method requires a POST."
-msgstr ""
-
-#: ../lib/util.php:164
+#: ../lib/util.php:147
 msgid "This page is not available in a media type you accept"
 msgstr "Denna sida är inte tillgänglig i den mediatyp du accepterat"
 
-#: ../actions/profilesettings.php:63
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107
-msgid "Timezone not selected."
-msgstr ""
-
 #: ../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."
+"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 ""
-"För att prenumerera så kan du [logga in](%%action.login%%) eller [registrera]"
-"(%%action.register%%) ett nytt konto. Om du redan har ett konto på en "
-"[kompatibel mikroblogg sida](%%doc.openmublog%%) fyll i din profils URL "
-"nedan."
+"För att prenumerera så kan du [logga in](%%action.login%%) eller "
+"[registrera](%%action.register%%) ett nytt konto. Om du redan har ett konto "
+"på en [kompatibel mikroblogg sida](%%doc.openmublog%%) fyll i din profils "
+"URL nedan."
 
-#: ../actions/twitapifriendships.php:163
-msgid "Two user ids or screen_names must be supplied."
-msgstr ""
-
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: ../actions/profilesettings.php:51
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL till din hemsida, blog eller profil på en annan sida."
 
@@ -1918,25 +1289,23 @@ msgstr "URL till din hemsida, blog eller profil på en annan sida."
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL till din profil på en annan kompatibel mikroblogg"
 
+#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
 #: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
-#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
-#, fuzzy
+#: ../actions/smssettings.php:135 actions/emailsettings.php:144
+#: actions/imsettings.php:118 actions/recoverpassword.php:39
+#: actions/smssettings.php:143 actions/twittersettings.php:108
 msgid "Unexpected form submission."
-msgstr "Oväntat utskick av formuläret"
+msgstr "Oväntat utskick av formuläret."
 
-#: ../actions/recoverpassword.php:276
+#: ../actions/recoverpassword.php:237
 msgid "Unexpected password reset."
 msgstr "Oväntad rensning av lösenord."
 
-#: ../index.php:57
-msgid "Unknown action"
-msgstr ""
-
 #: ../actions/finishremotesubscribe.php:58
 msgid "Unknown version of OMB protocol."
 msgstr "Okänd version av OMB protokollet."
 
-#: ../lib/util.php:269
+#: ../lib/util.php:245
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
@@ -1949,11 +1318,11 @@ msgstr ""
 msgid "Unrecognized address type %s"
 msgstr "Adresstypen känns inte igen %s"
 
-#: ../actions/showstream.php:209
+#: ../actions/showstream.php:193
 msgid "Unsubscribe"
 msgstr "Lämnar pren."
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
 msgid "Unsupported OMB version"
 msgstr "OMB versionen stöds inte"
 
@@ -1961,24 +1330,6 @@ msgstr "OMB versionen stöds inte"
 msgid "Unsupported image file format."
 msgstr "Bildfilens format stödjs inte."
 
-#: ../lib/settingsaction.php:100
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:241
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:341
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
 #: ../actions/avatar.php:68
 msgid "Upload"
 msgstr "Ladda upp"
@@ -1990,35 +1341,24 @@ msgid ""
 "site license, also. Use a picture that belongs to you and that you want to "
 "share."
 msgstr ""
-"Ladda upp en ny \"avatar\" (användarbild) här. Du kan inte göra ändringar i "
-"bilden efter uppladdning, försök att se till att den är så fykantig som "
-"möjligt. Den måste följa licensvillkoren, använd en bild som du äger och som "
-"du vill dela med dig utav."
+"Ladda upp en ny \"avatar\" (användarbild) här. Du kan inte göra "
+"ändringar i bilden efter uppladdning, försök att se till att den är så "
+"fykantig som möjligt. Den måste följa licensvillkoren, använd en bild "
+"som du äger och som du vill dela med dig utav."
 
-#: ../lib/settingsaction.php:91
-#, fuzzy
-msgid "Upload a new profile image"
-msgstr "Kunde inte spara informationen om den nya profilen"
-
-#: ../actions/invite.php:114
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
-msgstr ""
-
-#: ../actions/register.php:159 ../actions/register.php:162
+#: ../actions/profilesettings.php:48 ../actions/register.php:182
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
-"Används endast för uppdateringar, annonsering och återställning av lösenord"
+"Används endast för uppdateringar, annonsering och återställning av "
+"lösenord"
 
 #: ../actions/finishremotesubscribe.php:86
 msgid "User being listened to doesn't exist."
 msgstr "Användaren som avlyssnas existerar inte."
 
 #: ../actions/all.php:41 ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:47 ../actions/replies.php:41
-#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
-#: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
-#: ../actions/twitapiusers.php:82
+#: ../actions/foaf.php:43 ../actions/replies.php:41
+#: ../actions/showstream.php:44
 msgid "User has no profile."
 msgstr "Användaren har ingen profil."
 
@@ -2026,73 +1366,41 @@ msgstr "Användaren har ingen profil."
 msgid "User nickname"
 msgstr "Användarens smeknamn"
 
-#: ../actions/twitapiusers.php:75
-#, fuzzy
-msgid "User not found."
-msgstr "Sparade OpenID kunde inte hittas."
-
-#: ../actions/profilesettings.php:63
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../lib/util.php:1159
+#: ../lib/util.php:969
 #, php-format
 msgid "What's up, %s?"
 msgstr "Vad är på gång, %s?"
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: ../actions/profilesettings.php:57
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Var du håller till, såsom \"Stad, Län, Land\""
 
-#: ../actions/updateprofile.php:128
+#: ../actions/updateprofile.php:127
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "Fel filtyp för bild '%s'"
 
-#: ../actions/updateprofile.php:123
+#: ../actions/updateprofile.php:122
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "Fel bildstorlek för '%s'"
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-msgid "Yes"
-msgstr ""
-
 #: ../actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr "Du handhar redan denna OpenID!"
 
-#: ../actions/deletenotice.php:37
-msgid ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
-msgstr ""
-
 #: ../actions/recoverpassword.php:31
 msgid "You are already logged in!"
 msgstr "Du är redan inloggad!"
 
-#: ../actions/invite.php:81
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr ""
-
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
 msgstr "Du kan ändra ditt lösenord här. Välj ett bra!"
 
-#: ../actions/register.php:135
+#: ../actions/register.php:164
 msgid "You can create a new account to start posting notices."
 msgstr "Du kan skapa ett nytt konto och börja skriva inlägg."
 
-#: ../actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
@@ -2104,59 +1412,33 @@ msgstr ""
 #: ../actions/imsettings.php:28
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
-"Du kan skicka och ta emot inlägg genom Jabber/GTalk [instant messages](%%doc."
-"im%%). Konfigurera din adress och inställningar nedan. "
+"Du kan skicka och ta emot inlägg genom Jabber/GTalk [instant "
+"messages](%%doc.im%%). Konfigurera din adress och inställningar nedan. "
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about you."
+"You can update your personal profile info here so people know more about "
+"you."
 msgstr ""
-"Du kan uppdatera din personliga profil här så personer får veta mer om dig."
+"Du kan uppdatera din personliga profil här så personer får veta mer om "
+"dig."
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
 msgid "You can use the local subscription!"
 msgstr "Du kan använda lokala prenumerationer!"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
 msgid "You can't register if you don't agree to the license."
 msgstr "Du kan inte registrera dig om du inte godkänner licensvillkor."
 
-#: ../actions/updateprofile.php:63
+#: ../actions/updateprofile.php:62
 msgid "You did not send us that profile"
 msgstr "Du skickade inte oss den profilen"
 
-#: ../lib/mail.php:147
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
-"Send email to %2$s to post new messages.\n"
-"\n"
-"More email instructions at %3$s.\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:612
-msgid "You may not delete another user's status."
-msgstr ""
-
-#: ../actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr ""
-
-#: ../actions/invite.php:103
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
-
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:134
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Du är identifierad. Skriv ett nytt lösenord nedan."
 
@@ -2164,7 +1446,7 @@ msgstr "Du är identifierad. Skriv ett nytt lösenord nedan."
 msgid "Your OpenID URL"
 msgstr "Din OpenID URL"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:149
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Ditt användarnamn på denna server eller registrerad epost adress."
 
@@ -2174,64 +1456,60 @@ 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%%) låter dig logga in på flera sidor med samma konto. "
-"Ställ in ditt OpenID konto härifrån."
+"[OpenID](%%doc.openid%%) låter dig logga in på flera sidor med samma "
+"konto. Ställ in ditt OpenID konto härifrån."
 
-#: ../lib/util.php:943
+#: ../lib/util.php:814
 msgid "a few seconds ago"
 msgstr "ett par sekunder sedan"
 
-#: ../lib/util.php:955
+#: ../lib/util.php:826
 #, php-format
 msgid "about %d days ago"
 msgstr "för %d dagar sedan"
 
-#: ../lib/util.php:951
+#: ../lib/util.php:822
 #, php-format
 msgid "about %d hours ago"
 msgstr "för %d timmar sedan"
 
-#: ../lib/util.php:947
+#: ../lib/util.php:818
 #, php-format
 msgid "about %d minutes ago"
 msgstr "för %d minuter sedan"
 
-#: ../lib/util.php:959
+#: ../lib/util.php:830
 #, php-format
 msgid "about %d months ago"
 msgstr "för %d månader sedan"
 
-#: ../lib/util.php:953
+#: ../lib/util.php:824
 msgid "about a day ago"
 msgstr "för en dag sedan"
 
-#: ../lib/util.php:945
+#: ../lib/util.php:816
 msgid "about a minute ago"
 msgstr "för nån minut sedan"
 
-#: ../lib/util.php:957
+#: ../lib/util.php:828
 msgid "about a month ago"
 msgstr "för en månad sedan"
 
-#: ../lib/util.php:961
+#: ../lib/util.php:832
 msgid "about a year ago"
 msgstr "för ett år sedan"
 
-#: ../lib/util.php:949
+#: ../lib/util.php:820
 msgid "about an hour ago"
 msgstr "för en timma sedan"
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-msgid "delete"
-msgstr ""
-
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117
+#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
+#: ../lib/stream.php:101
 msgid "in reply to..."
 msgstr "svar till..."
 
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124
+#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
+#: ../lib/stream.php:108
 msgid "reply"
 msgstr "svar"
 
@@ -2239,23 +1517,1398 @@ msgstr "svar"
 msgid "same as password above"
 msgstr "samma som lösenordet ovan"
 
-#: ../actions/twitapistatuses.php:755
-#, fuzzy
-msgid "unsupported file type"
-msgstr "Bildfilens format stödjs inte."
-
-#: ../lib/util.php:1309
+#: ../lib/util.php:1127
 msgid "« After"
 msgstr "« Nyare"
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "Kunde inte bekräfta epost"
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+msgid " from "
+msgstr "från"
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr "%1$s / Uppdateringar med svar till %2$s"
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s har bjudit in dig till %2$s"
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+"%1$s har bjudit in dig till %2$s (%3$s).\n"
+"\n"
+"%2$s är en mikroblogg service som låter dig via sidan hålla direktkontakt "
+"med människor du känner eller intresserar dig.\n"
+"\n"
+"Du kan även dela med dig utav nyheter om dig själv, dina tankar, eller "
+"ditt liv online som känner igen dig. Det är också perfekt för att möta "
+"nya personer som delar ditt intresse.\n"
+"\n"
+"%1$s sa:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Du kan se %1$s's profilsida på %2$s här:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Om du vill prova på denna service, klicka på länken nedan för att "
+"acceptera denna inbjudan.\n"
+"\n"
+"%6$s\n"
+"\n"
+"Om inte, då kan du ignorera detta meddelande. Tack för att du tog dig\n"
+
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr "%1$s uppdateringar med svar till uppdatering från %2$s / %3$s."
+
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr "%s(%s)"
+
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#, php-format
+msgid "%s public timeline"
+msgstr "%s publika tidslinje"
+
+#: ../lib/mail.php:206 lib/mail.php:212
+#, php-format
+msgid "%s status"
+msgstr "%s status"
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#, php-format
+msgid "%s timeline"
+msgstr "%s tidslinje"
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#, php-format
+msgid "%s updates from everyone!"
+msgstr "%s uppdateringar ifrån allihop!"
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+"(Du kommer få ett meddelande med email inom kort med instruktioner hur du "
+"bekräftar din emailadress)"
+
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+"1-64 små bokstäver eller nummer, inga punkter eller mellanslag. Måste "
+"fyllas i."
+
+#: ../actions/register.php:154 actions/register.php:168
+msgid "6 or more characters. Required."
+msgstr "6 eller fler tecken. MÃ¥ste fyllas 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 ""
+"En bekräftelsekod har skickats ut till email adressen du fyllde i. "
+"Kontrollera din inbox (och spamlådan!) efter kod och instruktioner hur du "
+"använder den."
+
+#: ../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 ""
+"En bekräftelsekod har skickats ut till telefonnumret du fyllde i. "
+"Kontrollera din inbox (och spamlådan!) efter kod och instruktioner hur du "
+"använder den."
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55
+msgid "API method not found!"
+msgstr "API metoden hittades inte!"
+
+#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
+#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
+#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
+#: ../actions/twitapidirect_messages.php:49
+#: ../actions/twitapidirect_messages.php:56
+#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
+#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
+#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
+#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
+#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
+#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
+#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
+#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
+#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
+#: actions/twitapistatuses.php:690
+msgid "API method under construction."
+msgstr "API metoden är under uppbyggnad."
+
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+msgid "Add or remove OpenIDs"
+msgstr "Lägg till eller tabort OpenIDs"
+
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr "Adresser till vänner att bjuda in (en rad per adress)"
+
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr "Är du säker på att du vill tabort detta inlägg?"
+
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for "
+"non-humans)"
+msgstr ""
+"Automatisk prenummeration på den som prenumererar på mig. (Bäst för icke "
+"mänsklig användare) "
+
+#: ../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 ""
+"Väntar bekräftelse på denna adress. Kontrollera din inbox (och "
+"spamlådan!) efter meddelande om vidare instruktioner."
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr "Väntar bekräftelse på detta telefonnummer. "
+
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr "Kan inte tabort detta inlägg."
+
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+msgid "Cannot normalize that email address"
+msgstr "Kan inte normalisera den emailadressen"
+
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+msgid "Change email handling"
+msgstr "Ändra email hantering"
+
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr "Ändra ditt lösenord"
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+msgid "Change your profile settings"
+msgstr "Ändra dina profil inställningar"
+
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr "Bekräftelsekod"
+
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"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."
+msgstr ""
+"Grattis, %s! Välkommen till %%%%site.name%%%%. Härifrån, kanske du "
+"vill...\n"
+"\n"
+"* Gå till [din profil](%s) och göra ditt första inlägg.\n"
+"* Lägg till en [Jabber/GTalk adress](%%%%action.imsettings%%%%) så du kan "
+"skicka inlägg med en IM klient.\n"
+"* [Sök efter personer](%%%%action.peoplesearch%%%%) som du kanske känner "
+"eller delar dina intressen. \n"
+"* Uppdatera din [profil inställning](%%%%action.profilesettings%%%%) för "
+"att berätta lite mer om dig själv för andra här. \n"
+"* Läs igenom [online dok](%%%%doc.help%%%%) efter funktioner som du kanske "
+"missat. \n"
+"\n"
+"Tack för att du registrerade dig och vi hoppas du kommer trivas med denna service."
 
-#~ msgid "Couldn't create subscription."
-#~ msgstr "Kunde inte skapa prenumeration."
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr "Kunde inte följa användaren: %s finns redan i din lista."
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+msgid "Could not follow user: User not found."
+msgstr "Kunde inte följa användaren: Användaren kunde inte hittas."
+
+#: ../lib/subs.php:54 lib/subs.php:61
+msgid "Could not subscribe other to you."
+msgstr "Kunde inte prenumerera på annat åt dig."
+
+#: ../lib/subs.php:46 lib/subs.php:46
+msgid "Could not subscribe."
+msgstr "Kunde inte prenumerera."
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr "Kunde inte uppdatera användaren med bekräftad emailadress."
+
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+msgid "Couldn't find any statuses."
+msgstr "Kunde inte få fram status."
+
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+msgid "Couldn't update user for autosubscribe."
+msgstr "Kunde inte uppdatera användaren för automatisk prenumeration."
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+msgid "Couldn't update user record."
+msgstr "Kunde inte uppdatera användarens inställningar."
+
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "Nuvarande bekäftat SMS telefonnummer"
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Fel uppstog när inlägget skulle läggas till"
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr "Nuvarande bekräftade emailadress."
+
+#: ../classes/Notice.php:72 classes/Notice.php:86
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "DB error vid infog av hashtag: %s"
+
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr "Tabort inlägg"
+
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr "Emailadress"
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr "Email inställningar"
+
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr "Emailadress såsom \"användare@exempel.se\""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr "Emailadresser"
+
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr "Fyll i koden du mottog i din telefon."
+
+#: ../actions/tag.php:55 actions/tag.php:55
+#, php-format
+msgid "Feed for tag %s"
+msgstr "Feed för taggar %s"
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr "Sök innehåll i inlägg"
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr "Sök personer på denna sida"
+
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+msgid "I want to post notices by email."
+msgstr "Jag vill posta inlägg via min email."
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+msgid "IM"
+msgstr "IM"
+
+#: ../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 ""
+"Om du glömt eller tappat bort ditt lösenord så kan du få ett nytt "
+"skickat till den emailadress du sparat till ditt konto."
+
+#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
+#: actions/emailsettings.php:68 actions/smssettings.php:76
+msgid "Incoming email"
+msgstr "Inkommande email"
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+msgid "Incoming email address removed."
+msgstr "Inkommande emailadress borttagen."
+
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "Ogiltig emailadress: %s"
+
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr "Inbjudan(ar) skickad"
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr "Inbjudan(ar) är skickade till följande personer:"
+
+#: ../lib/util.php:306 lib/util.php:322
+msgid "Invite"
+msgstr "Bjud in"
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr "Bjud in nya användare"
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Language"
+msgstr "Språk"
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+msgid "Language is too long (max 50 chars)."
+msgstr "Språket är för långt(max 50 tecken)."
+
+#: ../actions/register.php:166 actions/register.php:180
+msgid "Longer name, preferably your \"real\" name"
+msgstr "Långt namn, förslagsvis ditt \"riktiga\" namn"
+
+#: ../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 "Skapa en ny emailadress för att posta till, avaktiverar den gamla"
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr "Ställ in hur du tar emot email ifrån %%site.name%%"
+
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+"Mobiloperatör för din telefon. Vet du nån operatör som kan taemot SMS "
+"över email som inte finns med i listan, skicka ett email till oss och tala "
+"det hit %s"
+
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr "Ny"
+
+#: ../lib/mail.php:144 lib/mail.php:144
+#, php-format
+msgid "New email address for posting to %s"
+msgstr "Ny emailadress för att skicka till %s"
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+msgid "New incoming email address added."
+msgstr "Ny inkommande emailadress inlagd."
+
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+msgid "No"
+msgstr "Nej"
+
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr "Ingen operatör vald."
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr "Ingen kod är ifylld"
+
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+msgid "No email address."
+msgstr "Ingen emailadress."
+
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+msgid "No incoming email address."
+msgstr "Ingen inkommande emailadress."
+
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr "Inget telefonnummer."
+
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520
+msgid "No status found with that ID."
+msgstr "Ingen status hittad med det ID"
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+msgid "No status with that ID found."
+msgstr "Ingen status med det ID hittades."
+
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr "Ingen användare med den emailadressen eller användarnamn."
+
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+msgid "Not a registered user."
+msgstr "Inte registrerad användare."
+
+#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
+#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
+#: lib/twitterapi.php:502
+msgid "Not a supported data format."
+msgstr "Ingen support för det formatet."
+
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+msgid "Not a valid email address"
+msgstr "Ingen giltig emailadress"
+
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+msgid "Not found"
+msgstr "Hittades inte"
+
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr "Inlägg sökning"
+
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr "Inlägg taggade med %s"
+
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr "Om du vill, skriv ett personligt meddelande med inbjudan."
+
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr "Personer"
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr "Personer sökning"
+
+#: ../actions/invite.php:133 actions/invite.php:141
+msgid "Personal message"
+msgstr "Personligt meddelande"
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "Telefonnummer, inga punkter eller mellanslag, med landskod"
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Preferred language"
+msgstr "Språkval"
+
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Publicera ett MicroID för min Jabber/GTalk adress."
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+msgid "Publish a MicroID for my email address."
+msgstr "Publicera ett MicroID för min emailadress."
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr "Tidigare taggar"
+
+#: ../actions/register.php:28 actions/register.php:28
+msgid "Registration not allowed."
+msgstr "Registrering är inte möjlig."
+
+#: ../actions/register.php:200 actions/register.php:214
+msgid "Registration successful"
+msgstr "Registreringen är genomförd"
+
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+msgid "SMS"
+msgstr "SMS"
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr "SMS Telefonnummer"
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr "SMS Inställningar"
+
+#: ../lib/mail.php:219 lib/mail.php:225
+msgid "SMS confirmation"
+msgstr "SMS Bekräftelse"
+
+#: ../actions/register.php:156 actions/register.php:170
+msgid "Same as password above. Required."
+msgstr "Samma som lösenordet ovan. Måste fyllas i."
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr "Välj en operatör"
+
+#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
+#: actions/emailsettings.php:74 actions/smssettings.php:82
+msgid "Send email to this address to post new notices."
+msgstr "Skicka email till denna adress för att posta ett nya inlägg."
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr "Skicka meddelande till mig via email vid nya prenumerationer."
+
+#: ../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 ""
+"Skicka inlägg till mig via SMS; Jag är införstådd att min operatör kan "
+"debitera mig."
+
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+"Skicka svar till mig via Jabber/GTalk från personer som inte jag "
+"prenumererar på."
+
+#: ../actions/tag.php:60 actions/tag.php:60
+msgid "Showing most popular tags from the last week"
+msgstr "Visar dom populäraste taggarna ifrån den senaste veckan."
+
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr "Ledsen, men inga inkommande email är tillåtna."
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr "Ledsen, men det är inte din inkommande emailadress."
+
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317
+msgid "Tags"
+msgstr "Taggar"
 
-#~ msgid "Public"
-#~ msgstr "Publik"
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
+msgid "Text"
+msgstr "Text"
+
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+msgid "That email address already belongs to another user."
+msgstr "Den emailadressen tillhör redan en annan användare."
+
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+msgid "That is already your email address."
+msgstr "Det är redan din emailadress."
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr "Det är redan ditt telefonnummer."
+
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+msgid "That is not your email address."
+msgstr "Det är inte din emailadress."
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+msgid "That is not your phone number."
+msgstr "Det är inte ditt telefonnummer."
+
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr "Det är fel nummer i bekräftelsen"
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr "Det numret tillhör en annan användare."
+
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+msgid "That's too long. Max notice size is 255 chars."
+msgstr "Det är för långt. Max antal tecken är 255."
+
+#: ../actions/invite.php:89 actions/invite.php:96
+msgid ""
+"These people are already users and you were automatically subscribed to "
+"them:"
+msgstr ""
+"Dom personerna är redan registrerade användare och du blev nu automatiskt "
+"prenumerant till dom:"
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511
+msgid "This method requires a POST or DELETE."
+msgstr "Denna metod kräver antingen skicka eller tabort."
+
+#: ../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
+msgid "This method requires a POST."
+msgstr "Denna metod kräver skicka."
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "Timezone"
+msgstr "Tidszon"
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+msgid "Timezone not selected."
+msgstr "Du har inte valt tidszon"
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+msgid "Two user ids or screen_names must be supplied."
+msgstr "Två användarid eller namn måste läggas till."
+
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr "Okänd funktion"
+
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+msgid "Updates by SMS"
+msgstr "Uppdateringar via SMS"
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+msgid "Updates by instant messenger (IM)"
+msgstr "Uppdateringar via instant messenger (IM)"
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr "Uppdateringar från %1$s och vänner på %2$s!"
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "Uppdateringar från %1$s på %2$s!"
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr "Ladda upp en ny profilbild"
+
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this "
+"service."
+msgstr ""
+"Använd detta formulär för att bjuda in dina vänner och kollegor till "
+"denna sida."
+
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr "Användare hittades inte."
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "What timezone are you normally in?"
+msgstr "Vilken tidszon befinner du dig normalt?"
+
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+msgid "Yes"
+msgstr "Ja"
+
+#: ../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 ""
+"Du håller på att tabort inlägget permanent. När det väl är gjort kan "
+"du inte ångra dig."
+
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr "Du prenumererar redan på dessa användare:"
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+msgid "You are not friends with the specified user."
+msgstr "Du är inte vän med den användaren."
+
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr "Du kan ta emot SMS meddelande via email från %%site.name%%."
+
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+"Du har en ny adress %1$s.\n"
+"\n"
+"Skicka email till %2$s för att göra ett nytt inlägg.\n"
+"\n"
+"Mer information får du på %3$s.\n"
+"\n"
+"Mvh,\n%4$s"
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+msgid "You may not delete another user's status."
+msgstr "Du kan inte tabort nån annan användares status."
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr "du måste vara inloggad för att kunna bjuda in andra användare till %s"
+
+#: ../actions/invite.php:103 actions/invite.php:110
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
+msgstr ""
+"du kommer bli meddelad när någon du bjudit in accepterar inbjudan och "
+"registrerar sig. Tack för att du hjälper oss växa!"
+
+#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99
+msgid "delete"
+msgstr "Tabort"
+
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+msgid "unsupported file type"
+msgstr "okänd fil typ"
+
+#: actions/deletenotice.php:74 actions/disfavor.php:43
+#: actions/emailsettings.php:127 actions/favor.php:45
+#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
+#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
+#: actions/openidsettings.php:123 actions/profilesettings.php:47
+#: actions/recoverpassword.php:282 actions/register.php:42
+#: actions/remotesubscribe.php:40 actions/smssettings.php:124
+#: actions/subscribe.php:44 actions/twittersettings.php:97
+#: actions/unsubscribe.php:41 actions/userauthorization.php:35
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Det var något problem med din session. Försök igen, tack."
+
+#: actions/disfavor.php:55
+msgid "This notice is not a favorite!"
+msgstr "Det inlägget är ingen favorit!"
+
+#: actions/disfavor.php:63
+msgid "Could not delete favorite."
+msgstr "Kunde inte tabort favoriten."
+
+#: actions/disfavor.php:72
+msgid "Favor"
+msgstr "Favorisera"
+
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr "Skicka mig ett email när någon lägger till mitt inlägg som favorit."
+
+#: actions/emailsettings.php:95
+msgid "Send me email when someone sends me a private message."
+msgstr "Skicka mig ett email när någon sänder ett privat meddelande."
+
+#: actions/favor.php:53 actions/twitapifavorites.php:142
+msgid "This notice is already a favorite!"
+msgstr "Detta inlägg är redan en favorit!"
+
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132
+msgid "Could not create favorite."
+msgstr "Kunde inte skapa favorit."
+
+#: actions/favor.php:70
+msgid "Disfavor"
+msgstr "Avfavorisera"
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#, php-format
+msgid "%s favorite notices"
+msgstr "%s favoriter"
+
+#: actions/favoritesrss.php:64
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr "Feed över %s favoriter"
+
+#: actions/inbox.php:28
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr "Inbox för %s - sida %d"
+
+#: actions/inbox.php:30
+#, php-format
+msgid "Inbox for %s"
+msgstr "Inbox för %s"
+
+#: actions/inbox.php:53
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr "Detta är din inbox som innehåller dina privata meddelanden."
+
+#: actions/invite.php:178
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+msgstr ""
+"%1$s har bjudit in dig till %2$s(%3$s).\n"
+"\n"
+
+#: actions/login.php:104
+msgid "Automatically login in the future; "
+msgstr "Logga in automatiskt;"
+
+#: actions/login.php:122
+msgid "For security reasons, please re-enter your "
+msgstr "För säkerhets skull, skriv in dina"
+
+#: actions/login.php:126
+msgid "Login with your username and password. "
+msgstr "Logga in med ditt användarnamn och lösenord."
+
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+msgid "That's too long. Max message size is 140 chars."
+msgstr "Det är för långt. Max är 140 tecken. "
+
+#: actions/newmessage.php:65
+msgid "No recipient specified."
+msgstr "Ingen mottagare tillagd."
+
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206
+msgid "You can't send a message to this user."
+msgstr "Du kan inte skicka meddelande till den användaren."
+
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly "
+"instead."
+msgstr "Skicka inte meddelande till dig själv, viska lite tyst istället."
+
+#: actions/newmessage.php:108
+msgid "No such user"
+msgstr "Ingen sådan användare"
+
+#: actions/newmessage.php:117
+msgid "New message"
+msgstr "Nytt meddelande"
+
+#: actions/noticesearch.php:95
+msgid "Notice without matching profile"
+msgstr "Inlägg utan matchande profil"
+
+#: actions/openidsettings.php:28
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr "[OpenID](%%doc.openid%%) låter dig logga in på många sidor"
+
+#: actions/openidsettings.php:46
+msgid "If you want to add an OpenID to your account, "
+msgstr "Om du vill lägga till en OpenID till ditt konto,"
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr "Att tabort ditt enda OpenID skulle göra det omöjligt att logga in!"
+
+#: actions/openidsettings.php:87
+msgid "You can remove an OpenID from your account "
+msgstr "Du kan tabort ett OpenID ifrån ditt konto"
+
+#: actions/outbox.php:28
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr "Outbox för %s - sida %d"
+
+#: actions/outbox.php:30
+#, php-format
+msgid "Outbox for %s"
+msgstr "Outbox för %s"
+
+#: actions/outbox.php:53
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr "Detta är din outbox som innehåller meddelanden som du skickat."
+
+#: actions/peoplesearch.php:28
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+msgstr ""
+"Sök efter personer på %%site.name%% efter deras namn, plats eller "
+"intressen."
+
+#: actions/profilesettings.php:27
+msgid "You can update your personal profile info here "
+msgstr "Du kan uppdatera din personliga profil här"
+
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+msgid "User without matching profile"
+msgstr "Användare utan matchande profil"
+
+#: actions/recoverpassword.php:91
+msgid "This confirmation code is too old. "
+msgstr "Denna bekräftelsekod är för gammal."
+
+#: actions/recoverpassword.php:141
+msgid "If you've forgotten or lost your"
+msgstr "Om du har glömt eller tappat bort din"
+
+#: actions/recoverpassword.php:154
+msgid "You've been identified. Enter a "
+msgstr "Du är identifierad. Skriv in"
+
+#: actions/recoverpassword.php:169
+msgid "Your nickname on this server, "
+msgstr "Ditt smeknamn på denna server,"
+
+#: actions/recoverpassword.php:271
+msgid "Instructions for recovering your password "
+msgstr "Instruktioner för att återfå ditt lösenord"
+
+#: actions/recoverpassword.php:327
+msgid "New password successfully saved. "
+msgstr "Nya lösenordet är sparat."
+
+#: actions/register.php:95
+msgid "Password must be 6 or more characters."
+msgstr "Lösenordet måste vara minst 6 tecken."
+
+#: actions/register.php:216
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
+msgstr ""
+"Gratulerar, %s! Välkommen till %%%%site.name%%%%. Härifrån vill du "
+"kanske..."
+
+#: actions/register.php:227
+msgid "(You should receive a message by email momentarily, with "
+msgstr "(Du kommer inom kort få ett email med"
+
+#: actions/remotesubscribe.php:51
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
+msgstr "För att prenumerera så kan du [login](%%action.login%%),"
+
+#: actions/showfavorites.php:61
+#, php-format
+msgid "Feed for favorites of %s"
+msgstr "Feed för %s favoriter"
+
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+msgid "Could not retrieve favorite notices."
+msgstr "Kunde inte ta emot favoritinläggen."
+
+#: actions/showmessage.php:33
+msgid "No such message."
+msgstr "Inget sådant meddelande."
+
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
+msgstr "Endast den som skickat och mottagaren kan läsa detta meddelande."
+
+#: actions/showmessage.php:61
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr "Meddelande till %1$s på %2$s"
+
+#: actions/showmessage.php:66
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr "Meddelande från %1$s på %2$s"
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr "Skicka ett meddelande"
+
+#: actions/smssettings.php:312
+#, php-format
+msgid "Mobile carrier for your phone. "
+msgstr "Mobiloperatören för din telefon."
+
+#: actions/twitapidirect_messages.php:76
+#, php-format
+msgid "Direct messages to %s"
+msgstr "Direktmeddelande till %s"
+
+#: actions/twitapidirect_messages.php:77
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr "Alla direktmeddelanden skickade till %s"
+
+#: actions/twitapidirect_messages.php:81
+msgid "Direct Messages You've Sent"
+msgstr "Direktmeddelanden du skickat"
+
+#: actions/twitapidirect_messages.php:82
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr "Alla direktmeddelanden skickade ifrån %s"
+
+#: actions/twitapidirect_messages.php:128
+msgid "No message text!"
+msgstr "Ingen meddelande text!"
+
+#: actions/twitapidirect_messages.php:138
+msgid "Recipient user not found."
+msgstr "Mottagaren kunde inte hittas."
+
+#: actions/twitapidirect_messages.php:141
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+"Kan inte skicka direktmeddelanden till användare som inte är dina "
+"vänner."
+
+#: actions/twitapifavorites.php:92
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr "%s / Favoriter från %s"
+
+#: actions/twitapifavorites.php:95
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr "%s uppdaterade favoriter av %s / %s."
+
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#, php-format
+msgid "%s added your notice as a favorite"
+msgstr "%s la till ditt inlägg som favorit"
+
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+msgstr "%1$s la just in ditt inlägg ifrån %2$s som en av deras favorit.\n\n"
+
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+msgstr ""
+"Lägg till ditt Twitter konto för att automatiskt skicka dina inlägg till "
+"Twitter,"
+
+#: actions/twittersettings.php:41
+msgid "Twitter settings"
+msgstr "Twitter inställningar"
+
+#: actions/twittersettings.php:48
+msgid "Twitter Account"
+msgstr "Twitter konto"
+
+#: actions/twittersettings.php:56
+msgid "Current verified Twitter account."
+msgstr "Verifierat Twitter konto."
+
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr "Twitter användarnamn"
+
+#: actions/twittersettings.php:65
+msgid "No spaces, please."
+msgstr "Inga mellanslag tack."
+
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr "Twitter lösenord"
+
+#: actions/twittersettings.php:72
+msgid "Automatically send my notices to Twitter."
+msgstr "Skicka automatiskt mina inlägg till Twitter."
+
+#: actions/twittersettings.php:75
+msgid "Send local \"@\" replies to Twitter."
+msgstr "Skicka lokala \"@\" svar till Twitter."
+
+#: actions/twittersettings.php:78
+msgid "Subscribe to my Twitter friends here."
+msgstr "Prenumerera på mina Twitter vänner här."
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+"Användarnamn får bara innehålla nummer, stora och små bokstäver, och "
+"underscore(_). 15 tecken max."
+
+#: actions/twittersettings.php:128
+msgid "Could not verify your Twitter credentials!"
+msgstr "Kunde inte verifiera din Twitter!"
+
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgstr "Kunde inte mottaga konto information för \"%s\" Twitter."
+
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+msgid "Unable to save your Twitter settings!"
+msgstr "Kunde inte spara dina Twitter inställningar!"
+
+#: actions/twittersettings.php:174
+msgid "Twitter settings saved."
+msgstr "Twitter inställningar sparade."
+
+#: actions/twittersettings.php:192
+msgid "That is not your Twitter account."
+msgstr "Det är inte ditt Twitter konto."
+
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+msgid "Couldn't remove Twitter user."
+msgstr "Kunde inte tabort Twitter användaren."
+
+#: actions/twittersettings.php:212
+msgid "Twitter account removed."
+msgstr "Twitterkontot borttaget."
+
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+msgid "Couldn't save Twitter preferences."
+msgstr "Kunde inte spara Twitter inställningar."
+
+#: actions/twittersettings.php:245
+msgid "Twitter preferences saved."
+msgstr ""
+
+#: actions/userauthorization.php:84
+msgid "Please check these details to make sure "
+msgstr ""
+
+#: actions/userauthorization.php:324
+msgid "The subscription has been authorized, but no "
+msgstr ""
+
+#: actions/userauthorization.php:334
+msgid "The subscription has been rejected, but no "
+msgstr ""
+
+#: classes/Channel.php:113
+msgid "Command results"
+msgstr ""
+
+#: classes/Channel.php:148
+msgid "Command complete"
+msgstr ""
+
+#: classes/Channel.php:158
+msgid "Command failed"
+msgstr ""
+
+#: classes/Command.php:39
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: classes/Command.php:96
+#, php-format
+msgid "Subscriptions: %1$s\n"
+msgstr ""
+
+#: classes/Command.php:125 classes/Command.php:242
+msgid "User has no last notice"
+msgstr ""
+
+#: classes/Command.php:146
+msgid "Notice marked as fave."
+msgstr ""
+
+#: classes/Command.php:166
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#: classes/Command.php:169
+#, php-format
+msgid "Fullname: %s"
+msgstr "Fullt namn: %s"
+
+#: classes/Command.php:172
+#, php-format
+msgid "Location: %s"
+msgstr "Plats: %s"
+
+#: classes/Command.php:175
+#, php-format
+msgid "Homepage: %s"
+msgstr "Hemsida: %s"
+
+#: classes/Command.php:178
+#, php-format
+msgid "About: %s"
+msgstr "Om: %s"
+
+#: classes/Command.php:200
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
+
+#: classes/Command.php:214
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
+
+#: classes/Command.php:216
+msgid "Error sending direct message."
+msgstr ""
+
+#: classes/Command.php:263
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: classes/Command.php:270
+#, php-format
+msgid "Subscribed to %s"
+msgstr ""
+
+#: classes/Command.php:288
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
+
+#: classes/Command.php:295
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr ""
+
+#: classes/Command.php:310 classes/Command.php:330
+msgid "Command not yet implemented."
+msgstr ""
+
+#: classes/Command.php:313
+msgid "Notification off."
+msgstr ""
+
+#: classes/Command.php:315
+msgid "Can't turn off notification."
+msgstr ""
+
+#: classes/Command.php:333
+msgid "Notification on."
+msgstr ""
+
+#: classes/Command.php:335
+msgid "Can't turn on notification."
+msgstr ""
+
+#: classes/Command.php:344
+msgid "Commands:\n"
+msgstr ""
+
+#: classes/Message.php:53
+msgid "Could not insert message."
+msgstr ""
+
+#: classes/Message.php:63
+msgid "Could not update message with new URI."
+msgstr ""
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr ""
+
+#: lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:249
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:253
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+msgstr ""
+
+#: lib/mailbox.php:43
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/openid.php:195
+msgid "This form should automatically submit itself. "
+msgstr ""
+
+#: lib/personal.php:65
+msgid "Favorites"
+msgstr ""
+
+#: lib/personal.php:66
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
+#: lib/personal.php:66
+msgid "User"
+msgstr ""
+
+#: lib/personal.php:75
+msgid "Inbox"
+msgstr ""
+
+#: lib/personal.php:76
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personal.php:80
+msgid "Outbox"
+msgstr ""
+
+#: lib/personal.php:81
+msgid "Your sent messages"
+msgstr ""
+
+#: lib/settingsaction.php:99
+msgid "Twitter"
+msgstr ""
+
+#: lib/settingsaction.php:100
+msgid "Twitter integration options"
+msgstr ""
+
+#: lib/util.php:1718
+msgid "To"
+msgstr ""
+
+#: scripts/maildaemon.php:45
+msgid "Could not parse message."
+msgstr ""
diff --git a/locale/te_IN/LC_MESSAGES/laconica.mo b/locale/te_IN/LC_MESSAGES/laconica.mo
new file mode 100644
index 000000000..cfcb68259
--- /dev/null
+++ 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
new file mode 100644
index 000000000..98ee16561
--- /dev/null
+++ b/locale/te_IN/LC_MESSAGES/laconica.po
@@ -0,0 +1,2870 @@
+# #-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#
+# Laconica Telugu Translation
+# Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the Laconica package.
+# Veeven <veeven@gmail.com>, 2008.
+#
+# #-#-#-#-#  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.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-07-14 21:07+1200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Veeven <veeven@gmail.com>\n"
+"Language-Team: Telugu <l10n@etelugu.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../actions/noticesearchrss.php:64
+#, php-format
+msgid " Search Stream for \"%s\""
+msgstr "\"%s\"కై అన�వేషణ వాహిని"
+
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
+msgid ""
+" except this private data: password, email address, IM address, phone "
+"number."
+msgstr ""
+"ఈ అంతరంగిక భోగట�టా తప�ప: "
+"సంకేతపదం, ఈమెయిల� చిర�నామా, IM చిర�నామా, ఫోన� నంబర�."
+
+#: ../actions/subscribe.php:84 ../lib/mail.php:124 lib/mail.php:124
+#: lib/mail.php:126
+#, php-format
+msgid "%1$s is now listening to your notices on %2$s."
+msgstr ""
+
+#: ../actions/subscribe.php:86 ../lib/mail.php:126
+#, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s.\n"
+msgstr ""
+
+#: ../actions/shownotice.php:45 actions/shownotice.php:45
+#, php-format
+msgid "%1$s's status on %2$s"
+msgstr ""
+
+#: ../actions/publicrss.php:60
+#, php-format
+msgid "%s Public Stream"
+msgstr "%s ప�రజా వాహిని"
+
+#: ../actions/all.php:47 ../actions/allrss.php:70 ../lib/stream.php:45
+#, php-format
+msgid "%s and friends"
+msgstr "%s మరియ� మిత�ర�ల�"
+
+#: ../lib/util.php:233 ../lib/util.php:257 lib/util.php:273
+#, php-format
+#, fuzzy
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by "
+"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+msgstr ""
+"[%%site.broughtby%%](%%site.broughtbyurl%%) వార� "
+"అందిస�త�న�న ఈ **%%site.name%%** అనేది మైక�రో బ�లాగింగ� సద�పాయం."
+
+#: ../lib/util.php:235
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** అనేది మైక�రో బ�లాగింగ� సద�పాయం."
+
+#: ../lib/util.php:250 ../lib/util.php:274 lib/util.php:290
+msgid ". Contributors should be attributed by full name or nickname."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
+#: ../actions/register.php:176
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1-64 చిన�నబడి అక�షరాల� లేదా అంకెల�, విరామచిహ�నాల� మరియ� ఖాళీల� తప�ప"
+
+#: ../actions/password.php:42 ../actions/register.php:178
+msgid "6 or more characters"
+msgstr "6 లేదా అంతకంటే ఎక�క�వ అక�షరాల�"
+
+#: ../actions/recoverpassword.php:165
+msgid "6 or more characters, and don't forget it!"
+msgstr "6 లేదా అంతకంటే ఎక�క�వ అక�షరాల�, మర�చిపోకండి!"
+
+#: ../actions/imsettings.php:188 ../actions/imsettings.php:197
+#: actions/imsettings.php:205
+#, php-format
+msgid ""
+"A confirmation code was sent to the IM address you added. You must approve "
+"%s for sending messages to you."
+msgstr ""
+
+#: ../lib/util.php:296
+msgid "About"
+msgstr "గ�రించి"
+
+#: ../actions/userauthorization.php:118
+msgid "Accept"
+msgstr "అంగీకరించ�"
+
+#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
+msgid "Add"
+msgstr "చేర�చ�"
+
+#: ../actions/openidsettings.php:43
+msgid "Add OpenID"
+msgstr "ఓపెన��డీని చేర�చ�"
+
+#: ../actions/imsettings.php:39
+msgid "Address"
+msgstr "చిర�నామా"
+
+#: ../actions/showstream.php:254
+msgid "All subscriptions"
+msgstr "అన�ని చందాల�"
+
+#: ../actions/publicrss.php:62
+#, php-format
+msgid "All updates for %s"
+msgstr "%s కోసం అన�ని తాజాకరణలూ"
+
+#: ../actions/noticesearchrss.php:66
+#, php-format
+msgid "All updates matching search term \"%s\""
+msgstr "\"%s\"తో సరిపోలే అన�ని తాజాకరణల�"
+
+#: ../actions/finishopenidlogin.php:29 ../actions/login.php:27
+#: ../actions/openidlogin.php:29 ../actions/register.php:28
+msgid "Already logged in."
+msgstr "ఇప�పటికే లోనికి ప�రవేశించార�."
+
+#: ../actions/subscribe.php:48
+msgid "Already subscribed!."
+msgstr "ఇప�పటికే చేరార�!"
+
+#: ../actions/userauthorization.php:76 ../actions/userauthorization.php:77
+#: actions/userauthorization.php:83
+msgid "Authorize subscription"
+msgstr ""
+
+#: ../actions/login.php:100 ../actions/register.php:184
+msgid "Automatically login in the future; not for shared computers!"
+msgstr "భవిష�యత�త�లో ఆటోమెటిగ�గా లోనికి ప�రవేశించ�; బయటి కంప�యూర�ల కొరక� కాద�!"
+
+#: ../actions/avatar.php:32
+msgid "Avatar"
+msgstr "అవతారం"
+
+#: ../actions/avatar.php:113
+msgid "Avatar updated."
+msgstr "అవతారాన�ని తాజాకరించాం."
+
+#: ../actions/imsettings.php:55 actions/imsettings.php:56
+#, 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 ""
+
+#: ../lib/util.php:1136
+msgid "Before »"
+msgstr "ఇంతక�రితం »"
+
+#: ../actions/profilesettings.php:52
+msgid "Bio"
+msgstr "స�వపరిచయం"
+
+#: ../actions/profilesettings.php:93 ../actions/updateprofile.php:102
+msgid "Bio is too long (max 140 chars)."
+msgstr "స�వపరిచయం చాలా పెద�దగా ఉంది (140 అక�షరాల� గరిష�ఠం)."
+
+#: ../actions/updateprofile.php:118 ../actions/updateprofile.php:119
+#: actions/updateprofile.php:120
+#, php-format
+msgid "Can't read avatar URL '%s'"
+msgstr ""
+
+#: ../actions/password.php:85 ../actions/recoverpassword.php:261
+msgid "Can't save new password."
+msgstr "కొత�త సంకేతపదాన�ని భద�రపరచలేమ�."
+
+#: ../actions/imsettings.php:59
+msgid "Cancel"
+msgstr "రద�ద�చేయి"
+
+#: ../lib/openid.php:121 lib/openid.php:121
+msgid "Cannot instantiate OpenID consumer object."
+msgstr ""
+
+#: ../actions/imsettings.php:154 ../actions/imsettings.php:163
+#: actions/imsettings.php:171
+msgid "Cannot normalize that Jabber ID"
+msgstr ""
+
+#: ../actions/password.php:45
+msgid "Change"
+msgstr "మార�చ�"
+
+#: ../actions/password.php:32
+msgid "Change password"
+msgstr "సంకేతపదం మార�చ�కోండి"
+
+#: ../actions/password.php:43 ../actions/recoverpassword.php:166
+#: ../actions/register.php:179
+msgid "Confirm"
+msgstr "నిర�థారించ�"
+
+#: ../actions/confirmaddress.php:84
+msgid "Confirm Address"
+msgstr "చిర�నామాని నిర�ధారించ�"
+
+#: ../actions/imsettings.php:213
+msgid "Confirmation cancelled."
+msgstr "నిర�ధారణ రద�దయింది."
+
+#: ../actions/confirmaddress.php:38
+msgid "Confirmation code not found."
+msgstr "నిర�ధారణ సంకేతం కనబడలేద�."
+
+#: ../actions/finishopenidlogin.php:91
+msgid "Connect"
+msgstr "అన�సంధానించ�"
+
+#: ../actions/finishopenidlogin.php:86
+msgid "Connect existing account"
+msgstr "ఇప�పటికే ఉన�న ఖాతాతో అన�సంధానించండి"
+
+#: ../lib/util.php:304 ../lib/util.php:332 lib/util.php:348
+msgid "Contact"
+msgstr "సంప�రదించ�"
+
+#: ../lib/openid.php:178
+#, php-format
+msgid "Could not create OpenID form: %s"
+msgstr "ఓపెన��డీ ఫారమ�న� సృష�టించలేకపోయాం: %s"
+
+#: ../lib/openid.php:160 lib/openid.php:160
+#, php-format
+msgid "Could not redirect to server: %s"
+msgstr ""
+
+#: ../actions/updateprofile.php:161
+msgid "Could not save avatar info"
+msgstr "అవతారప� సమాచారాన�ని భద�రపరచలేక�న�నాం"
+
+#: ../actions/updateprofile.php:154
+msgid "Could not save new profile info"
+msgstr "కొత�త ప�రొఫైల� సమాచారాన�ని భద�రపరచలేక�న�నాం"
+
+#: ../actions/profilesettings.php:146
+msgid "Couldn't confirm email."
+msgstr "ఈమెయిల�ని నిర�ధారించలేక�న�నాం."
+
+#: ../actions/finishremotesubscribe.php:99
+#: actions/finishremotesubscribe.php:101
+msgid "Couldn't convert request tokens to access tokens."
+msgstr ""
+
+#: ../actions/subscribe.php:59
+msgid "Couldn't create subscription."
+msgstr "చందాని సృష�టించలేకపోయాం."
+
+#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
+msgid "Couldn't delete email confirmation."
+msgstr "ఈమెయిల� నిర�ధారణని తొలగించలేక�న�నాం."
+
+#: ../actions/unsubscribe.php:56
+msgid "Couldn't delete subscription."
+msgstr "చందాని తొలగించలేకపోయాం."
+
+#: ../actions/remotesubscribe.php:125 ../actions/remotesubscribe.php:127
+#: actions/remotesubscribe.php:136
+msgid "Couldn't get a request token."
+msgstr ""
+
+#: ../actions/imsettings.php:178
+msgid "Couldn't insert confirmation code."
+msgstr "నిర�ధారణ సంకేతాన�ని చేర�చలేకపోయాం."
+
+#: ../actions/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182
+msgid "Couldn't insert new subscription."
+msgstr ""
+
+#: ../actions/profilesettings.php:175
+msgid "Couldn't save profile."
+msgstr "ప�రొఫైల�ని భద�రపరచలేక�న�నాం."
+
+#: ../actions/confirmaddress.php:70 ../actions/imsettings.php:129
+#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
+msgid "Couldn't update user."
+msgstr "వాడ�కరిని తాజాకరించలేక�న�నాం."
+
+#: ../actions/finishopenidlogin.php:84
+msgid "Create"
+msgstr "సృష�టించ�"
+
+#: ../actions/finishopenidlogin.php:70
+msgid "Create a new user with this nickname."
+msgstr "ఈ పేర�తో కొత�త వాడ�కరిని సృష�టించ�"
+
+#: ../actions/finishopenidlogin.php:68
+msgid "Create new account"
+msgstr "కొత�త ఖాతా సృష�టించ�కోండి"
+
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+msgid "Creating new account for OpenID that already has a user."
+msgstr ""
+
+#: ../actions/imsettings.php:45
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "ప�రస�త�తం నిర�ధారించిన Jabber/GTalk చిర�నామా"
+
+#: ../actions/showstream.php:337
+msgid "Currently"
+msgstr "ప�రస�త�తం"
+
+#: ../lib/util.php:893 ../lib/util.php:1061 lib/util.php:1110
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr ""
+
+#: ../actions/profilesettings.php:54
+msgid "Describe yourself and your interests in 140 chars"
+msgstr "మీ గ�రించి మరియ� మీ ఆసక�త�ల గ�రించి 140 అక�షరాల�లో చెప�పండి"
+
+#: ../actions/register.php:181
+msgid "Email"
+msgstr "ఈమెయిల�"
+
+#: ../actions/profilesettings.php:46
+msgid "Email address"
+msgstr "ఈమెయిల� చిర�నామా"
+
+#: ../actions/profilesettings.php:102 ../actions/register.php:63
+msgid "Email address already exists."
+msgstr "ఈమెయిల� చిర�నామా ఇప�పటికే ఉంది."
+
+#: ../lib/mail.php:82
+msgid "Email address confirmation"
+msgstr "ఈమెయిల� చిర�నామా నిర�ధారణ"
+
+#: ../actions/recoverpassword.php:176
+msgid "Enter a nickname or email address."
+msgstr "పేర� లేదా ఈమెయిల� చిర�నామా ఇవ�వండి."
+
+#: ../actions/userauthorization.php:136 ../actions/userauthorization.php:137
+#: actions/userauthorization.php:144
+msgid "Error authorizing token"
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:282
+msgid "Error connecting user to OpenID."
+msgstr "వాడ�కరిని ఓపెన��డీకి అన�సంధానించటంలో పొరపాట�."
+
+#: ../actions/finishaddopenid.php:78
+msgid "Error connecting user."
+msgstr "వాడ�కరిని అన�సంధానించడంలో పొరపాట�."
+
+#: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153
+#, fuzzy
+msgid "Error inserting avatar"
+msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"అవతారాన�ని పెట�టడంలో "
+"పొరపాట�\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/finishremotesubscribe.php:143
+msgid "Error inserting new profile"
+msgstr "కొత�త ప�రొపైల�ని చేర�చటంలో పొరపాట�"
+
+#: ../actions/postnotice.php:88
+msgid "Error inserting notice"
+msgstr "సందేశాన�ని చేర�చటంలో పొరపాట�"
+
+#: ../actions/finishremotesubscribe.php:167
+msgid "Error inserting remote profile"
+msgstr "దూరప� ప�రొపైల�ని చేర�చటంలో పొరపాట�"
+
+#: ../actions/recoverpassword.php:201
+msgid "Error saving address confirmation."
+msgstr "చిర�నామా నిర�ధారణని భద�రపరచడంలో పొరపాట�."
+
+#: ../actions/userauthorization.php:139
+msgid "Error saving remote profile"
+msgstr "దూరప� ప�రొఫైల�ని భద�రపరచడంలో పొరపాట�"
+
+#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
+msgid "Error saving the profile."
+msgstr "ప�రొఫైల�ని భద�రపరచడంలో పొరపాట�."
+
+#: ../lib/openid.php:237
+msgid "Error saving the user."
+msgstr "వాడ�కరిని భద�రపరచడంలో పొరపాట�."
+
+#: ../actions/password.php:80
+msgid "Error saving user; invalid."
+msgstr "వాడ�కరిని భద�రపరచడంలో పొరపాట�: సరికాద�."
+
+#: ../actions/login.php:43 ../actions/login.php:69
+#: ../actions/recoverpassword.php:268 ../actions/register.php:73
+#: ../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
+msgid "Error setting user."
+msgstr ""
+
+#: ../actions/finishaddopenid.php:83
+msgid "Error updating profile"
+msgstr "ప�రొపైల�ని తాజాకరించటంలో పొరపాట�"
+
+#: ../actions/finishremotesubscribe.php:161
+msgid "Error updating remote profile"
+msgstr "దూరప� ప�రొపైల�ని తాజాకరించటంలో పొరపాట�"
+
+#: ../actions/recoverpassword.php:79
+msgid "Error with confirmation code."
+msgstr "నిర�ధారణ సంకేతంలో పొరపాట�."
+
+#: ../actions/finishopenidlogin.php:89
+msgid "Existing nickname"
+msgstr "ప�రస�త�త పేర�"
+
+#: ../lib/util.php:298 ../lib/util.php:326 lib/util.php:342
+#, fuzzy
+msgid "FAQ"
+msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"తవసం\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/avatar.php:115
+msgid "Failed updating avatar."
+msgstr "అవతారప� తాజాకరణ విఫలమైంది."
+
+#: ../actions/all.php:61 ../actions/allrss.php:74
+#, php-format
+msgid "Feed for friends of %s"
+msgstr "%s యొక�క మిత�ర�ల ఫీడ�"
+
+#: ../actions/replies.php:61 ../actions/repliesrss.php:80
+#, php-format
+msgid "Feed for replies to %s"
+msgstr "%sకి వచ�చిన స�పందనల ఫీడ�"
+
+#: ../actions/login.php:118
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr ""
+"భద�రతా కారణాల దృష�ట�యా, "
+"అమరికల� మార�చే మ�ంద� మీ వాడ�కరి పేర�ని మరియ� సంకేతపదాన�ని మరోసారి ఇవ�వండి."
+
+#: ../actions/profilesettings.php:44
+msgid "Full name"
+msgstr "పూర�తి పేర�"
+
+#: ../actions/profilesettings.php:90 ../actions/updateprofile.php:92
+msgid "Full name is too long (max 255 chars)."
+msgstr "పూర�తి పేర� చాలా పెద�దగా ఉంది (గరిష�ఠంగా 255 అక�షరాల�)."
+
+#: ../lib/util.php:279
+msgid "Help"
+msgstr "సహాయం"
+
+#: ../lib/util.php:274 ../lib/util.php:298 lib/util.php:314
+#, fuzzy
+msgid "Home"
+msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"వాకిలి\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/profilesettings.php:49 ../actions/profilesettings.php:46
+#: ../actions/register.php:167 actions/profilesettings.php:79
+#: actions/register.php:181
+#, fuzzy
+msgid "Homepage"
+msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"హోమ� పేజీ\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/profilesettings.php:87
+msgid "Homepage is not a valid URL."
+msgstr "హోమ� పేజీ URL సరైనది కాద�."
+
+#: ../actions/imsettings.php:61
+msgid "IM Address"
+msgstr "IM చిర�నామా"
+
+#: ../actions/imsettings.php:33
+msgid "IM Settings"
+msgstr "IM అమరికల�"
+
+#: ../actions/finishopenidlogin.php:88
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your OpenID."
+msgstr ""
+"మీక� ఇప�పటికే ఖాతా ఉంటే, మీ "
+"వాడ�కరిపేర� మరియ� సంకేతపదంతో లోనికి ప�రవేశించి మీ ఓపెన��డీని మీ ఖాతాకి జతచేస�కోండి."
+
+#: ../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 ""
+
+#: ../actions/recoverpassword.php:122
+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 ""
+"మీర� మీ సంకేతపదాన�ని "
+"మర�చిపోతే, మీ ఖాతాలో భద�రపరచిన ఈమెయిల�కి కొత�తదాన�ని పంపించ�కోవచ�చ�."
+
+#: ../actions/password.php:69
+msgid "Incorrect old password"
+msgstr "పాత సంకేతపదం తప�ప�"
+
+#: ../actions/login.php:63
+msgid "Incorrect username or password."
+msgstr "వాడ�కరిపేర� లేదా సంకేతపదం తప�ప�."
+
+#: ../actions/recoverpassword.php:226
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr ""
+"మీ సంకేతపదాన�ని తిరిగి "
+"పొందడానికై అవసరమైన సూచనలని మీ ఖాతాతో నమోదైన ఈమెయిల� చిర�నామాకి పంపించాం."
+
+#: ../actions/updateprofile.php:113
+#, php-format
+msgid "Invalid avatar URL '%s'"
+msgstr "'%s' అనే అవతారప� URL తప�ప�"
+
+#: ../actions/updateprofile.php:97
+#, php-format
+msgid "Invalid homepage '%s'"
+msgstr "'%s' అనే హోమ� పేజీ సరైనదికాద�"
+
+#: ../actions/updateprofile.php:81
+#, php-format
+msgid "Invalid license URL '%s'"
+msgstr "తప�ప�డ� లైసెన�స� URL '%s'"
+
+#: ../actions/postnotice.php:61
+msgid "Invalid notice content"
+msgstr "సందేశప� విషయం సరైనది కాద�"
+
+#: ../actions/postnotice.php:67
+msgid "Invalid notice uri"
+msgstr "సందేశప� URI తప�ప�"
+
+#: ../actions/postnotice.php:72
+msgid "Invalid notice url"
+msgstr "సందేశప� URL తప�ప�"
+
+#: ../actions/updateprofile.php:86
+#, php-format
+msgid "Invalid profile URL '%s'."
+msgstr "ప�రొపైల� URL '%s' తప�ప�."
+
+#: ../actions/remotesubscribe.php:96
+msgid "Invalid profile URL (bad format)"
+msgstr "ప�రొపైల� URL తప�ప� (చెడ� ఫార�మాట�)"
+
+#: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79
+msgid "Invalid profile URL returned by server."
+msgstr ""
+
+#: ../actions/avatarbynickname.php:37
+msgid "Invalid size."
+msgstr "తప�ప�డ� పరిమాణం."
+
+#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
+#: ../actions/register.php:84
+msgid "Invalid username or password."
+msgstr "వాడ�కరిపేర� లేదా సంకేతపదం తప�ప�."
+
+#: ../lib/util.php:237 ../lib/util.php:261 lib/util.php:277
+#, 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 ""
+
+#: ../actions/imsettings.php:164
+msgid "Jabber ID already belongs to another user."
+msgstr "Jabber ID ఇప�పటికే వేరొకరికి ఉంది."
+
+#: ../actions/imsettings.php:63 ../actions/imsettings.php:62
+#: actions/imsettings.php:63
+#, 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 ""
+
+#: ../actions/profilesettings.php:55
+msgid "Location"
+msgstr "ప�రాంతం"
+
+#: ../actions/profilesettings.php:96 ../actions/updateprofile.php:107
+msgid "Location is too long (max 255 chars)."
+msgstr "ప�రాంతం పేర� మరీ పెద�దగా ఉంది (255 అక�షరాల� గరిష�ఠం)."
+
+#: ../actions/login.php:93 ../actions/login.php:102
+#: ../actions/openidlogin.php:68 ../lib/util.php:286
+msgid "Login"
+msgstr "ప�రవేశించండి"
+
+#: ../actions/openidlogin.php:44
+#, php-format
+msgid "Login with an [OpenID](%%doc.openid%%) account."
+msgstr "[ఓపెన��డీ](%%doc.openid%%) ఖాతాతో ప�రవేశించండి."
+
+#: ../actions/login.php:122 ../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 ""
+
+#: ../lib/util.php:284
+msgid "Logout"
+msgstr "నిష�క�రమించ�"
+
+#: ../actions/login.php:106
+msgid "Lost or forgotten password?"
+msgstr "మీ సంకేతపదం మర�చిపోయారా?"
+
+#: ../actions/showstream.php:281
+msgid "Member since"
+msgstr "సభ�య�లైన తేదీ"
+
+#: ../actions/userrss.php:70 actions/userrss.php:67
+#, php-format
+#, fuzzy
+msgid "Microblog by %s"
+msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"%s యొక�క మైక�రోబ�లాగ�\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
+#: ../actions/register.php:188 actions/finishopenidlogin.php:85
+#: actions/register.php:202
+msgid "My text and files are available under "
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:71
+msgid "New nickname"
+msgstr "కొత�త పేర�"
+
+#: ../actions/newnotice.php:100
+msgid "New notice"
+msgstr "కొత�త సందేశం"
+
+#: ../actions/password.php:41 ../actions/recoverpassword.php:164
+msgid "New password"
+msgstr "కొత�త సంకేతపదం"
+
+#: ../actions/recoverpassword.php:275
+msgid "New password successfully saved. You are now logged in."
+msgstr "మీ కొత�త సంకేతపదం భద�రమైంది. మీర� ఇప�ప�డ� లోనికి ప�రవేశించార�."
+
+#: ../actions/login.php:97 ../actions/profilesettings.php:41
+#: ../actions/register.php:175
+msgid "Nickname"
+msgstr "పేర�"
+
+#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:99
+#: ../actions/register.php:59
+msgid "Nickname already in use. Try another one."
+msgstr "ఆ పేర�ని ఇప�పటికే వాడ�త�న�నార�. మరోటి ప�రయత�నించండి."
+
+#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:80
+#: ../actions/register.php:57 ../actions/updateprofile.php:76
+#: ../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
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:170
+msgid "Nickname not allowed."
+msgstr "ఆ పేర�ని అన�మతించమ�."
+
+#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
+msgid "Nickname of the user you want to follow"
+msgstr ""
+
+#: ../actions/recoverpassword.php:147
+msgid "Nickname or email"
+msgstr "పేర� లేదా ఈమెయిల�"
+
+#: ../actions/imsettings.php:147
+msgid "No Jabber ID."
+msgstr "Jabber ID లేద�."
+
+#: ../actions/userauthorization.php:128 ../actions/userauthorization.php:129
+#: actions/userauthorization.php:136
+msgid "No authorization request!"
+msgstr ""
+
+#: ../actions/confirmaddress.php:33
+msgid "No confirmation code."
+msgstr "నిర�ధారణ సంకేతం లేద�."
+
+#: ../actions/newnotice.php:49
+msgid "No content!"
+msgstr "విషయం లేద�!"
+
+#: ../actions/userbyid.php:27
+msgid "No id."
+msgstr "�డీ లేద�."
+
+#: ../actions/finishremotesubscribe.php:65
+msgid "No nickname provided by remote server."
+msgstr "దూరప� సర�వర� పేర�ని ఇవ�వలేద�."
+
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
+#, fuzzy
+msgid "No nickname."
+msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"పేర� లేద�.\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../actions/imsettings.php:197
+msgid "No pending confirmation to cancel."
+msgstr "రద�ద�చేయడానికి వేచివ�న�న నిర�ధారణలేమీ లేవ�."
+
+#: ../actions/finishremotesubscribe.php:72
+#: actions/finishremotesubscribe.php:74
+msgid "No profile URL returned by server."
+msgstr ""
+
+#: ../actions/recoverpassword.php:189
+msgid "No registered email address for that user."
+msgstr "ఈ వాడ�కరికై నమోదైన ఈమెయిల� చిర�నామాల� �మీ లేవ�."
+
+#: ../actions/userauthorization.php:48
+msgid "No request found!"
+msgstr "అభ�యర�థనలేమీ కనబడలేద�!"
+
+#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
+msgid "No results"
+msgstr "ఫలితాలేమీ లేవ�"
+
+#: ../actions/avatarbynickname.php:32
+msgid "No size."
+msgstr "పరిమాణం లేద�."
+
+#: ../actions/openidsettings.php:135
+msgid "No such OpenID."
+msgstr "అట�వంటి ఓపెన��డీ లేద�."
+
+#: ../actions/doc.php:29
+msgid "No such document."
+msgstr "అట�వంటి పత�రమేమీ లేద�."
+
+#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
+msgid "No such notice."
+msgstr "అట�వంటి సందేశమేమీ లేద�."
+
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
+msgid "No such recovery code."
+msgstr ""
+
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
+msgid "No such subscription"
+msgstr ""
+
+#: ../actions/all.php:34 ../actions/allrss.php:35
+#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:36
+#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
+#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
+#: ../actions/showstream.php:95 ../actions/subscribe.php:43
+#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
+#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
+msgid "No such user."
+msgstr "అట�వంటి వాడ�కరి లేర�."
+
+#: ../lib/gallery.php:76 ../lib/gallery.php:80 lib/gallery.php:85
+msgid "Nobody to show!"
+msgstr ""
+
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
+msgid "Not a recovery code."
+msgstr ""
+
+#: ../actions/imsettings.php:158
+msgid "Not a valid Jabber ID"
+msgstr "సరైన Jabber �డీ కాద�"
+
+#: ../lib/openid.php:131
+msgid "Not a valid OpenID."
+msgstr "సరైన ఓపెన��డీ కాద�."
+
+#: ../actions/profilesettings.php:75 ../actions/register.php:53
+msgid "Not a valid email address."
+msgstr "సరైన ఈమెయిల� చిర�నామా కాద�:"
+
+#: ../actions/profilesettings.php:83 ../actions/register.php:61
+msgid "Not a valid nickname."
+msgstr "సరైన పేర� కాద�."
+
+#: ../actions/remotesubscribe.php:118 ../actions/remotesubscribe.php:120
+#: actions/remotesubscribe.php:129
+msgid "Not a valid profile URL (incorrect services)."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:111 ../actions/remotesubscribe.php:113
+#: actions/remotesubscribe.php:122
+msgid "Not a valid profile URL (no XRDS defined)."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
+msgid "Not a valid profile URL (no YADIS document)."
+msgstr ""
+
+#: ../actions/avatar.php:95
+msgid "Not an image or corrupt file."
+msgstr "బొమ�మ కాద� లేదా పాడైపోయిన ఫైల�."
+
+#: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53
+msgid "Not authorized."
+msgstr ""
+
+#: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38
+msgid "Not expecting this response!"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
+#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
+#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+msgid "Not logged in."
+msgstr "లోనికి ప�రవేశించలేద�."
+
+#: ../actions/unsubscribe.php:43 ../lib/subs.php:91 lib/subs.php:104
+msgid "Not subscribed!."
+msgstr ""
+
+#: ../actions/showstream.php:82
+#, php-format
+msgid "Notice feed for %s"
+msgstr "%s యొక�క సందేశమ�ల ఫీడ�"
+
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+msgid "Notice has no profile"
+msgstr ""
+
+#: ../actions/showstream.php:297
+msgid "Notices"
+msgstr "సందేశాల�"
+
+#: ../actions/password.php:39
+msgid "Old password"
+msgstr "పాత సంకేతపదం"
+
+#: ../lib/util.php:288
+msgid "OpenID"
+msgstr "ఓపెన��డీ"
+
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
+#, fuzzy
+msgid "OpenID Account Setup"
+msgstr ""
+"#-#-#-#-#  laconica.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"ఓపెన��డీ ఖాతా అమర�ప�\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+
+#: ../lib/openid.php:180 lib/openid.php:180
+msgid "OpenID Auto-Submit"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
+#: ../actions/openidlogin.php:60
+msgid "OpenID Login"
+msgstr "ఓపెన��డీ ప�రవేశం"
+
+#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
+msgid "OpenID URL"
+msgstr "ఓపెన��డీ URL"
+
+#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
+msgid "OpenID authentication cancelled."
+msgstr "ఓపెన��డీ అధీకరణ రద�ద� చేయబడింది."
+
+#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#, php-format
+msgid "OpenID authentication failed: %s"
+msgstr "ఓపెన��డీ అధీకరణ విఫలమైంది: %s"
+
+#: ../lib/openid.php:133
+#, php-format
+msgid "OpenID failure: %s"
+msgstr "ఓపెన��డీ వైఫల�యం: %s"
+
+#: ../actions/openidsettings.php:144
+msgid "OpenID removed."
+msgstr "ఓపెన��డీని తొలగించాం."
+
+#: ../actions/openidsettings.php:37
+msgid "OpenID settings"
+msgstr "ఓపెన��డీ అమరికల�"
+
+#: ../actions/avatar.php:84
+msgid "Partial upload."
+msgstr "పాక�షిక ఎగ�మతి."
+
+#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
+#: ../actions/register.php:177
+msgid "Password"
+msgstr "సంకేతపదం"
+
+#: ../actions/recoverpassword.php:249
+msgid "Password and confirmation do not match."
+msgstr "సంకేతపదం మరియ� నిర�ధారణ సరిపోలేద�."
+
+#: ../actions/recoverpassword.php:245
+msgid "Password must be 6 chars or more."
+msgstr "సంకేతపదం 6 లేదా అంతకంటే ఎక�కవ అక�షరాల�ండాలి."
+
+#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
+msgid "Password recovery requested"
+msgstr ""
+
+#: ../actions/password.php:89 ../actions/recoverpassword.php:274
+msgid "Password saved."
+msgstr "సంకేతపదం భద�రమయ�యింది."
+
+#: ../actions/password.php:61 ../actions/register.php:65
+msgid "Passwords don't match."
+msgstr "సంకేతపదాల� సరిపోలలేద�."
+
+#: ../actions/peoplesearch.php:33
+msgid "People search"
+msgstr "వ�యక�త�ల అన�వేషణ"
+
+#: ../lib/stream.php:44
+msgid "Personal"
+msgstr "వ�యక�తిగత"
+
+#: ../actions/userauthorization.php:77 ../actions/userauthorization.php:78
+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 \"Cancel\"."
+msgstr ""
+
+#: ../actions/imsettings.php:74 ../actions/imsettings.php:73
+#: actions/imsettings.php:74
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr ""
+
+#: ../actions/imsettings.php:68
+msgid "Preferences"
+msgstr "అభిర�చ�ల�"
+
+#: ../actions/imsettings.php:135
+msgid "Preferences saved."
+msgstr "అభిర�చ�ల� భద�రమయ�యాయి."
+
+#: ../lib/util.php:300
+msgid "Privacy"
+msgstr "అంతరంగికత"
+
+#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
+msgid "Problem saving notice."
+msgstr "సందేశాన�ని భద�రపరచడంలో పొరపాట�."
+
+#: ../lib/stream.php:54
+msgid "Profile"
+msgstr "ప�రొఫైల�"
+
+#: ../actions/remotesubscribe.php:73
+msgid "Profile URL"
+msgstr "ప�రొఫైల� URL"
+
+#: ../actions/profilesettings.php:34
+msgid "Profile settings"
+msgstr "ఫ�రొఫైల� అమరికల�"
+
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
+msgid "Profile unknown"
+msgstr "అజ�ఞాత ప�రొఫైల�"
+
+#: ../lib/util.php:276
+msgid "Public"
+msgstr "ప�రజా"
+
+#: ../actions/public.php:54
+msgid "Public Stream Feed"
+msgstr "ప�రజా వాహిని ఫీడ�"
+
+#: ../actions/public.php:33
+msgid "Public timeline"
+msgstr "ప�రజా కాలరేఖ"
+
+#: ../actions/recoverpassword.php:151 ../actions/recoverpassword.php:166
+#: actions/recoverpassword.php:171
+msgid "Recover"
+msgstr ""
+
+#: ../actions/recoverpassword.php:141 ../actions/recoverpassword.php:156
+#: actions/recoverpassword.php:161
+msgid "Recover password"
+msgstr ""
+
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
+msgid "Recovery code for unknown user."
+msgstr ""
+
+#: ../actions/register.php:171 ../actions/register.php:195 ../lib/util.php:287
+msgid "Register"
+msgstr "నమోద�"
+
+#: ../actions/userauthorization.php:119
+msgid "Reject"
+msgstr "తిరస�కరించ�"
+
+#: ../actions/login.php:99 ../actions/register.php:183
+msgid "Remember me"
+msgstr "నన�న� గ�ర�త�ంచ�కో"
+
+#: ../actions/updateprofile.php:69 ../actions/updateprofile.php:70
+#: actions/updateprofile.php:71
+msgid "Remote profile with no matching profile"
+msgstr ""
+
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+msgid "Remote subscribe"
+msgstr ""
+
+#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+msgid "Remove"
+msgstr "తొలగించ�"
+
+#: ../actions/openidsettings.php:68
+msgid "Remove OpenID"
+msgstr "ఓపెన��డీని తొలగించండి"
+
+#: ../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 ""
+"మీక�న�న ఒకే ఓపెన��డీని "
+"తొలగిస�తే మీర� లోనికి ప�రవేశించడం అసాధ�యమవవచ�చ�. మీర� దాన�ని తొలగించాలన�క�ంటే, మ�ంద� వేరే ఓపెన��డీని చేర�చండి."
+
+#: ../lib/stream.php:49
+msgid "Replies"
+msgstr "స�పందనల�"
+
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
+#, php-format
+msgid "Replies to %s"
+msgstr "%sకి స�పందనల�"
+
+#: ../actions/recoverpassword.php:168 ../actions/recoverpassword.php:183
+#: actions/recoverpassword.php:189
+msgid "Reset"
+msgstr ""
+
+#: ../actions/recoverpassword.php:158 ../actions/recoverpassword.php:173
+#: actions/recoverpassword.php:178
+msgid "Reset password"
+msgstr ""
+
+#: ../actions/recoverpassword.php:167 ../actions/register.php:180
+msgid "Same as password above"
+msgstr "పై సంకేతపదం వలెనే"
+
+#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
+msgid "Save"
+msgstr "భద�రపరచ�"
+
+#: ../lib/searchaction.php:73 ../lib/util.php:277
+msgid "Search"
+msgstr "వెత�క�"
+
+#: ../actions/noticesearch.php:80
+msgid "Search Stream Feed"
+msgstr "అన�వేషణ వాహిని ఫీడ�"
+
+#: ../actions/noticesearch.php:30
+#, 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 ""
+"%%site.name%%లోని సందేశాలన� వెతకండి. "
+"అన�వేషణ పదాలన� ఖాళీలతో వేర�చేయండి; ఒక�కో పదంలో 3 లేదా అంతకంటే ఎక�క�వ అక�షరాల� ఉండాలి."
+
+#: ../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 ""
+"%%site.name%%లో వ�యక�త�లన� వారి "
+"పేర�, ప�రాంతం, లేదా "
+"ఆసక�త�లన� బట�టి వెతకండి. అన�వేషించే పదాలన� ఖాళీలతో వేర�చేయండి; ఒక�కో పదంలో 3 లేదా అంతకంటే ఎక�క�వ అక�షరాల� ఉండాలి."
+
+#: ../lib/util.php:982
+msgid "Send"
+msgstr "పంపించ�"
+
+#: ../actions/imsettings.php:71 ../actions/imsettings.php:70
+#: actions/imsettings.php:71
+msgid "Send me notices through Jabber/GTalk."
+msgstr ""
+
+#: ../lib/util.php:282
+msgid "Settings"
+msgstr "అమరికల�"
+
+#: ../actions/profilesettings.php:183
+msgid "Settings saved."
+msgstr "అమరికల� భద�రమయ�యాయి."
+
+#: ../actions/finishaddopenid.php:66
+msgid "Someone else already has this OpenID."
+msgstr "ఈ ఓపెన��డీని ఇప�పటికే ఎవరో వాడ�త�న�నార�."
+
+#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
+msgid "Something weird happened."
+msgstr "జరగకూడనిదేదో జరిగింది."
+
+#: ../lib/util.php:302
+msgid "Source"
+msgstr "మూలమ�"
+
+#: ../actions/showstream.php:277
+msgid "Statistics"
+msgstr "గణాంకాల�"
+
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../actions/finishopenidlogin.php:246 actions/finishopenidlogin.php:188
+#: actions/finishopenidlogin.php:252
+msgid "Stored OpenID not found."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
+#: ../actions/showstream.php:181 ../actions/showstream.php:188
+#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
+#: actions/showstream.php:197 actions/showstream.php:206
+msgid "Subscribe"
+msgstr ""
+
+#: ../actions/showstream.php:294 ../actions/subscribers.php:27
+msgid "Subscribers"
+msgstr "చందాదార�ల�"
+
+#: ../actions/userauthorization.php:309 ../actions/userauthorization.php:310
+#: actions/userauthorization.php:322
+msgid "Subscription authorized"
+msgstr ""
+
+#: ../actions/userauthorization.php:319
+msgid "Subscription rejected"
+msgstr "చందాని తిరస�కరించార�."
+
+#: ../actions/showstream.php:212 ../actions/showstream.php:288
+#: ../actions/subscriptions.php:27
+msgid "Subscriptions"
+msgstr "చందాల�"
+
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
+msgid "System error uploading file."
+msgstr ""
+
+#: ../actions/noticesearch.php:34
+msgid "Text search"
+msgstr "పాఠ�య అన�వేషణ"
+
+#: ../actions/openidsettings.php:140
+msgid "That OpenID does not belong to you."
+msgstr "ఆ ఓపెన��డీ మీది కాద�."
+
+#: ../actions/confirmaddress.php:52
+msgid "That address has already been confirmed."
+msgstr "ఆ చిర�నామా ఇప�పటికే నిర�ధారితమైంది."
+
+#: ../actions/confirmaddress.php:43
+msgid "That confirmation code is not for you!"
+msgstr "ఆ నిర�ధారణా సంకేతం మీది కాద�!"
+
+#: ../actions/avatar.php:80
+msgid "That file is too big."
+msgstr "ఆ ఫైల� చాలా పెద�దగా ఉంది."
+
+#: ../actions/imsettings.php:161
+msgid "That is already your Jabber ID."
+msgstr "ఈ Jabber ID మీక� ఇప�పటికే ఉంది"
+
+#: ../actions/imsettings.php:224
+msgid "That is not your Jabber ID."
+msgstr "ఇది మీ Jabber ID కాద�"
+
+#: ../actions/imsettings.php:201
+msgid "That is the wrong IM address."
+msgstr "ఆ IM చిర�నామా సరైనది కాద�."
+
+#: ../actions/newnotice.php:52
+msgid "That's too long. Max notice size is 140 chars."
+msgstr "ఇది చాలా పొడవ�ంది. గరిష�ఠ సందేశ పరిమాణం 140 అక�షరాల�."
+
+#: ../actions/confirmaddress.php:86
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "\"%s\" అనే చిర�నామా మీ ఖాతాకి నిర�ధారితమైంది."
+
+#: ../actions/imsettings.php:241
+msgid "The address was removed."
+msgstr "ఆ చిర�నామాని తొలగించాం."
+
+#: ../actions/userauthorization.php:311 ../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 ""
+
+#: ../actions/userauthorization.php:321 ../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 ""
+
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#, php-format
+msgid "These are the people who listen to %s's notices."
+msgstr ""
+
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
+msgid "These are the people who listen to your notices."
+msgstr ""
+
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#, php-format
+msgid "These are the people whose notices %s listens to."
+msgstr ""
+
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+msgid "These are the people whose notices you listen to."
+msgstr ""
+
+#: ../actions/recoverpassword.php:87
+msgid "This confirmation code is too old. Please start again."
+msgstr "ఈ నిర�ధారణ సంకేతం చాలా పాతది. మళ�ళీ మొదల�పెట�టండి."
+
+#: ../lib/openid.php:195
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
+#, php-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../lib/util.php:147 ../lib/util.php:164 lib/util.php:246
+msgid "This page is not available in a media type you accept"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/profilesettings.php:51
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "మీ హోమ� పేజీ, బ�లాగ�, లేదా వేరే సేట�లోని మీ ప�రొఫైల� యొక�క చిర�నామా"
+
+#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
+msgid "URL of your profile on another compatible microblogging service"
+msgstr ""
+
+#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
+#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
+#: ../actions/smssettings.php:135 actions/emailsettings.php:144
+#: actions/imsettings.php:118 actions/recoverpassword.php:39
+#: actions/smssettings.php:143 actions/twittersettings.php:108
+msgid "Unexpected form submission."
+msgstr ""
+
+#: ../actions/recoverpassword.php:237 ../actions/recoverpassword.php:276
+#: actions/recoverpassword.php:289
+msgid "Unexpected password reset."
+msgstr ""
+
+#: ../actions/finishremotesubscribe.php:58
+#: actions/finishremotesubscribe.php:60
+msgid "Unknown version of OMB protocol."
+msgstr ""
+
+#: ../lib/util.php:245 ../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 ""
+
+#: ../actions/confirmaddress.php:48
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr "గ�ర�త�తెలియని చిర�నామా రకం %s"
+
+#: ../actions/showstream.php:193 ../actions/showstream.php:209
+#: actions/showstream.php:219
+msgid "Unsubscribe"
+msgstr ""
+
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
+#: ../actions/updateprofile.php:45 actions/postnotice.php:45
+#: actions/updateprofile.php:46
+msgid "Unsupported OMB version"
+msgstr ""
+
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+msgid "Unsupported image file format."
+msgstr ""
+
+#: ../actions/avatar.php:68
+msgid "Upload"
+msgstr "ఎగ�మతించ�"
+
+#: ../actions/avatar.php:27
+msgid ""
+"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 license, also. Use a picture that belongs to you and that you want to "
+"share."
+msgstr ""
+
+#: ../actions/profilesettings.php:48 ../actions/register.php:182
+msgid "Used only for updates, announcements, and password recovery"
+msgstr ""
+"తాజా విశేషాల�, ప�రకటనల�, "
+"మరియ� సంకేతపదం పోయినప�ప�డ� మాత�రమే ఉపయోగిస�తాం."
+
+#: ../actions/finishremotesubscribe.php:86
+#: actions/finishremotesubscribe.php:88
+msgid "User being listened to doesn't exist."
+msgstr ""
+
+#: ../actions/all.php:41 ../actions/avatarbynickname.php:48
+#: ../actions/foaf.php:43 ../actions/replies.php:41
+#: ../actions/showstream.php:44
+msgid "User has no profile."
+msgstr "వాడ�కరికి ప�రొఫైల� లేద�."
+
+#: ../actions/remotesubscribe.php:71
+msgid "User nickname"
+msgstr "వాడ�కరి పేర�"
+
+#: ../lib/util.php:969
+#, php-format
+msgid "What's up, %s?"
+msgstr "%s, సంగత�లేమిటి?"
+
+#: ../actions/profilesettings.php:57
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "మీర� ఎక�కడ న�ండి, \"నగరం, రాష�ట�రం (లేదా ప�రాంతం), దేశం\""
+
+#: ../actions/updateprofile.php:127
+#, php-format
+msgid "Wrong image type for '%s'"
+msgstr "'%s' కొరక� తప�ప�డ� బొమ�మ రకం"
+
+#: ../actions/updateprofile.php:122 ../actions/updateprofile.php:123
+#: actions/updateprofile.php:124
+#, php-format
+msgid "Wrong size image at '%s'"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:64
+msgid "You already have this OpenID!"
+msgstr "ఈ ఓపెన��డీ మీక� ఇప�పటికే ఉంది!"
+
+#: ../actions/recoverpassword.php:31
+msgid "You are already logged in!"
+msgstr "మీర� ఇప�పటికే లోనికి ప�రవేశించార�!"
+
+#: ../actions/password.php:27
+msgid "You can change your password here. Choose a good one!"
+msgstr "మీ సంకేతపదాన�ని ఇక�కడ మార�చ�కోవచ�చ�. మంచిది ఎంచ�కోండి!"
+
+#: ../actions/register.php:164
+msgid "You can create a new account to start posting notices."
+msgstr "సందేశాల� పంపించడానికి మీర� కొత�త ఖాతా సృష�టించ�కోవచ�చ�."
+
+#: ../actions/openidsettings.php:86
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+"\"తొలగించ�\" అనే బొత�తంపై "
+"నొక�కడం ద�వారా ఒక ఓపెన��డీని మీ ఖాతా న�ండి తొలగించ�కోవచ�చ�."
+
+#: ../actions/imsettings.php:28 actions/imsettings.php:28
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
+msgstr ""
+
+#: ../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
+msgid "You can use the local subscription!"
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
+#: ../actions/register.php:61 actions/finishopenidlogin.php:38
+#: actions/register.php:68
+msgid "You can't register if you don't agree to the license."
+msgstr ""
+
+#: ../actions/updateprofile.php:62 ../actions/updateprofile.php:63
+#: actions/updateprofile.php:64
+msgid "You did not send us that profile"
+msgstr ""
+
+#: ../actions/recoverpassword.php:134
+msgid "You've been identified. Enter a  new password below. "
+msgstr "మిమ�మల�ని గ�ర�తించాం. కొత�త సంకేతపదాన�ని క�రింద ఇవ�వండి."
+
+#: ../actions/openidlogin.php:67
+msgid "Your OpenID URL"
+msgstr "మీ ఓపెన��డీ URL"
+
+#: ../actions/recoverpassword.php:149
+msgid "Your nickname on this server, or your registered email address."
+msgstr "ఈ సర�వర�లో మీ పేర�, లేదా నమౌదైన మీ ఈమెయిల� చిర�నామా."
+
+#: ../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 ""
+"ఒకే వాడ�కరి ఖాతాతో చాలా "
+"సైట�లలోనికి ప�రవేశించే వీల�ని [ఓపెన��డీ](%%doc.openid%%) కల�పిస�త�ంది. మీ ఓపెన��డీలన� ఇక�కడ సంభాళించ�కోండి."
+
+#: ../lib/util.php:814
+msgid "a few seconds ago"
+msgstr "కొన�ని క�షణాల క�రితం"
+
+#: ../lib/util.php:826
+#, php-format
+msgid "about %d days ago"
+msgstr "%d రోజ�ల క�రితం"
+
+#: ../lib/util.php:822
+#, php-format
+msgid "about %d hours ago"
+msgstr "%d గంటల క�రితం"
+
+#: ../lib/util.php:818
+#, php-format
+msgid "about %d minutes ago"
+msgstr "%d నిమిషాల క�రితం"
+
+#: ../lib/util.php:830
+#, php-format
+msgid "about %d months ago"
+msgstr "%d నెలల క�రితం"
+
+#: ../lib/util.php:824
+msgid "about a day ago"
+msgstr "ఓ రోజ� క�రితం"
+
+#: ../lib/util.php:816
+msgid "about a minute ago"
+msgstr "ఓ నిమిషం క�రితం"
+
+#: ../lib/util.php:828
+msgid "about a month ago"
+msgstr "ఓ నెల క�రితం"
+
+#: ../lib/util.php:832
+msgid "about a year ago"
+msgstr "ఒక సంవత�సరం క�రితం"
+
+#: ../lib/util.php:820
+msgid "about an hour ago"
+msgstr "ఒక గంట క�రితం"
+
+#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
+#: ../lib/stream.php:101
+msgid "in reply to..."
+msgstr "దీనికి స�పందనగా..."
+
+#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
+#: ../lib/stream.php:108
+msgid "reply"
+msgstr "స�పందించ�"
+
+#: ../actions/password.php:44
+msgid "same as password above"
+msgstr "పై సంకేతపదం వలెనే"
+
+#: ../lib/util.php:1127
+msgid "« After"
+msgstr "« తర�వాత"
+
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+msgid " from "
+msgstr ""
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
+
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#, php-format
+msgid "%s public timeline"
+msgstr ""
+
+#: ../lib/mail.php:206 lib/mail.php:212
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/register.php:154 actions/register.php:168
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55
+msgid "API method not found!"
+msgstr ""
+
+#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
+#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
+#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
+#: ../actions/twitapidirect_messages.php:49
+#: ../actions/twitapidirect_messages.php:56
+#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
+#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
+#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
+#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
+#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
+#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
+#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
+#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
+#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
+#: actions/twitapistatuses.php:690
+msgid "API method under construction."
+msgstr ""
+
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
+
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for "
+"non-humans)"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
+
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr ""
+
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+msgid "Change email handling"
+msgstr ""
+
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+msgid "Change your profile settings"
+msgstr ""
+
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+msgid "Could not follow user: User not found."
+msgstr ""
+
+#: ../lib/subs.php:54 lib/subs.php:61
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: ../lib/subs.php:46 lib/subs.php:46
+msgid "Could not subscribe."
+msgstr ""
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+msgid "Couldn't update user record."
+msgstr ""
+
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr ""
+
+#: ../classes/Notice.php:72 classes/Notice.php:86
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr ""
+
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr "ఈమెయిల� చిర�నామా"
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr "ఈమెయిల� అమరికల�"
+
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr "ఈమెయిల� చిర�నామా, \"username@example.org\" వలె"
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: ../actions/tag.php:55 actions/tag.php:55
+#, php-format
+msgid "Feed for tag %s"
+msgstr ""
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr ""
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr ""
+
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+msgid "I want to post notices by email."
+msgstr ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+msgid "IM"
+msgstr ""
+
+#: ../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
+msgid "Incoming email"
+msgstr ""
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+msgid "Incoming email address removed."
+msgstr ""
+
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322
+msgid "Invite"
+msgstr "ఆహ�వానించ�"
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Language"
+msgstr "భాష"
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+msgid "Language is too long (max 50 chars)."
+msgstr ""
+
+#: ../actions/register.php:166 actions/register.php:180
+msgid "Longer name, preferably your \"real\" name"
+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 ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr ""
+
+#: ../lib/mail.php:144 lib/mail.php:144
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+msgid "New incoming email address added."
+msgstr ""
+
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+msgid "No"
+msgstr ""
+
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr ""
+
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+msgid "No email address."
+msgstr ""
+
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+msgid "No incoming email address."
+msgstr ""
+
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+msgid "No status with that ID found."
+msgstr ""
+
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+msgid "Not a registered user."
+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
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+msgid "Not found"
+msgstr ""
+
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr ""
+
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
+
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr ""
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr ""
+
+#: ../actions/invite.php:133 actions/invite.php:141
+msgid "Personal message"
+msgstr ""
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Preferred language"
+msgstr ""
+
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/register.php:28 actions/register.php:28
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+msgid "Registration successful"
+msgstr ""
+
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/register.php:156 actions/register.php:170
+msgid "Same as password above. Required."
+msgstr ""
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr ""
+
+#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
+#: actions/emailsettings.php:74 actions/smssettings.php:82
+msgid "Send email to this address to post new notices."
+msgstr ""
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../actions/tag.php:60 actions/tag.php:60
+msgid "Showing most popular tags from the last week"
+msgstr ""
+
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317
+msgid "Tags"
+msgstr ""
+
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
+msgid "Text"
+msgstr "పాఠ�యం"
+
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+msgid "That email address already belongs to another user."
+msgstr "ఆ ఈమెయిల� చిర�నామా ఇప�పటేకే ఇతర వాడ�కరికి సంబంధించినది."
+
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+msgid "That is already your email address."
+msgstr "అది ఇప�పటికే మీ ఈమెయిల� చిర�నామా."
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+msgid "That is not your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+msgid "That is not your phone number."
+msgstr ""
+
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/invite.php:89 actions/invite.php:96
+msgid ""
+"These people are already users and you were automatically subscribed to "
+"them:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511
+msgid "This method requires a POST or 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
+msgid "This method requires a POST."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+msgid "Timezone not selected."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+msgid "Two user ids or screen_names must be supplied."
+msgstr ""
+
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this "
+"service."
+msgstr ""
+
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+msgid "Yes"
+msgstr "అవ�న�"
+
+#: ../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 ""
+
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+msgid "You are not friends with the specified user."
+msgstr ""
+
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr ""
+
+#: ../actions/invite.php:103 actions/invite.php:110
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
+msgstr ""
+
+#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99
+msgid "delete"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+msgid "unsupported file type"
+msgstr ""
+
+#: actions/deletenotice.php:74 actions/disfavor.php:43
+#: actions/emailsettings.php:127 actions/favor.php:45
+#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
+#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
+#: actions/openidsettings.php:123 actions/profilesettings.php:47
+#: actions/recoverpassword.php:282 actions/register.php:42
+#: actions/remotesubscribe.php:40 actions/smssettings.php:124
+#: actions/subscribe.php:44 actions/twittersettings.php:97
+#: actions/unsubscribe.php:41 actions/userauthorization.php:35
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/disfavor.php:55
+msgid "This notice is not a favorite!"
+msgstr ""
+
+#: actions/disfavor.php:63
+msgid "Could not delete favorite."
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Favor"
+msgstr ""
+
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+
+#: actions/emailsettings.php:95
+msgid "Send me email when someone sends me a private message."
+msgstr ""
+
+#: actions/favor.php:53 actions/twitapifavorites.php:142
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132
+msgid "Could not create favorite."
+msgstr ""
+
+#: actions/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#, php-format
+msgid "%s favorite notices"
+msgstr ""
+
+#: actions/favoritesrss.php:64
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr ""
+
+#: actions/inbox.php:28
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+
+#: actions/invite.php:178
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+msgstr ""
+
+#: actions/login.php:104
+msgid "Automatically login in the future; "
+msgstr ""
+
+#: actions/login.php:122
+msgid "For security reasons, please re-enter your "
+msgstr ""
+
+#: actions/login.php:126
+msgid "Login with your username and password. "
+msgstr ""
+
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+msgid "That's too long. Max message size is 140 chars."
+msgstr ""
+
+#: actions/newmessage.php:65
+msgid "No recipient specified."
+msgstr ""
+
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206
+msgid "You can't send a message to this user."
+msgstr ""
+
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly "
+"instead."
+msgstr ""
+
+#: actions/newmessage.php:108
+msgid "No such user"
+msgstr ""
+
+#: actions/newmessage.php:117
+msgid "New message"
+msgstr ""
+
+#: actions/noticesearch.php:95
+msgid "Notice without matching profile"
+msgstr ""
+
+#: actions/openidsettings.php:28
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr ""
+
+#: actions/openidsettings.php:46
+msgid "If you want to add an OpenID to your account, "
+msgstr ""
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr ""
+
+#: actions/openidsettings.php:87
+msgid "You can remove an OpenID from your account "
+msgstr ""
+
+#: actions/outbox.php:28
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr ""
+
+#: actions/outbox.php:30
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#: actions/outbox.php:53
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+
+#: actions/peoplesearch.php:28
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+msgstr ""
+
+#: actions/profilesettings.php:27
+msgid "You can update your personal profile info here "
+msgstr ""
+
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+msgid "User without matching profile"
+msgstr ""
+
+#: actions/recoverpassword.php:91
+msgid "This confirmation code is too old. "
+msgstr ""
+
+#: actions/recoverpassword.php:141
+msgid "If you've forgotten or lost your"
+msgstr ""
+
+#: actions/recoverpassword.php:154
+msgid "You've been identified. Enter a "
+msgstr ""
+
+#: actions/recoverpassword.php:169
+msgid "Your nickname on this server, "
+msgstr ""
+
+#: actions/recoverpassword.php:271
+msgid "Instructions for recovering your password "
+msgstr ""
+
+#: actions/recoverpassword.php:327
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95
+msgid "Password must be 6 or more characters."
+msgstr ""
+
+#: actions/register.php:216
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
+msgstr ""
+
+#: actions/register.php:227
+msgid "(You should receive a message by email momentarily, with "
+msgstr ""
+
+#: actions/remotesubscribe.php:51
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
+msgstr ""
+
+#: actions/showfavorites.php:61
+#, php-format
+msgid "Feed for favorites of %s"
+msgstr ""
+
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+msgid "Could not retrieve favorite notices."
+msgstr ""
+
+#: actions/showmessage.php:33
+msgid "No such message."
+msgstr ""
+
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
+msgstr ""
+
+#: actions/showmessage.php:61
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr ""
+
+#: actions/showmessage.php:66
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr ""
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr ""
+
+#: actions/smssettings.php:312
+#, php-format
+msgid "Mobile carrier for your phone. "
+msgstr ""
+
+#: actions/twitapidirect_messages.php:76
+#, php-format
+msgid "Direct messages to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:77
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:81
+msgid "Direct Messages You've Sent"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:82
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:128
+msgid "No message text!"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:138
+msgid "Recipient user not found."
+msgstr ""
+
+#: actions/twitapidirect_messages.php:141
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
+#: actions/twitapifavorites.php:92
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr ""
+
+#: actions/twitapifavorites.php:95
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr ""
+
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#, php-format
+msgid "%s added your notice as a favorite"
+msgstr ""
+
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+msgstr ""
+
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+msgstr ""
+
+#: actions/twittersettings.php:41
+msgid "Twitter settings"
+msgstr "ట�విట�టర� అమరికల�"
+
+#: actions/twittersettings.php:48
+msgid "Twitter Account"
+msgstr "ట�విట�టర� ఖాతా"
+
+#: actions/twittersettings.php:56
+msgid "Current verified Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr ""
+
+#: actions/twittersettings.php:65
+msgid "No spaces, please."
+msgstr ""
+
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr ""
+
+#: actions/twittersettings.php:72
+msgid "Automatically send my notices to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:75
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:78
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+
+#: actions/twittersettings.php:128
+msgid "Could not verify your Twitter credentials!"
+msgstr ""
+
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+msgid "Unable to save your Twitter settings!"
+msgstr ""
+
+#: actions/twittersettings.php:174
+msgid "Twitter settings saved."
+msgstr ""
+
+#: actions/twittersettings.php:192
+msgid "That is not your Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+msgid "Couldn't remove Twitter user."
+msgstr ""
+
+#: actions/twittersettings.php:212
+msgid "Twitter account removed."
+msgstr ""
+
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+msgid "Couldn't save Twitter preferences."
+msgstr ""
+
+#: actions/twittersettings.php:245
+msgid "Twitter preferences saved."
+msgstr ""
+
+#: actions/userauthorization.php:84
+msgid "Please check these details to make sure "
+msgstr ""
+
+#: actions/userauthorization.php:324
+msgid "The subscription has been authorized, but no "
+msgstr ""
+
+#: actions/userauthorization.php:334
+msgid "The subscription has been rejected, but no "
+msgstr ""
+
+#: classes/Channel.php:113
+msgid "Command results"
+msgstr ""
+
+#: classes/Channel.php:148
+msgid "Command complete"
+msgstr ""
+
+#: classes/Channel.php:158
+msgid "Command failed"
+msgstr ""
+
+#: classes/Command.php:39
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: classes/Command.php:96
+#, php-format
+msgid "Subscriptions: %1$s\n"
+msgstr ""
+
+#: classes/Command.php:125 classes/Command.php:242
+msgid "User has no last notice"
+msgstr ""
+
+#: classes/Command.php:146
+msgid "Notice marked as fave."
+msgstr ""
+
+#: classes/Command.php:166
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr ""
+
+#: classes/Command.php:169
+#, php-format
+msgid "Fullname: %s"
+msgstr "పూర�తిపేర�: %s"
+
+#: classes/Command.php:172
+#, php-format
+msgid "Location: %s"
+msgstr "ప�రాంతం: %s"
+
+#: classes/Command.php:175
+#, php-format
+msgid "Homepage: %s"
+msgstr ""
+
+#: classes/Command.php:178
+#, php-format
+msgid "About: %s"
+msgstr "గ�రించి: %s"
+
+#: classes/Command.php:200
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
+
+#: classes/Command.php:214
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
+
+#: classes/Command.php:216
+msgid "Error sending direct message."
+msgstr ""
+
+#: classes/Command.php:263
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: classes/Command.php:270
+#, php-format
+msgid "Subscribed to %s"
+msgstr ""
+
+#: classes/Command.php:288
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
+
+#: classes/Command.php:295
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr ""
+
+#: classes/Command.php:310 classes/Command.php:330
+msgid "Command not yet implemented."
+msgstr ""
+
+#: classes/Command.php:313
+msgid "Notification off."
+msgstr ""
+
+#: classes/Command.php:315
+msgid "Can't turn off notification."
+msgstr ""
+
+#: classes/Command.php:333
+msgid "Notification on."
+msgstr ""
+
+#: classes/Command.php:335
+msgid "Can't turn on notification."
+msgstr ""
+
+#: classes/Command.php:344
+msgid "Commands:\n"
+msgstr ""
+
+#: classes/Message.php:53
+msgid "Could not insert message."
+msgstr ""
+
+#: classes/Message.php:63
+msgid "Could not update message with new URI."
+msgstr ""
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr ""
+
+#: lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:249
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:253
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+msgstr ""
+
+#: lib/mailbox.php:43
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/openid.php:195
+msgid "This form should automatically submit itself. "
+msgstr ""
+
+#: lib/personal.php:65
+msgid "Favorites"
+msgstr ""
+
+#: lib/personal.php:66
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
+#: lib/personal.php:66
+msgid "User"
+msgstr "వాడ�కరి"
+
+#: lib/personal.php:75
+msgid "Inbox"
+msgstr ""
+
+#: lib/personal.php:76
+msgid "Your incoming messages"
+msgstr "మీక� వచ�చిన సందేశాల�"
+
+#: lib/personal.php:80
+msgid "Outbox"
+msgstr ""
+
+#: lib/personal.php:81
+msgid "Your sent messages"
+msgstr "మీర� పంపిన సందేశాల�"
+
+#: lib/settingsaction.php:99
+msgid "Twitter"
+msgstr ""
+
+#: lib/settingsaction.php:100
+msgid "Twitter integration options"
+msgstr ""
+
+#: lib/util.php:1718
+msgid "To"
+msgstr ""
+
+#: scripts/maildaemon.php:45
+msgid "Could not parse message."
+msgstr ""
diff --git a/locale/tr_TR/LC_MESSAGES/laconica.mo b/locale/tr_TR/LC_MESSAGES/laconica.mo
index 51139d790..f825a89cb 100644
--- a/locale/tr_TR/LC_MESSAGES/laconica.mo
+++ b/locale/tr_TR/LC_MESSAGES/laconica.mo
diff --git a/locale/tr_TR/LC_MESSAGES/laconica.po b/locale/tr_TR/LC_MESSAGES/laconica.po
index a2d51ecc1..275ff72b6 100644
--- a/locale/tr_TR/LC_MESSAGES/laconica.po
+++ b/locale/tr_TR/LC_MESSAGES/laconica.po
@@ -1,8 +1,16 @@
+# #-#-#-#-#  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.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  laconica.po (Laconi.ca Türkçe)  #-#-#-#-#\n"
 "Project-Id-Version: Laconi.ca Türkçe\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-27 14:57-0400\n"
+"POT-Creation-Date: 2008-07-14 21:07+1200\n"
 "PO-Revision-Date: 2008-07-29 12:33+0100\n"
 "Last-Translator: Kemal Yaylali <kemal.yaylali@gmail.com>\n"
 "Language-Team: nedurum.com\n"
@@ -11,70 +19,36 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Turkish\n"
 "X-Poedit-Country: TURKEY\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: ../actions/noticesearchrss.php:64
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr " \"%s\" için arama sonuçları"
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
 msgid ""
-" except this private data: password, email address, IM address, phone number."
+" except this private data: password, email address, IM address, phone "
+"number."
 msgstr ""
 "bu özel veriler haricinde: parola, eposta adresi, IM adresi, telefon "
 "numarası."
 
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-msgid " from "
-msgstr ""
-
-#: ../actions/twitapistatuses.php:478
-#, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr ""
-
-#: ../actions/invite.php:168
-#, fuzzy, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s %2$s'da durumunuzu takip ediyor"
-
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-
-#: ../lib/mail.php:124
+#: ../actions/subscribe.php:84
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s %2$s'da durumunuzu takip ediyor"
 
-#: ../lib/mail.php:126
+#: ../actions/subscribe.php:86
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -88,161 +62,74 @@ msgstr ""
 "\n"
 "\t%3$s\n"
 "\n"
-"Kendisini durumsuz bırakmayın!,\n"
-"%4$s.\n"
-
-#: ../actions/twitapistatuses.php:482
-#, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
+"Kendisini durumsuz bırakmayın!,\n%4$s.\n"
 
 #: ../actions/shownotice.php:45
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s'in %2$s'deki durum mesajları "
 
-#: ../actions/invite.php:84 ../actions/invite.php:92
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:60
 #, php-format
 msgid "%s Public Stream"
 msgstr "%s Genel Durum Mesajları"
 
-#: ../actions/all.php:47 ../actions/allrss.php:60
-#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51
+#: ../actions/all.php:47 ../actions/allrss.php:70 ../lib/stream.php:45
 #, php-format
 msgid "%s and friends"
 msgstr "%s ve arkadaşları"
 
-#: ../actions/twitapistatuses.php:49
-#, fuzzy, php-format
-msgid "%s public timeline"
-msgstr "Genel zaman çizgisi"
-
-#: ../lib/mail.php:206
-#, fuzzy, php-format
-msgid "%s status"
-msgstr "%1$s'in %2$s'deki durum mesajları "
-
-#: ../actions/twitapistatuses.php:338
-#, fuzzy, php-format
-msgid "%s timeline"
-msgstr "Genel zaman çizgisi"
-
-#: ../actions/twitapistatuses.php:52
+#: ../lib/util.php:233
 #, php-format
-msgid "%s updates from everyone!"
-msgstr ""
-
-#: ../actions/register.php:213
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr ""
-
-#: ../lib/util.php:257
-#, php-format
-msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** is a microblogging service brought to you by "
+"[%%site.broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
 "**%%site.name%%** [%%site.broughtby%%](%%site.broughtbyurl%%)\" tarafından "
 "hazırlanan anında mesajlaşma ağıdır. "
 
-#: ../lib/util.php:259
+#: ../lib/util.php:235
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** bir aninda mesajlaşma sosyal ağıdır."
 
-#: ../lib/util.php:274
+#: ../lib/util.php:250
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr "Katkı sunanlar tam ad veya takma ad ile atfedilmelidir."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
+#: ../actions/register.php:176
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 "1-64 küçük harf veya rakam, noktalama işaretlerine ve boşluklara izin "
 "verilmez"
 
-#: ../actions/register.php:152
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 küçük harf veya rakam, noktalama işaretlerine ve boşluklara izin "
-"verilmez"
-
-#: ../actions/password.php:42
+#: ../actions/password.php:42 ../actions/register.php:178
 msgid "6 or more characters"
 msgstr "6 veya daha fazla karakter"
 
-#: ../actions/recoverpassword.php:180
+#: ../actions/recoverpassword.php:165
 msgid "6 or more characters, and don't forget it!"
 msgstr "Unutmayın, 6 veya daha fazla karakter"
 
-#: ../actions/register.php:154
-#, fuzzy
-msgid "6 or more characters. Required."
-msgstr "6 veya daha fazla karakter"
-
-#: ../actions/imsettings.php:197
+#: ../actions/imsettings.php:188
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
-msgstr ""
-"Eklemiş olduğunuz IM adresine bir onay kodu gönderildi. %s tarafından size "
-"mesaj yollanabilmesi için onaylamanız gerekmektedir."
-
-#: ../actions/emailsettings.php:213
-#, fuzzy
-msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
-msgstr ""
-"Eklemiş olduğunuz IM adresine bir onay kodu gönderildi. %s tarafından size "
-"mesaj yollanabilmesi için onaylamanız gerekmektedir."
-
-#: ../actions/smssettings.php:216
-#, fuzzy
-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 ""
-"Eklemiş olduğunuz IM adresine bir onay kodu gönderildi. %s tarafından size "
-"mesaj yollanabilmesi için onaylamanız gerekmektedir."
-
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122
-msgid "API method not found!"
-msgstr ""
-
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-msgid "API method under construction."
+"A confirmation code was sent to the IM address you added. You must approve "
+"%s for sending messages to you."
 msgstr ""
+"Eklemiş olduğunuz IM adresine bir onay kodu gönderildi. %s tarafından "
+"size mesaj yollanabilmesi için onaylamanız gerekmektedir."
 
-#: ../lib/util.php:324
+#: ../lib/util.php:296
 msgid "About"
 msgstr "Hakkında"
 
-#: ../actions/userauthorization.php:119
+#: ../actions/userauthorization.php:118
 msgid "Accept"
 msgstr "Kabul et"
 
-#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
-#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
 msgid "Add"
 msgstr "Ekle"
 
@@ -250,25 +137,15 @@ msgstr "Ekle"
 msgid "Add OpenID"
 msgstr "OpenID ekle"
 
-#: ../lib/settingsaction.php:97
-#, fuzzy
-msgid "Add or remove OpenIDs"
-msgstr "OpenID'yi kaldır"
-
-#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39
+#: ../actions/imsettings.php:39
 msgid "Address"
 msgstr "Adres"
 
-#: ../actions/invite.php:131
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
-#: ../actions/showstream.php:273
+#: ../actions/showstream.php:254
 msgid "All subscriptions"
 msgstr "Bütün abonelikler"
 
-#: ../actions/publicrss.php:64
+#: ../actions/publicrss.php:62
 #, php-format
 msgid "All updates for %s"
 msgstr "%s için bütün güncellemeler"
@@ -278,34 +155,26 @@ msgstr "%s için bütün güncellemeler"
 msgid "All updates matching search term \"%s\""
 msgstr "\"%s\" kelimesinin geçtiği tüm güncellemeler"
 
-#: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
-#: ../actions/openidlogin.php:29 ../actions/register.php:30
+#: ../actions/finishopenidlogin.php:29 ../actions/login.php:27
+#: ../actions/openidlogin.php:29 ../actions/register.php:28
 msgid "Already logged in."
 msgstr "Zaten giriş yapılmış."
 
-#: ../lib/subs.php:42
+#: ../actions/subscribe.php:48
 msgid "Already subscribed!."
 msgstr "Zaten abone olunmuÅŸ!."
 
-#: ../actions/deletenotice.php:54
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
-#: ../actions/userauthorization.php:77
+#: ../actions/userauthorization.php:76
 msgid "Authorize subscription"
 msgstr "Takip isteÄŸini onayla"
 
-#: ../actions/login.php:104 ../actions/register.php:178
+#: ../actions/login.php:100 ../actions/register.php:184
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
-"Gelecekte kendiliğinden giriş yap, paylaşılan bilgisayarlar için değildir!"
-
-#: ../actions/profilesettings.php:65
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr ""
+"Gelecekte kendiliğinden giriş yap, paylaşılan bilgisayarlar için "
+"deÄŸildir!"
 
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: ../actions/avatar.php:32
 msgid "Avatar"
 msgstr "Avatar"
 
@@ -319,51 +188,32 @@ 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 ""
-"Bu adresten onay bekleniyor. Jabber/Google Talk hesabınızı ayrıntılı bilgi "
-"içeren mesajı almak için kontrol edin. (%s'u arkadaş listenize eklediniz mi?)"
-
-#: ../actions/emailsettings.php:54
-#, fuzzy
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-msgstr ""
-"Bu adresten onay bekleniyor. Jabber/Google Talk hesabınızı ayrıntılı bilgi "
-"içeren mesajı almak için kontrol edin. (%s'u arkadaş listenize eklediniz mi?)"
-
-#: ../actions/smssettings.php:58
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
+"Bu adresten onay bekleniyor. Jabber/Google Talk hesabınızı ayrıntılı "
+"bilgi içeren mesajı almak için kontrol edin. (%s'u arkadaş listenize "
+"eklediniz mi?)"
 
-#: ../lib/util.php:1318
+#: ../lib/util.php:1136
 msgid "Before »"
 msgstr "Önce »"
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: ../actions/profilesettings.php:52
 msgid "Bio"
 msgstr "Hakkında"
 
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103
+#: ../actions/profilesettings.php:93 ../actions/updateprofile.php:102
 msgid "Bio is too long (max 140 chars)."
 msgstr "Hakkında bölümü çok uzun (azm 140 karakter)."
 
-#: ../lib/deleteaction.php:41
-#, fuzzy
-msgid "Can't delete this notice."
-msgstr "Eposta onayı silinemedi."
-
-#: ../actions/updateprofile.php:119
+#: ../actions/updateprofile.php:118
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "Avatar URLi '%s' okunamıyor"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
+#: ../actions/password.php:85 ../actions/recoverpassword.php:261
 msgid "Can't save new password."
 msgstr "Yeni parola kaydedilemedi."
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62
+#: ../actions/imsettings.php:59
 msgid "Cancel"
 msgstr "Ä°ptal et"
 
@@ -371,79 +221,35 @@ msgstr "Ä°ptal et"
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "OpenID iÅŸlemlerinde hata oluÅŸtu."
 
-#: ../actions/imsettings.php:163
+#: ../actions/imsettings.php:154
 msgid "Cannot normalize that Jabber ID"
 msgstr "Jabber iÅŸlemlerinde bir hata oluÅŸtu."
 
-#: ../actions/emailsettings.php:181
-#, fuzzy
-msgid "Cannot normalize that email address"
-msgstr "Jabber iÅŸlemlerinde bir hata oluÅŸtu."
-
 #: ../actions/password.php:45
 msgid "Change"
 msgstr "DeÄŸiÅŸtir"
 
-#: ../lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
 #: ../actions/password.php:32
 msgid "Change password"
 msgstr "Parolayı değiştir"
 
-#: ../lib/settingsaction.php:94
-#, fuzzy
-msgid "Change your password"
-msgstr "Parolayı değiştir"
-
-#: ../lib/settingsaction.php:85
-#, fuzzy
-msgid "Change your profile settings"
-msgstr "Profil ayarları"
-
-#: ../actions/password.php:43 ../actions/recoverpassword.php:181
-#: ../actions/register.php:155 ../actions/smssettings.php:65
+#: ../actions/password.php:43 ../actions/recoverpassword.php:166
+#: ../actions/register.php:179
 msgid "Confirm"
 msgstr "Onayla"
 
-#: ../actions/confirmaddress.php:90
+#: ../actions/confirmaddress.php:84
 msgid "Confirm Address"
 msgstr "Adresi Onayla"
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245
+#: ../actions/imsettings.php:213
 msgid "Confirmation cancelled."
 msgstr "Onaylama iptal edildi."
 
-#: ../actions/smssettings.php:63
-#, fuzzy
-msgid "Confirmation code"
-msgstr "Onay kodu yok."
-
 #: ../actions/confirmaddress.php:38
 msgid "Confirmation code not found."
 msgstr "Onay kodu bulunamadı."
 
-#: ../actions/register.php:202
-#, php-format
-msgid ""
-"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."
-msgstr ""
-
 #: ../actions/finishopenidlogin.php:91
 msgid "Connect"
 msgstr "BaÄŸlan"
@@ -452,7 +258,7 @@ msgstr "BaÄŸlan"
 msgid "Connect existing account"
 msgstr "Varolan hesaba baÄŸlan"
 
-#: ../lib/util.php:332
+#: ../lib/util.php:304
 msgid "Contact"
 msgstr "Ä°letiÅŸim"
 
@@ -461,68 +267,48 @@ msgstr "Ä°letiÅŸim"
 msgid "Could not create OpenID form: %s"
 msgstr "OpenID formu yaratılamadı: %s"
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: ../actions/twitapifriendships.php:53
-msgid "Could not follow user: User not found."
-msgstr ""
-
 #: ../lib/openid.php:160
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "Sunucuya yönlendirme yapılamadı: %s"
 
-#: ../actions/updateprofile.php:162
+#: ../actions/updateprofile.php:161
 msgid "Could not save avatar info"
 msgstr "Avatar bilgisi kaydedilemedi"
 
-#: ../actions/updateprofile.php:155
+#: ../actions/updateprofile.php:154
 msgid "Could not save new profile info"
 msgstr "Yeni profil bilgisi kaydedilemedi"
 
-#: ../lib/subs.php:54
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: ../lib/subs.php:46
-#, fuzzy
-msgid "Could not subscribe."
-msgstr "Bu kullanıcıyı zaten takip etmiyorsunuz!"
-
-# Note: Bu federation ozelligi nasilsa simdi kullanilmayacak
-#: ../actions/recoverpassword.php:102
-#, fuzzy
-msgid "Could not update user with confirmed email address."
-msgstr "Onay kodu eklenemedi."
+#: ../actions/profilesettings.php:146
+msgid "Couldn't confirm email."
+msgstr "Eposta onaylanamadı."
 
 #: ../actions/finishremotesubscribe.php:99
+#: actions/finishremotesubscribe.php:101
 msgid "Couldn't convert request tokens to access tokens."
 msgstr ""
 
-#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
-#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#  Note: Bu federation ozelligi nasilsa simdi kullanilmayacak
+#: ../actions/subscribe.php:59
+msgid "Couldn't create subscription."
+msgstr "Abonelik oluşturulamadı."
+
+#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
 msgid "Couldn't delete email confirmation."
 msgstr "Eposta onayı silinemedi."
 
-#: ../lib/subs.php:103
+#: ../actions/unsubscribe.php:56
 msgid "Couldn't delete subscription."
 msgstr "Abonelik silinemedi."
 
-#: ../actions/twitapistatuses.php:93
-#, fuzzy
-msgid "Couldn't find any statuses."
-msgstr "Kullanıcı güncellenemedi."
-
-#: ../actions/remotesubscribe.php:127
+#: ../actions/remotesubscribe.php:125 ../actions/remotesubscribe.php:127
+#: actions/remotesubscribe.php:136
 msgid "Couldn't get a request token."
 msgstr ""
 
-# Note: Bu federation ozelligi nasilsa simdi kullanilmayacak
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206
+#  Note: Bu federation ozelligi nasilsa simdi kullanilmayacak
+#: ../actions/imsettings.php:178
 msgid "Couldn't insert confirmation code."
 msgstr "Onay kodu eklenemedi."
 
@@ -530,24 +316,12 @@ msgstr "Onay kodu eklenemedi."
 msgid "Couldn't insert new subscription."
 msgstr "Yeni abonelik eklenemedi."
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: ../actions/profilesettings.php:175
 msgid "Couldn't save profile."
 msgstr "Profil kaydedilemedi."
 
-#: ../actions/profilesettings.php:161
-#, fuzzy
-msgid "Couldn't update user for autosubscribe."
-msgstr "Kullanıcı güncellenemedi."
-
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#, fuzzy
-msgid "Couldn't update user record."
-msgstr "Kullanıcı güncellenemedi."
-
-#: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
-#: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
-#: ../actions/imsettings.php:243 ../actions/profilesettings.php:141
-#: ../actions/smssettings.php:157 ../actions/smssettings.php:269
+#: ../actions/confirmaddress.php:70 ../actions/imsettings.php:129
+#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
 msgid "Couldn't update user."
 msgstr "Kullanıcı güncellenemedi."
 
@@ -571,83 +345,45 @@ msgstr "OpenID kullanıcısı için hesap oluşturuluyor"
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Onaylanmış Jabber/Gtalk adresi."
 
-#: ../actions/smssettings.php:46
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#: ../actions/emailsettings.php:44
-#, fuzzy
-msgid "Current confirmed email address."
-msgstr "Onaylanmış Jabber/Gtalk adresi."
-
-#: ../actions/showstream.php:356
+#: ../actions/showstream.php:337
 msgid "Currently"
 msgstr "Åžu anda"
 
-#: ../classes/Notice.php:72
-#, fuzzy, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "Cevap eklenirken veritabanı hatası: %s"
-
-#: ../lib/util.php:1061
+#: ../lib/util.php:893
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Cevap eklenirken veritabanı hatası: %s"
 
-#: ../actions/deletenotice.php:41
-#, fuzzy
-msgid "Delete notice"
-msgstr "Yeni durum mesajı"
-
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: ../actions/profilesettings.php:54
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
 
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87
+#: ../actions/register.php:181
 msgid "Email"
 msgstr "Eposta"
 
-#: ../actions/emailsettings.php:59
-#, fuzzy
-msgid "Email Address"
+#: ../actions/profilesettings.php:46
+msgid "Email address"
 msgstr "Eposta adresi"
 
-#: ../actions/emailsettings.php:32
-#, fuzzy
-msgid "Email Settings"
-msgstr "Ayarlar"
-
-#: ../actions/register.php:73
+#: ../actions/profilesettings.php:102 ../actions/register.php:63
 msgid "Email address already exists."
 msgstr "Eposta adresi zaten var."
 
-#: ../lib/mail.php:90
+#: ../lib/mail.php:82
 msgid "Email address confirmation"
 msgstr "Eposta adresi onayı"
 
-#: ../actions/emailsettings.php:61
-msgid "Email address, like \"UserName@example.org\""
-msgstr ""
-
-#: ../actions/invite.php:129
-#, fuzzy
-msgid "Email addresses"
-msgstr "Eposta adresi"
-
-#: ../actions/recoverpassword.php:191
+#: ../actions/recoverpassword.php:176
 msgid "Enter a nickname or email address."
 msgstr "Bir takma ad veya eposta adresi girin."
 
-#: ../actions/smssettings.php:64
-msgid "Enter the code you received on your phone."
-msgstr ""
-
-#: ../actions/userauthorization.php:137
+#: ../actions/userauthorization.php:136 ../actions/userauthorization.php:137
+#: actions/userauthorization.php:144
 msgid "Error authorizing token"
 msgstr ""
 
-#: ../actions/finishopenidlogin.php:253
+#: ../actions/finishopenidlogin.php:282
 msgid "Error connecting user to OpenID."
 msgstr "Kullanıcıyı OpenID'ye bağlarken hata oluştu."
 
@@ -663,19 +399,23 @@ msgstr "Avatar eklemede hata oluÅŸtu"
 msgid "Error inserting new profile"
 msgstr "Yeni profil eklemede hata oluÅŸtu"
 
+#: ../actions/postnotice.php:88
+msgid "Error inserting notice"
+msgstr "Durum gönderilirken hata oluştu"
+
 #: ../actions/finishremotesubscribe.php:167
 msgid "Error inserting remote profile"
 msgstr "Uzak profil eklemede hata oluÅŸtu"
 
-#: ../actions/recoverpassword.php:240
+#: ../actions/recoverpassword.php:201
 msgid "Error saving address confirmation."
 msgstr "Adres onayını kaydetmede hata."
 
-#: ../actions/userauthorization.php:140
+#: ../actions/userauthorization.php:139
 msgid "Error saving remote profile"
 msgstr "Uzaktaki profili kaydetmede hata oluÅŸtu"
 
-#: ../lib/openid.php:226
+#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
 msgid "Error saving the profile."
 msgstr "Profili kaydetmede hata oluÅŸtu."
 
@@ -687,8 +427,8 @@ msgstr "Kullanıcıyı kaydetmede hata oluştu."
 msgid "Error saving user; invalid."
 msgstr "Kullanıcıyı kaydetmede hata oluştu; geçersiz."
 
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
+#: ../actions/login.php:43 ../actions/login.php:69
+#: ../actions/recoverpassword.php:268 ../actions/register.php:73
 msgid "Error setting user."
 msgstr "Kullanıcı ayarlamada hata oluştu."
 
@@ -700,7 +440,7 @@ msgstr "Profil güncellemede hata oluştu"
 msgid "Error updating remote profile"
 msgstr "Uzaktaki profili güncellemede hata oluştu"
 
-#: ../actions/recoverpassword.php:80
+#: ../actions/recoverpassword.php:79
 msgid "Error with confirmation code."
 msgstr "Onay kodu hatası."
 
@@ -708,7 +448,7 @@ msgstr "Onay kodu hatası."
 msgid "Existing nickname"
 msgstr "Varolan takma ad"
 
-#: ../lib/util.php:326
+#: ../lib/util.php:298
 msgid "FAQ"
 msgstr "SSS"
 
@@ -716,72 +456,50 @@ msgstr "SSS"
 msgid "Failed updating avatar."
 msgstr "Avatar güncellemede hata."
 
-#: ../actions/all.php:61 ../actions/allrss.php:64
+#: ../actions/all.php:61 ../actions/allrss.php:74
 #, php-format
 msgid "Feed for friends of %s"
 msgstr "%s için arkadaş güncellemeleri RSS beslemesi"
 
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: ../actions/replies.php:61 ../actions/repliesrss.php:80
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "Cevaplar için RSS Beslemesi: %s"
 
-#: ../actions/tag.php:55
-#, fuzzy, php-format
-msgid "Feed for tag %s"
-msgstr "Cevaplar için RSS Beslemesi: %s"
-
-#: ../lib/searchaction.php:105
-msgid "Find content of notices"
-msgstr ""
-
-#: ../lib/searchaction.php:101
-msgid "Find people on this site"
-msgstr ""
-
-#: ../actions/login.php:122
+#: ../actions/login.php:118
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
-"Güvenliğiniz için, ayarlarınızı değiştirmeden önce lütfen kullanıcı adınızı "
-"ve parolanızı tekrar giriniz."
+"Güvenliğiniz için, ayarlarınızı değiştirmeden önce lütfen "
+"kullanıcı adınızı ve parolanızı tekrar giriniz."
 
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: ../actions/profilesettings.php:44
 msgid "Full name"
 msgstr "Tam Ä°sim"
 
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93
+#: ../actions/profilesettings.php:90 ../actions/updateprofile.php:92
 msgid "Full name is too long (max 255 chars)."
 msgstr "Tam isim çok uzun (azm: 255 karakter)."
 
-#: ../lib/util.php:322
+#: ../lib/util.php:279
 msgid "Help"
 msgstr "Yardım"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:274
 msgid "Home"
 msgstr "Başlangıç"
 
-# Belki Durum Merkezi falan denebilir mi ki?
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#  Belki Durum Merkezi falan denebilir mi ki?
+#: ../actions/profilesettings.php:49
 msgid "Homepage"
 msgstr "Başlangıç Sayfası"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: ../actions/profilesettings.php:87
 msgid "Homepage is not a valid URL."
 msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
 
-#: ../actions/emailsettings.php:91
-msgid "I want to post notices by email."
-msgstr ""
-
-#: ../lib/settingsaction.php:102
-msgid "IM"
-msgstr ""
-
-#: ../actions/imsettings.php:60
+#: ../actions/imsettings.php:61
 msgid "IM Address"
 msgstr "IM adresi"
 
@@ -794,67 +512,52 @@ msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
 msgstr ""
-"Eğer zaten bir hesabınız varsa, kullanıcı adınız ve parolanız ile giriş "
-"yapıp hesabınızı OpenID'nize bağlayabilirsiniz."
+"Eğer zaten bir hesabınız varsa, kullanıcı adınız ve parolanız ile "
+"giriş yapıp hesabınızı OpenID'nize bağlayabilirsiniz."
 
 #: ../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 ""
-"Eğer hesabınıza bir OpenID eklemek istiyorsanız, aşağıdaki kutuya girin ve "
-"\"Add\" düğmesine tıklayın."
+"Eğer hesabınıza bir OpenID eklemek istiyorsanız, aşağıdaki kutuya "
+"girin ve \"Add\" düğmesine tıklayın."
 
-#: ../actions/recoverpassword.php:137
-#, fuzzy
+#: ../actions/recoverpassword.php:122
 msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
+"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 ""
 "Eğer parolanızı unuttuysanız veya kaybettiyseniz, hesabınıza eklemiş "
 "olduğunuz eposta adresine yeni bir tane gönderilmesini sağlayabilirsiniz."
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-msgid "Incoming email"
-msgstr ""
-
-#: ../actions/emailsettings.php:283
-#, fuzzy
-msgid "Incoming email address removed."
-msgstr "Bu adres kaldırılmıştı."
-
 #: ../actions/password.php:69
 msgid "Incorrect old password"
 msgstr "Eski parola yanlış"
 
-#: ../actions/login.php:67
+#: ../actions/login.php:63
 msgid "Incorrect username or password."
 msgstr "Yanlış kullanıcı adı veya parola."
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:226
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
-"Hesabınıza eklemiş olduğunuz eposta adresine parolanızı geri getirmek için "
-"gerekli olan talimatlar yollanmıştır."
+"Hesabınıza eklemiş olduğunuz eposta adresine parolanızı geri getirmek "
+"için gerekli olan talimatlar yollanmıştır."
 
-#: ../actions/updateprofile.php:114
+#: ../actions/updateprofile.php:113
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "Geçersiz avatar URLi '%s'"
 
-#: ../actions/invite.php:55
-#, fuzzy, php-format
-msgid "Invalid email address: %s"
-msgstr "Geçersiz bir eposta adresi."
-
-#: ../actions/updateprofile.php:98
+#: ../actions/updateprofile.php:97
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "%s Geçersiz başlangıç sayfası"
 
-#: ../actions/updateprofile.php:82
+#: ../actions/updateprofile.php:81
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "Geçersiz lisans URLi '%s'"
@@ -871,16 +574,17 @@ msgstr "Geçersiz durum adresi"
 msgid "Invalid notice url"
 msgstr "Geçersiz durum adresi"
 
-#: ../actions/updateprofile.php:87
+#: ../actions/updateprofile.php:86
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "'%s' geçersiz profil adresi."
 
-#: ../actions/remotesubscribe.php:96
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
 msgid "Invalid profile URL (bad format)"
 msgstr ""
 
 #: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79
 msgid "Invalid profile URL returned by server."
 msgstr ""
 
@@ -888,43 +592,28 @@ msgstr ""
 msgid "Invalid size."
 msgstr "Geçersiz büyüklük."
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111
+#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
+#: ../actions/register.php:84
 msgid "Invalid username or password."
 msgstr "Geçersiz kullanıcı adı veya parola."
 
-#: ../actions/invite.php:79
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123
-msgid "Invite new users"
-msgstr ""
-
-#: ../lib/util.php:261
+#: ../lib/util.php:237
 #, 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)."
+"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 ""
-"nedurum.com [GNU Affero General Public License](http://www.fsf.org/licensing/"
-"licenses/agpl-3.0.html) lisansı ile korunan [Laconica](http://laconi.ca/) "
-"microbloglama yazılımının %s. versiyonunu kullanmaktadır."
+"nedurum.com [GNU Affero General Public "
+"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html) lisansı ile "
+"korunan [Laconica](http://laconi.ca/) microbloglama yazılımının %s. "
+"versiyonunu kullanmaktadır."
 
-#: ../actions/imsettings.php:173
+#: ../actions/imsettings.php:164
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID başka bir kullanıcıya ait."
 
-#: ../actions/imsettings.php:62
+#: ../actions/imsettings.php:63
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -933,26 +622,16 @@ msgstr ""
 "Jabber veya Gtalk adresi: \"KullaniciAdi@ornek.org\" gibi. Öncelikle %s, IM "
 "istemcisi veya Gtalk arkadaşlar listenize eklenmiş olmalıdır."
 
-#: ../actions/profilesettings.php:57
-msgid "Language"
-msgstr ""
-
-#: ../actions/profilesettings.php:113
-#, fuzzy
-msgid "Language is too long (max 50 chars)."
-msgstr "Yer bilgisi çok uzun (azm: 255 karakter)."
-
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: ../actions/profilesettings.php:55
 msgid "Location"
 msgstr "Yer"
 
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108
+#: ../actions/profilesettings.php:96 ../actions/updateprofile.php:107
 msgid "Location is too long (max 255 chars)."
 msgstr "Yer bilgisi çok uzun (azm: 255 karakter)."
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310
+#: ../actions/login.php:93 ../actions/login.php:102
+#: ../actions/openidlogin.php:68 ../lib/util.php:286
 msgid "Login"
 msgstr "GiriÅŸ"
 
@@ -961,39 +640,26 @@ msgstr "GiriÅŸ"
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Bir [OpenID](%%doc.openid%%) hesabı ile giriş yapın."
 
-#: ../actions/login.php:126
+#: ../actions/login.php:122
 #, 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%"
-"%). "
+"Login with your username and password. Don't have a username yet? "
+"[Register](%%action.register%%) a new account, or try "
+"[OpenID](%%action.openidlogin%%). "
 msgstr ""
-"Kullanıcı adı ve parolanızla giriş yapın. Henüz bir hesabınız yok mu? Ne "
-"duruyorsunuz, hemen bir [yeni hesap oluÅŸturun](%%action.register%%) ya da "
-"[OpenID](%%action.openidlogin%%) ile giriş yapın."
+"Kullanıcı adı ve parolanızla giriş yapın. Henüz bir hesabınız yok "
+"mu? Ne duruyorsunuz, hemen bir [yeni hesap oluÅŸturun](%%action.register%%) "
+"ya da [OpenID](%%action.openidlogin%%) ile giriş yapın."
 
-#: ../lib/util.php:308
+#: ../lib/util.php:284
 msgid "Logout"
 msgstr "Çıkış"
 
-#: ../actions/register.php:166
-msgid "Longer name, preferably your \"real\" name"
-msgstr ""
-
-#: ../actions/login.php:110
+#: ../actions/login.php:106
 msgid "Lost or forgotten password?"
 msgstr "Parolamı unuttum veya kaybettim"
 
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
-#: ../actions/emailsettings.php:27
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr ""
-
-#: ../actions/showstream.php:300
+#: ../actions/showstream.php:281
 msgid "Member since"
 msgstr "Üyelik başlangıcı"
 
@@ -1002,59 +668,38 @@ msgstr "Üyelik başlangıcı"
 msgid "Microblog by %s"
 msgstr "%s adli kullanicinin durum mesajlari"
 
-#: ../actions/smssettings.php:304
-#, php-format
-msgid ""
-"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
-"email but isn't listed here, send email to let us know at %s."
-msgstr ""
-
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
 msgid "My text and files are available under "
 msgstr "Durum mesajlarim ve dosyalarim şu lisans ile korunmaktadır: "
 
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-msgid "New"
-msgstr ""
-
-#: ../lib/mail.php:144
-#, fuzzy, php-format
-msgid "New email address for posting to %s"
-msgstr "Kullanıcı için kaydedilmiş eposta adresi yok."
-
-#: ../actions/emailsettings.php:297
-#, fuzzy
-msgid "New incoming email address added."
-msgstr "Geçersiz bir eposta adresi."
-
 #: ../actions/finishopenidlogin.php:71
 msgid "New nickname"
 msgstr "Yeni takma ad"
 
-#: ../actions/newnotice.php:87
+#: ../actions/newnotice.php:100
 msgid "New notice"
 msgstr "Yeni durum mesajı"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
+#: ../actions/password.php:41 ../actions/recoverpassword.php:164
 msgid "New password"
 msgstr "Yeni parola"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:275
 msgid "New password successfully saved. You are now logged in."
 msgstr "Yeni parola başarıyla kaydedildi. Şimdi giriş yaptınız."
 
-#: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151
+#: ../actions/login.php:97 ../actions/profilesettings.php:41
+#: ../actions/register.php:175
 msgid "Nickname"
 msgstr "Takma ad"
 
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69
+#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:99
+#: ../actions/register.php:59
 msgid "Nickname already in use. Try another one."
 msgstr "Takma ad kullanımda. Başka bir tane deneyin."
 
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:67 ../actions/updateprofile.php:77
+#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:80
+#: ../actions/register.php:57 ../actions/updateprofile.php:76
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "Takma ad sadece küçük harflerden ve rakamlardan oluşabilir, boşluk "
@@ -1068,53 +713,30 @@ msgstr "Takma ada izin verilmiyor."
 msgid "Nickname of the user you want to follow"
 msgstr "Takip etmek istediğiniz kullanıcının takma adı"
 
-#: ../actions/recoverpassword.php:162
+#: ../actions/recoverpassword.php:147
 msgid "Nickname or email"
 msgstr "Takma ad veya eposta"
 
-#: ../actions/deletenotice.php:59
-msgid "No"
-msgstr ""
-
-#: ../actions/imsettings.php:156
+#: ../actions/imsettings.php:147
 msgid "No Jabber ID."
 msgstr "JabberID yok."
 
-#: ../actions/userauthorization.php:129
+#: ../actions/userauthorization.php:128
 msgid "No authorization request!"
 msgstr "Yetkilendirme isteÄŸi yok!"
 
-#: ../actions/smssettings.php:181
-msgid "No carrier selected."
-msgstr ""
-
-#: ../actions/smssettings.php:316
-#, fuzzy
-msgid "No code entered"
-msgstr "İçerik yok!"
-
 #: ../actions/confirmaddress.php:33
 msgid "No confirmation code."
 msgstr "Onay kodu yok."
 
-#: ../actions/newnotice.php:44
+#: ../actions/newnotice.php:49
 msgid "No content!"
 msgstr "İçerik yok!"
 
-#: ../actions/emailsettings.php:174
-#, fuzzy
-msgid "No email address."
-msgstr "Eposta adresi"
-
-#: ../actions/userbyid.php:32
+#: ../actions/userbyid.php:27
 msgid "No id."
 msgstr "Kullanıcı numarası yok"
 
-#: ../actions/emailsettings.php:271
-#, fuzzy
-msgid "No incoming email address."
-msgstr "Geçersiz bir eposta adresi."
-
 #: ../actions/finishremotesubscribe.php:65
 msgid "No nickname provided by remote server."
 msgstr "Uzaktaki sunucu tarafından bir takma ad sağlanmadı."
@@ -1123,25 +745,20 @@ msgstr "Uzaktaki sunucu tarafından bir takma ad sağlanmadı."
 msgid "No nickname."
 msgstr "Takma ad yok"
 
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229
+#: ../actions/imsettings.php:197
 msgid "No pending confirmation to cancel."
 msgstr "İptal etmek için beklenen onay yok."
 
-#: ../actions/smssettings.php:176
-#, fuzzy
-msgid "No phone number."
-msgstr "Böyle bir kullanıcı yok."
-
 #: ../actions/finishremotesubscribe.php:72
+#: actions/finishremotesubscribe.php:74
 msgid "No profile URL returned by server."
 msgstr ""
 
-#: ../actions/recoverpassword.php:226
+#: ../actions/recoverpassword.php:189
 msgid "No registered email address for that user."
 msgstr "Kullanıcı için kaydedilmiş eposta adresi yok."
 
-#: ../actions/userauthorization.php:49
+#: ../actions/userauthorization.php:48
 msgid "No request found!"
 msgstr "İstek bulunamadı!"
 
@@ -1149,18 +766,10 @@ msgstr "İstek bulunamadı!"
 msgid "No results"
 msgstr "Sonuç yok"
 
-#: ../actions/avatarbynickname.php:32
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
 msgid "No size."
 msgstr ""
 
-#: ../actions/twitapistatuses.php:595
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555
-msgid "No status with that ID found."
-msgstr ""
-
 #: ../actions/openidsettings.php:135
 msgid "No such OpenID."
 msgstr "Böyle bir OpenID yok."
@@ -1169,8 +778,7 @@ msgstr "Böyle bir OpenID yok."
 msgid "No such document."
 msgstr "Böyle bir belge yok."
 
-#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
-#: ../lib/deleteaction.php:30
+#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
 msgid "No such notice."
 msgstr "Böyle bir durum mesajı yok."
 
@@ -1183,21 +791,16 @@ msgid "No such subscription"
 msgstr "Böyle bir abonelik yok"
 
 #: ../actions/all.php:34 ../actions/allrss.php:35
-#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
-#: ../actions/remotesubscribe.php:84 ../actions/remotesubscribe.php:91
-#: ../actions/replies.php:57 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:110 ../actions/userbyid.php:36
-#: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
-#: ../lib/subs.php:33 ../lib/subs.php:82
+#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:36
+#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
+#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
+#: ../actions/showstream.php:95 ../actions/subscribe.php:43
+#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
+#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
 msgid "No such user."
 msgstr "Böyle bir kullanıcı yok."
 
-#: ../actions/recoverpassword.php:211
-#, fuzzy
-msgid "No user with that email address or username."
-msgstr "Kullanıcı için kaydedilmiş eposta adresi yok."
-
-#: ../lib/gallery.php:80
+#: ../lib/gallery.php:76
 msgid "Nobody to show!"
 msgstr "Gösterecek hiç kimse yok!"
 
@@ -1205,18 +808,7 @@ msgstr "Gösterecek hiç kimse yok!"
 msgid "Not a recovery code."
 msgstr "Bir geri alma kodu deÄŸil."
 
-#: ../scripts/maildaemon.php:50
-#, fuzzy
-msgid "Not a registered user."
-msgstr "Bir geri alma kodu deÄŸil."
-
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332
-#, fuzzy
-msgid "Not a supported data format."
-msgstr "Desteklenmeyen görüntü dosyası biçemi."
-
-#: ../actions/imsettings.php:167
+#: ../actions/imsettings.php:158
 msgid "Not a valid Jabber ID"
 msgstr "Geçersiz bir Jabber ID"
 
@@ -1224,24 +816,19 @@ msgstr "Geçersiz bir Jabber ID"
 msgid "Not a valid OpenID."
 msgstr "Geçersiz bir OpenID."
 
-#: ../actions/emailsettings.php:185
-#, fuzzy
-msgid "Not a valid email address"
-msgstr "Geçersiz bir eposta adresi."
-
-#: ../actions/register.php:63
+#: ../actions/profilesettings.php:75 ../actions/register.php:53
 msgid "Not a valid email address."
 msgstr "Geçersiz bir eposta adresi."
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
+#: ../actions/profilesettings.php:83 ../actions/register.php:61
 msgid "Not a valid nickname."
 msgstr "Geçersiz bir takma ad."
 
-#: ../actions/remotesubscribe.php:120
+#: ../actions/remotesubscribe.php:118
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "Geçersiz profil adresi (yanlış hizmetler)."
 
-#: ../actions/remotesubscribe.php:113
+#: ../actions/remotesubscribe.php:111
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "Geçersiz profil adresi (tanımlanmış XRDS yok)."
 
@@ -1258,30 +845,20 @@ msgid "Not authorized."
 msgstr "YetkilendirilmemiÅŸ."
 
 #: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38
 msgid "Not expecting this response!"
 msgstr ""
 
-#: ../actions/twitapistatuses.php:422
-#, fuzzy
-msgid "Not found"
-msgstr "İstek bulunamadı!"
-
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:28
-#: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
-#: ../lib/settingsaction.php:27
+#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
+#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
+#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
 msgid "Not logged in."
 msgstr "Giriş yapılmadı."
 
-#: ../lib/subs.php:91
+#: ../actions/unsubscribe.php:43
 msgid "Not subscribed!."
 msgstr "Bu kullanıcıyı zaten takip etmiyorsunuz!"
 
-#: ../actions/opensearch.php:35
-#, fuzzy
-msgid "Notice Search"
-msgstr "Ara"
-
 #: ../actions/showstream.php:82
 #, php-format
 msgid "Notice feed for %s"
@@ -1291,20 +868,15 @@ msgstr "%s için durum RSS beslemesi"
 msgid "Notice has no profile"
 msgstr "Bu durum mesajının ait oldugu kullanıcı profili yok"
 
-#: ../actions/showstream.php:316
+#: ../actions/showstream.php:297
 msgid "Notices"
 msgstr "Durum mesajları"
 
-#: ../actions/tag.php:35 ../actions/tag.php:81
-#, fuzzy, php-format
-msgid "Notices tagged with %s"
-msgstr "%s için durum RSS beslemesi"
-
 #: ../actions/password.php:39
 msgid "Old password"
 msgstr "Eski parola"
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314
+#: ../lib/util.php:288
 msgid "OpenID"
 msgstr "OpenID"
 
@@ -1312,7 +884,7 @@ msgstr "OpenID"
 msgid "OpenID Account Setup"
 msgstr "OpenID Hesabı Kurulumu"
 
-#: ../lib/openid.php:180
+#: ../lib/openid.php:180 lib/openid.php:180
 msgid "OpenID Auto-Submit"
 msgstr ""
 
@@ -1347,108 +919,76 @@ msgstr "OpenID kaldırıldı."
 msgid "OpenID settings"
 msgstr "OpenID ayarları"
 
-#: ../actions/invite.php:135
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
 #: ../actions/avatar.php:84
 msgid "Partial upload."
 msgstr "Kısmi yükleme."
 
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
-#: ../actions/register.php:153 ../lib/settingsaction.php:93
+#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
+#: ../actions/register.php:177
 msgid "Password"
 msgstr "Parola"
 
-#: ../actions/recoverpassword.php:288
+#: ../actions/recoverpassword.php:249
 msgid "Password and confirmation do not match."
 msgstr "Parola ve onaylaması birbirini tutmuyor."
 
-#: ../actions/recoverpassword.php:284
+#: ../actions/recoverpassword.php:245
 msgid "Password must be 6 chars or more."
 msgstr "Parola 6 veya daha fazla karakterden oluşmalıdır."
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
 msgid "Password recovery requested"
 msgstr "Parola geri alma isteÄŸi"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: ../actions/password.php:89 ../actions/recoverpassword.php:274
 msgid "Password saved."
 msgstr "Parola kaydedildi."
 
-#: ../actions/password.php:61 ../actions/register.php:88
+#: ../actions/password.php:61 ../actions/register.php:65
 msgid "Passwords don't match."
 msgstr "Parolalar birbirini tutmuyor."
 
-#: ../lib/searchaction.php:100
-#, fuzzy
-msgid "People"
-msgstr "KiÅŸi Arama"
-
-#: ../actions/opensearch.php:33
-#, fuzzy
-msgid "People Search"
-msgstr "KiÅŸi Arama"
-
 #: ../actions/peoplesearch.php:33
 msgid "People search"
 msgstr "KiÅŸi Arama"
 
-#: ../lib/stream.php:50
+#: ../lib/stream.php:44
 msgid "Personal"
 msgstr "KiÅŸisel"
 
-#: ../actions/invite.php:133
-#, fuzzy
-msgid "Personal message"
-msgstr "KiÅŸisel"
-
-#: ../actions/smssettings.php:69
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-"1-64 küçük harf veya rakam, noktalama işaretlerine ve boşluklara izin "
-"verilmez"
-
-#: ../actions/userauthorization.php:78
+#: ../actions/userauthorization.php:77
 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 \"Cancel\"."
 msgstr ""
-"Lütfen bu kullanıcının durumunu takip etmek istediğinizden emin olmak için "
-"detayları gözden geçirin. Kimsenin durumunu taki etme isteğinde "
+"Lütfen bu kullanıcının durumunu takip etmek istediğinizden emin olmak "
+"için detayları gözden geçirin. Kimsenin durumunu taki etme isteğinde "
 "bulunmadıysanız \"İptal\" tuşuna basın. "
 
-#: ../actions/imsettings.php:73
+#: ../actions/imsettings.php:74
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
-"Jabber/GTalk durum mesajim değiştiğinde nedurum.com'da durumumu güncelle"
+"Jabber/GTalk durum mesajim deÄŸiÅŸtiÄŸinde nedurum.com'da durumumu "
+"güncelle"
 
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94
+#: ../actions/imsettings.php:68
 msgid "Preferences"
 msgstr "Tercihler"
 
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163
+#: ../actions/imsettings.php:135
 msgid "Preferences saved."
 msgstr "Tercihler kaydedildi."
 
-#: ../actions/profilesettings.php:57
-#, fuzzy
-msgid "Preferred language"
-msgstr "Tercihler"
-
-#: ../lib/util.php:328
+#: ../lib/util.php:300
 msgid "Privacy"
 msgstr "Gizlilik"
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106
+#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
 msgid "Problem saving notice."
 msgstr "Durum mesajını kaydederken hata oluştu."
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60
+#: ../lib/stream.php:54
 msgid "Profile"
 msgstr "Profil"
 
@@ -1460,10 +1000,14 @@ msgstr "Profil Adresi"
 msgid "Profile settings"
 msgstr "Profil ayarları"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
 msgid "Profile unknown"
 msgstr "Profil bilinmiyor"
 
+#: ../lib/util.php:276
+msgid "Public"
+msgstr "Genel"
+
 #: ../actions/public.php:54
 msgid "Public Stream Feed"
 msgstr "Genel Durum Akış RSS Beslemesi"
@@ -1472,25 +1016,11 @@ msgstr "Genel Durum Akış RSS Beslemesi"
 msgid "Public timeline"
 msgstr "Genel zaman çizgisi"
 
-#: ../actions/imsettings.php:79
-#, fuzzy
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Onaylanmış Jabber/Gtalk adresi."
-
-#: ../actions/emailsettings.php:94
-#, fuzzy
-msgid "Publish a MicroID for my email address."
-msgstr "Bir takma ad veya eposta adresi girin."
-
-#: ../actions/tag.php:75 ../actions/tag.php:76
-msgid "Recent Tags"
-msgstr ""
-
-#: ../actions/recoverpassword.php:166
+#: ../actions/recoverpassword.php:151
 msgid "Recover"
 msgstr "Geri al"
 
-#: ../actions/recoverpassword.php:156
+#: ../actions/recoverpassword.php:141
 msgid "Recover password"
 msgstr "Parolanı geri al"
 
@@ -1498,28 +1028,20 @@ msgstr "Parolanı geri al"
 msgid "Recovery code for unknown user."
 msgstr "Bilinmeye kullanıcı için geri alma kodu"
 
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: ../actions/register.php:171 ../actions/register.php:195 ../lib/util.php:287
 msgid "Register"
 msgstr "Kayıt"
 
-#: ../actions/register.php:28
-#, fuzzy
-msgid "Registration not allowed."
-msgstr "Takma ada izin verilmiyor."
-
-#: ../actions/register.php:200
-msgid "Registration successful"
-msgstr ""
-
-#: ../actions/userauthorization.php:120
+#: ../actions/userauthorization.php:119
 msgid "Reject"
 msgstr "Reddet"
 
-#: ../actions/login.php:103 ../actions/register.php:176
+#: ../actions/login.php:99 ../actions/register.php:183
 msgid "Remember me"
 msgstr "Beni hatırla"
 
-#: ../actions/updateprofile.php:70
+#: ../actions/updateprofile.php:69 ../actions/updateprofile.php:70
+#: actions/updateprofile.php:71
 msgid "Remote profile with no matching profile"
 msgstr ""
 
@@ -1527,9 +1049,7 @@ msgstr ""
 msgid "Remote subscribe"
 msgstr "Uzaktan abonelik"
 
-#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
 #: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
-#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
 msgid "Remove"
 msgstr "Kaldır"
 
@@ -1545,60 +1065,36 @@ msgstr ""
 "OpenID'nizi sistemden silerseniz giriş yapamazsınız! Eğer silmek "
 "istiyorsanuz, önce yeni bir OpenID ekleyin"
 
-#: ../lib/stream.php:55
+#: ../lib/stream.php:49
 msgid "Replies"
 msgstr "Cevaplar"
 
-#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
 #, php-format
 msgid "Replies to %s"
 msgstr "%s için cevaplar"
 
-#: ../actions/recoverpassword.php:183
+#: ../actions/recoverpassword.php:168
 msgid "Reset"
 msgstr "Sıfırla"
 
-#: ../actions/recoverpassword.php:173
+#: ../actions/recoverpassword.php:158
 msgid "Reset password"
 msgstr "Parolayı sıfırla"
 
-#: ../lib/settingsaction.php:99
-msgid "SMS"
-msgstr ""
-
-#: ../actions/smssettings.php:67
-msgid "SMS Phone number"
-msgstr ""
-
-#: ../actions/smssettings.php:33
-#, fuzzy
-msgid "SMS Settings"
-msgstr "IM Ayarları"
-
-#: ../lib/mail.php:219
-#, fuzzy
-msgid "SMS confirmation"
-msgstr "Onay kodu yok."
-
-#: ../actions/recoverpassword.php:182
+#: ../actions/recoverpassword.php:167 ../actions/register.php:180
 msgid "Same as password above"
 msgstr "yukarıdaki parolanın aynısı"
 
-#: ../actions/register.php:156
-#, fuzzy
-msgid "Same as password above. Required."
-msgstr "yukarıdaki parolanın aynısı"
-
-#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
-#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
+#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
 msgid "Save"
 msgstr "Kaydet"
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300
+#: ../lib/searchaction.php:73 ../lib/util.php:277
 msgid "Search"
 msgstr "Ara"
 
-#: ../actions/noticesearch.php:80
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
 msgid "Search Stream Feed"
 msgstr ""
 
@@ -1608,8 +1104,9 @@ 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%%'da durum mesajlarının içeriğinde arama yap. Anahtar kelimeleri "
-"boşluk ile ayırın. Anahtar kelime 3 veya daha fazla karakterden oluşmalı."
+"%%site.name%%'da durum mesajlarının içeriğinde arama yap. Anahtar "
+"kelimeleri boşluk ile ayırın. Anahtar kelime 3 veya daha fazla "
+"karakterden oluşmalı."
 
 #: ../actions/peoplesearch.php:28
 #, php-format
@@ -1617,54 +1114,26 @@ 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%% üyeleri arasında isim, yer ya da ilgi alanları içinde arama "
-"yap. Anahtar kelimeleri boşluk ile ayırın. Anahtar kelime 3 veya daha fazla "
-"karakterden oluşmalı. "
+"%%site.name%% üyeleri arasında isim, yer ya da ilgi alanları içinde "
+"arama yap. Anahtar kelimeleri boşluk ile ayırın. Anahtar kelime 3 veya "
+"daha fazla karakterden oluşmalı. "
 
-#: ../actions/smssettings.php:296
-msgid "Select a carrier"
-msgstr ""
-
-#: ../actions/invite.php:137 ../lib/util.php:1172
+#: ../lib/util.php:982
 msgid "Send"
 msgstr "Gönder"
 
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-msgid "Send email to this address to post new notices."
-msgstr ""
-
-#: ../actions/emailsettings.php:88
-#, fuzzy
-msgid "Send me notices of new subscriptions through email."
-msgstr "Durum mesajlarını Jabber/GTalk üzerinden gönder."
-
-#: ../actions/imsettings.php:70
+#: ../actions/imsettings.php:71
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Durum mesajlarını Jabber/GTalk üzerinden gönder."
 
-#: ../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
-#, fuzzy
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr "Durum mesajlarını Jabber/GTalk üzerinden gönder."
-
-#: ../lib/util.php:304
+#: ../lib/util.php:282
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: ../actions/profilesettings.php:192
+#: ../actions/profilesettings.php:183
 msgid "Settings saved."
 msgstr "Ayarlar kaydedildi."
 
-#: ../actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr ""
-
 #: ../actions/finishaddopenid.php:66
 msgid "Someone else already has this OpenID."
 msgstr "Bir başkası zaten bu OpenID'ye sahip."
@@ -1673,45 +1142,36 @@ msgstr "Bir başkası zaten bu OpenID'ye sahip."
 msgid "Something weird happened."
 msgstr "Garip bir ÅŸey oldu."
 
-#: ../scripts/maildaemon.php:58
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: ../scripts/maildaemon.php:54
-#, fuzzy
-msgid "Sorry, that is not your incoming email address."
-msgstr "Yanlış IM adresi."
-
-#: ../lib/util.php:330
+#: ../lib/util.php:302
 msgid "Source"
 msgstr "Kaynak"
 
-#: ../actions/showstream.php:296
+#: ../actions/showstream.php:277
 msgid "Statistics"
 msgstr "Ä°statistikler"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
 msgid "Stored OpenID not found."
 msgstr "Kaydedilmiş OpenID bulunamadı."
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197
+#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
+#: ../actions/showstream.php:181
 msgid "Subscribe"
 msgstr "Abone ol"
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: ../actions/showstream.php:294 ../actions/subscribers.php:27
 msgid "Subscribers"
 msgstr "Abone olanlar"
 
-#: ../actions/userauthorization.php:310
+#: ../actions/userauthorization.php:309
 msgid "Subscription authorized"
 msgstr "Takip talebine izin verildi"
 
-#: ../actions/userauthorization.php:320
+#: ../actions/userauthorization.php:319
 msgid "Subscription rejected"
 msgstr "Abonelik reddedildi."
 
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
+#: ../actions/showstream.php:212 ../actions/showstream.php:288
 #: ../actions/subscriptions.php:27
 msgid "Subscriptions"
 msgstr "Abonelikler"
@@ -1720,14 +1180,6 @@ msgstr "Abonelikler"
 msgid "System error uploading file."
 msgstr "Dosya yüklemede sistem hatası."
 
-#: ../actions/tag.php:41 ../lib/util.php:301
-msgid "Tags"
-msgstr ""
-
-#: ../lib/searchaction.php:104
-msgid "Text"
-msgstr ""
-
 #: ../actions/noticesearch.php:34
 msgid "Text search"
 msgstr "Metin arama"
@@ -1744,86 +1196,45 @@ msgstr "O adres daha önce onaylanmış."
 msgid "That confirmation code is not for you!"
 msgstr "O onay kodu sizin için değil!"
 
-#: ../actions/emailsettings.php:191
-#, fuzzy
-msgid "That email address already belongs to another user."
-msgstr "Jabber ID başka bir kullanıcıya ait."
-
 #: ../actions/avatar.php:80
 msgid "That file is too big."
 msgstr "Dosya çok büyük."
 
-#: ../actions/imsettings.php:170
+#: ../actions/imsettings.php:161
 msgid "That is already your Jabber ID."
 msgstr "Bu zaten sizin Jabber ID'niz."
 
-#: ../actions/emailsettings.php:188
-#, fuzzy
-msgid "That is already your email address."
-msgstr "Bu zaten sizin Jabber ID'niz."
-
-#: ../actions/smssettings.php:188
-#, fuzzy
-msgid "That is already your phone number."
-msgstr "Bu zaten sizin Jabber ID'niz."
-
-#: ../actions/imsettings.php:233
+#: ../actions/imsettings.php:224
 msgid "That is not your Jabber ID."
 msgstr "Bu sizin Jabber ID'niz deÄŸil."
 
-#: ../actions/emailsettings.php:249
-#, fuzzy
-msgid "That is not your email address."
-msgstr "Yanlış IM adresi."
-
-#: ../actions/smssettings.php:257
-#, fuzzy
-msgid "That is not your phone number."
-msgstr "Bu sizin Jabber ID'niz deÄŸil."
-
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
+#: ../actions/imsettings.php:201
 msgid "That is the wrong IM address."
 msgstr "Yanlış IM adresi."
 
-#: ../actions/smssettings.php:233
-#, fuzzy
-msgid "That is the wrong confirmation number."
-msgstr "Yanlış IM adresi."
-
-#: ../actions/smssettings.php:191
-#, fuzzy
-msgid "That phone number already belongs to another user."
-msgstr "Jabber ID başka bir kullanıcıya ait."
-
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: ../actions/newnotice.php:52
 msgid "That's too long. Max notice size is 140 chars."
 msgstr ""
-"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
+"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne "
+"dersiniz?"
 
-#: ../actions/twitapiaccount.php:74
-#, fuzzy
-msgid "That's too long. Max notice size is 255 chars."
-msgstr ""
-"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
-
-#: ../actions/confirmaddress.php:92
+#: ../actions/confirmaddress.php:86
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "\"%s\" adresi hesabınız için onaylandı."
 
-#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274
+#: ../actions/imsettings.php:241
 msgid "The address was removed."
 msgstr "Bu adres kaldırılmıştı."
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:311 ../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 ""
 
-#: ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:321 ../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 "
@@ -1848,12 +1259,7 @@ msgstr "%s adlı kullanıcının durumlarını takip ettiği kullanıcılar"
 msgid "These are the people whose notices you listen to."
 msgstr "Sizin durumlarını takip ettiğiniz kullanıcılar"
 
-#: ../actions/invite.php:89
-msgid ""
-"These people are already users and you were automatically subscribed to them:"
-msgstr ""
-
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:87
 msgid "This confirmation code is too old. Please start again."
 msgstr "Onay kodu çok eski. Lütfen tekrar başlayınız."
 
@@ -1873,69 +1279,45 @@ msgid ""
 "your existing account, if you have one."
 msgstr ""
 "%s'a İlk defa giriş yapıyorsunuz. Bu yüzden OpenID'nizi hesabınıza "
-"bağlamamız gerekli. Bunun için ya yeni bir hesap oluşturabilirsiniz ya da "
-"varolan hesabınızı kullanabilirsiniz. "
-
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-msgid "This method requires a POST or DELETE."
-msgstr ""
+"bağlamamız gerekli. Bunun için ya yeni bir hesap oluşturabilirsiniz ya "
+"da varolan hesabınızı kullanabilirsiniz. "
 
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381
-msgid "This method requires a POST."
-msgstr ""
-
-#: ../lib/util.php:164
+#: ../lib/util.php:147
 msgid "This page is not available in a media type you accept"
 msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
 
-#: ../actions/profilesettings.php:63
-msgid "Timezone"
-msgstr ""
-
-#: ../actions/profilesettings.php:107
-msgid "Timezone not selected."
-msgstr ""
-
 #: ../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 ""
-
-#: ../actions/twitapifriendships.php:163
-msgid "Two user ids or screen_names must be supplied."
+"To subscribe, you can [login](%%action.login%%), or "
+"[register](%%action.register%%) a new  account. If you already have an "
+"account  on a [compatible microblogging site](%%doc.openmublog%%),  enter "
+"your profile URL below."
 msgstr ""
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: ../actions/profilesettings.php:51
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
-"Web Sitenizin, blogunuzun ya da varsa baÅŸka bir sitedeki profilinizin adresi"
+"Web Sitenizin, blogunuzun ya da varsa baÅŸka bir sitedeki profilinizin "
+"adresi"
 
-#: ../actions/remotesubscribe.php:74
+#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
 msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
-#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
-#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
 msgid "Unexpected form submission."
 msgstr "BeklenmeÄŸen form girdisi."
 
-#: ../actions/recoverpassword.php:276
+#: ../actions/recoverpassword.php:237
 msgid "Unexpected password reset."
 msgstr "Beklemeğen parola sıfırlaması."
 
-#: ../index.php:57
-msgid "Unknown action"
-msgstr ""
-
 #: ../actions/finishremotesubscribe.php:58
 msgid "Unknown version of OMB protocol."
 msgstr "OMB protokolünün bilinmeğen sürümü."
 
-#: ../lib/util.php:269
+#: ../lib/util.php:245
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
@@ -1948,11 +1330,11 @@ msgstr ""
 msgid "Unrecognized address type %s"
 msgstr "Tanınmayan adres türü %s"
 
-#: ../actions/showstream.php:209
+#: ../actions/showstream.php:193
 msgid "Unsubscribe"
 msgstr "Aboneliği sonlandır"
 
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
 msgid "Unsupported OMB version"
 msgstr "Desteklenmeyen OMB sürümü"
 
@@ -1960,24 +1342,6 @@ msgstr "Desteklenmeyen OMB sürümü"
 msgid "Unsupported image file format."
 msgstr "Desteklenmeyen görüntü dosyası biçemi."
 
-#: ../lib/settingsaction.php:100
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103
-msgid "Updates by instant messenger (IM)"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:241
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:341
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
 #: ../actions/avatar.php:68
 msgid "Upload"
 msgstr "Yükle"
@@ -1990,34 +1354,24 @@ msgid ""
 "share."
 msgstr ""
 "Buradan yeni bir \"avatar\" (kullanıcı resmi) yükleyin. Resminizi "
-"yükledikten sonra düzenleyemezsiniz bu sebeple kare biçimine yakın olmasına "
-"özen gösterin. Buna ek olarak, resminiz sitenin lisansına tabi olmalıdır. "
-"Kendinize ait olan ve paylaşmak istediğiniz bir resim kullanın. "
-
-#: ../lib/settingsaction.php:91
-#, fuzzy
-msgid "Upload a new profile image"
-msgstr "Yeni profil bilgisi kaydedilemedi"
+"yükledikten sonra düzenleyemezsiniz bu sebeple kare biçimine yakın "
+"olmasına özen gösterin. Buna ek olarak, resminiz sitenin lisansına tabi "
+"olmalıdır. Kendinize ait olan ve paylaşmak istediğiniz bir resim kullanın. "
 
-#: ../actions/invite.php:114
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
-msgstr ""
-
-#: ../actions/register.php:159 ../actions/register.php:162
+#: ../actions/profilesettings.php:48 ../actions/register.php:182
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
-"Sadece sistem güncellemeleri, duyurular ve parola geri alma için kullanılır."
+"Sadece sistem güncellemeleri, duyurular ve parola geri alma için "
+"kullanılır."
 
 #: ../actions/finishremotesubscribe.php:86
+#: actions/finishremotesubscribe.php:88
 msgid "User being listened to doesn't exist."
 msgstr ""
 
 #: ../actions/all.php:41 ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:47 ../actions/replies.php:41
-#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
-#: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
-#: ../actions/twitapiusers.php:82
+#: ../actions/foaf.php:43 ../actions/replies.php:41
+#: ../actions/showstream.php:44
 msgid "User has no profile."
 msgstr "Kullanıcının profili yok."
 
@@ -2025,138 +1379,81 @@ msgstr "Kullanıcının profili yok."
 msgid "User nickname"
 msgstr "Kullanıcı takma adı"
 
-#: ../actions/twitapiusers.php:75
-#, fuzzy
-msgid "User not found."
-msgstr "Kaydedilmiş OpenID bulunamadı."
-
-#: ../actions/profilesettings.php:63
-msgid "What timezone are you normally in?"
-msgstr ""
-
-#: ../lib/util.php:1159
+#: ../lib/util.php:969
 #, php-format
 msgid "What's up, %s?"
 msgstr "N'aber %s?"
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: ../actions/profilesettings.php:57
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi"
 
-#: ../actions/updateprofile.php:128
+#: ../actions/updateprofile.php:127
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "%s için yanlış resim türü"
 
-#: ../actions/updateprofile.php:123
+#: ../actions/updateprofile.php:122
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "%s'de yanlış resim boyutu"
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-msgid "Yes"
-msgstr ""
-
 #: ../actions/finishaddopenid.php:64
 msgid "You already have this OpenID!"
 msgstr "Zaten bu OpenID'ye sahipsiniz!"
 
-#: ../actions/deletenotice.php:37
-msgid ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
-msgstr ""
-
 #: ../actions/recoverpassword.php:31
 msgid "You are already logged in!"
 msgstr "Zaten giriş yapmış durumdasıznız!"
 
-#: ../actions/invite.php:81
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#: ../actions/twitapifriendships.php:128
-msgid "You are not friends with the specified user."
-msgstr ""
-
 #: ../actions/password.php:27
 msgid "You can change your password here. Choose a good one!"
 msgstr "Parolanızı burada değiştirebilirsiniz. İyi bir tane seçin!"
 
-#: ../actions/register.php:135
+#: ../actions/register.php:164
 msgid "You can create a new account to start posting notices."
 msgstr ""
-"Sizde bir hesap açıp durumunuzdan arkadaşlarınızı haberdar edebilirsiniz."
-
-#: ../actions/smssettings.php:28
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
+"Sizde bir hesap açıp durumunuzdan arkadaşlarınızı haberdar "
+"edebilirsiniz."
 
 #: ../actions/openidsettings.php:86
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
-"\"Sil\" düğmesine basarak hesabınızdan eklediğiniz OpenID'yi silebilirsiniz."
+"\"Sil\" düğmesine basarak hesabınızdan eklediğiniz OpenID'yi "
+"silebilirsiniz."
 
 #: ../actions/imsettings.php:28
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
 "Jabber/GTalk kullanarak durum mesaji gÖnderip alabilirsiniz. IM adres "
 "ayarlarinizi aşağıda yapın."
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about you."
+"You can update your personal profile info here so people know more about "
+"you."
 msgstr ""
-"Burada kişisel profilinizi güncelleyebilirsiniz, böylelikle insanlar sizin "
-"hakkınızda daha fazla bilgi sahibi olur."
+"Burada kişisel profilinizi güncelleyebilirsiniz, böylelikle insanlar "
+"sizin hakkınızda daha fazla bilgi sahibi olur."
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
 msgid "You can use the local subscription!"
 msgstr "Yerel aboneliÄŸi kullanabilirsiniz!"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
 msgid "You can't register if you don't agree to the license."
 msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
 
-#: ../actions/updateprofile.php:63
+#: ../actions/updateprofile.php:62
 msgid "You did not send us that profile"
 msgstr "Bize o profili yollamadınız"
 
-#: ../lib/mail.php:147
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
-"Send email to %2$s to post new messages.\n"
-"\n"
-"More email instructions at %3$s.\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s"
-msgstr ""
-
-#: ../actions/twitapistatuses.php:612
-msgid "You may not delete another user's status."
-msgstr ""
-
-#: ../actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr ""
-
-#: ../actions/invite.php:103
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
-
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:134
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Harika, sizi tanıdık. Simdi yeni parolanızı girin."
 
@@ -2164,7 +1461,7 @@ msgstr "Harika, sizi tanıdık. Simdi yeni parolanızı girin."
 msgid "Your OpenID URL"
 msgstr "OpenID URLniz"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:149
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Bu sunucudaki takma adınız  veya kaydedilmiş eposta adresiniz."
 
@@ -2177,61 +1474,57 @@ msgstr ""
 "[OpenID](%%doc.openid%%) tek hesap ile bir çok siteye giriş yapmanızı "
 "sağlar. Hesabınızla bağlantılı OpenID'lerinizi burada yönetebilirsiniz."
 
-#: ../lib/util.php:943
+#: ../lib/util.php:814
 msgid "a few seconds ago"
 msgstr "birkaç saniye önce"
 
-#: ../lib/util.php:955
+#: ../lib/util.php:826
 #, php-format
 msgid "about %d days ago"
 msgstr "yaklaşık %d gün önce"
 
-#: ../lib/util.php:951
+#: ../lib/util.php:822
 #, php-format
 msgid "about %d hours ago"
 msgstr "yaklaşık %d saat önce"
 
-#: ../lib/util.php:947
+#: ../lib/util.php:818
 #, php-format
 msgid "about %d minutes ago"
 msgstr "yaklaşık %d dakika önce"
 
-#: ../lib/util.php:959
+#: ../lib/util.php:830
 #, php-format
 msgid "about %d months ago"
 msgstr "yaklaşık %d ay önce"
 
-#: ../lib/util.php:953
+#: ../lib/util.php:824
 msgid "about a day ago"
 msgstr "yaklaşık bir gün önce"
 
-#: ../lib/util.php:945
+#: ../lib/util.php:816
 msgid "about a minute ago"
 msgstr "yaklaşık bir dakika önce"
 
-#: ../lib/util.php:957
+#: ../lib/util.php:828
 msgid "about a month ago"
 msgstr "yaklaşık bir ay önce"
 
-#: ../lib/util.php:961
+#: ../lib/util.php:832
 msgid "about a year ago"
 msgstr "yaklaşık bir yıl önce"
 
-#: ../lib/util.php:949
+#: ../lib/util.php:820
 msgid "about an hour ago"
 msgstr "yaklaşık bir saat önce"
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-msgid "delete"
-msgstr ""
-
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117
+#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
+#: ../lib/stream.php:101
 msgid "in reply to..."
 msgstr "...cevap olarak"
 
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124
+#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
+#: ../lib/stream.php:108
 msgid "reply"
 msgstr "cevapla"
 
@@ -2239,24 +1532,1311 @@ msgstr "cevapla"
 msgid "same as password above"
 msgstr "yukaridaki parola ile aynı"
 
-#: ../actions/twitapistatuses.php:755
-#, fuzzy
-msgid "unsupported file type"
-msgstr "Desteklenmeyen görüntü dosyası biçemi."
-
-#: ../lib/util.php:1309
+#: ../lib/util.php:1127
 msgid "« After"
 msgstr "« Sonra"
 
-#~ msgid "Couldn't confirm email."
-#~ msgstr "Eposta onaylanamadı."
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+msgid " from "
+msgstr ""
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
+
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#, php-format
+msgid "%s public timeline"
+msgstr ""
+
+#: ../lib/mail.php:206 lib/mail.php:212
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/register.php:154 actions/register.php:168
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55
+msgid "API method not found!"
+msgstr ""
+
+#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
+#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
+#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
+#: ../actions/twitapidirect_messages.php:49
+#: ../actions/twitapidirect_messages.php:56
+#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
+#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
+#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
+#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
+#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
+#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
+#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
+#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
+#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
+#: actions/twitapistatuses.php:690
+msgid "API method under construction."
+msgstr ""
+
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
+
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for "
+"non-humans)"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
+
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr ""
+
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+msgid "Change email handling"
+msgstr ""
+
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+msgid "Change your profile settings"
+msgstr ""
+
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+msgid "Could not follow user: User not found."
+msgstr ""
+
+#: ../lib/subs.php:54 lib/subs.php:61
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: ../lib/subs.php:46 lib/subs.php:46
+msgid "Could not subscribe."
+msgstr ""
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+msgid "Couldn't update user record."
+msgstr ""
+
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr ""
+
+#: ../classes/Notice.php:72 classes/Notice.php:86
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr ""
+
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr ""
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr ""
 
-# Note: Bu federation ozelligi nasilsa simdi kullanilmayacak
-#~ msgid "Couldn't create subscription."
-#~ msgstr "Abonelik oluşturulamadı."
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: ../actions/tag.php:55 actions/tag.php:55
+#, php-format
+msgid "Feed for tag %s"
+msgstr ""
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr ""
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr ""
+
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+msgid "I want to post notices by email."
+msgstr ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+msgid "IM"
+msgstr ""
+
+#: ../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
+msgid "Incoming email"
+msgstr ""
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+msgid "Incoming email address removed."
+msgstr ""
+
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Durum gönderilirken hata oluştu"
+#: ../lib/util.php:306 lib/util.php:322
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Language"
+msgstr ""
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+msgid "Language is too long (max 50 chars)."
+msgstr ""
+
+#: ../actions/register.php:166 actions/register.php:180
+msgid "Longer name, preferably your \"real\" name"
+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 ""
 
-#~ msgid "Public"
-#~ msgstr "Genel"
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr ""
+
+#: ../lib/mail.php:144 lib/mail.php:144
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+msgid "New incoming email address added."
+msgstr ""
+
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+msgid "No"
+msgstr ""
+
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr ""
+
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+msgid "No email address."
+msgstr ""
+
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+msgid "No incoming email address."
+msgstr ""
+
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+msgid "No status with that ID found."
+msgstr ""
+
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+msgid "Not a registered user."
+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
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+msgid "Not found"
+msgstr ""
+
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr ""
+
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
+
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr ""
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr ""
+
+#: ../actions/invite.php:133 actions/invite.php:141
+msgid "Personal message"
+msgstr ""
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Preferred language"
+msgstr ""
+
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/register.php:28 actions/register.php:28
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+msgid "Registration successful"
+msgstr ""
+
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/register.php:156 actions/register.php:170
+msgid "Same as password above. Required."
+msgstr ""
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr ""
+
+#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
+#: actions/emailsettings.php:74 actions/smssettings.php:82
+msgid "Send email to this address to post new notices."
+msgstr ""
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../actions/tag.php:60 actions/tag.php:60
+msgid "Showing most popular tags from the last week"
+msgstr ""
+
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317
+msgid "Tags"
+msgstr ""
+
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
+msgid "Text"
+msgstr ""
+
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+msgid "That is not your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+msgid "That is not your phone number."
+msgstr ""
+
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/invite.php:89 actions/invite.php:96
+msgid ""
+"These people are already users and you were automatically subscribed to "
+"them:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511
+msgid "This method requires a POST or 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
+msgid "This method requires a POST."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+msgid "Timezone not selected."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+msgid "Two user ids or screen_names must be supplied."
+msgstr ""
+
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this "
+"service."
+msgstr ""
+
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+msgid "Yes"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+msgid "You are not friends with the specified user."
+msgstr ""
+
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr ""
+
+#: ../actions/invite.php:103 actions/invite.php:110
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
+msgstr ""
+
+#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99
+msgid "delete"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+msgid "unsupported file type"
+msgstr ""
+
+#: actions/deletenotice.php:74 actions/disfavor.php:43
+#: actions/emailsettings.php:127 actions/favor.php:45
+#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
+#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
+#: actions/openidsettings.php:123 actions/profilesettings.php:47
+#: actions/recoverpassword.php:282 actions/register.php:42
+#: actions/remotesubscribe.php:40 actions/smssettings.php:124
+#: actions/subscribe.php:44 actions/twittersettings.php:97
+#: actions/unsubscribe.php:41 actions/userauthorization.php:35
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/disfavor.php:55
+msgid "This notice is not a favorite!"
+msgstr ""
+
+#: actions/disfavor.php:63
+msgid "Could not delete favorite."
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Favor"
+msgstr ""
+
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+
+#: actions/emailsettings.php:95
+msgid "Send me email when someone sends me a private message."
+msgstr ""
+
+#: actions/favor.php:53 actions/twitapifavorites.php:142
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132
+msgid "Could not create favorite."
+msgstr ""
+
+#: actions/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#, php-format
+msgid "%s favorite notices"
+msgstr ""
+
+#: actions/favoritesrss.php:64
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr ""
+
+#: actions/inbox.php:28
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+
+#: actions/invite.php:178
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+msgstr ""
+
+#: actions/login.php:104
+msgid "Automatically login in the future; "
+msgstr ""
+
+#: actions/login.php:122
+msgid "For security reasons, please re-enter your "
+msgstr ""
+
+#: actions/login.php:126
+msgid "Login with your username and password. "
+msgstr ""
+
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+msgid "That's too long. Max message size is 140 chars."
+msgstr ""
+
+#: actions/newmessage.php:65
+msgid "No recipient specified."
+msgstr ""
+
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206
+msgid "You can't send a message to this user."
+msgstr ""
+
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly "
+"instead."
+msgstr ""
+
+#: actions/newmessage.php:108
+msgid "No such user"
+msgstr ""
+
+#: actions/newmessage.php:117
+msgid "New message"
+msgstr ""
+
+#: actions/noticesearch.php:95
+msgid "Notice without matching profile"
+msgstr ""
+
+#: actions/openidsettings.php:28
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr ""
+
+#: actions/openidsettings.php:46
+msgid "If you want to add an OpenID to your account, "
+msgstr ""
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr ""
+
+#: actions/openidsettings.php:87
+msgid "You can remove an OpenID from your account "
+msgstr ""
+
+#: actions/outbox.php:28
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr ""
+
+#: actions/outbox.php:30
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#: actions/outbox.php:53
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+
+#: actions/peoplesearch.php:28
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+msgstr ""
+
+#: actions/profilesettings.php:27
+msgid "You can update your personal profile info here "
+msgstr ""
+
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+msgid "User without matching profile"
+msgstr ""
+
+#: actions/recoverpassword.php:91
+msgid "This confirmation code is too old. "
+msgstr ""
+
+#: actions/recoverpassword.php:141
+msgid "If you've forgotten or lost your"
+msgstr ""
+
+#: actions/recoverpassword.php:154
+msgid "You've been identified. Enter a "
+msgstr ""
+
+#: actions/recoverpassword.php:169
+msgid "Your nickname on this server, "
+msgstr ""
+
+#: actions/recoverpassword.php:271
+msgid "Instructions for recovering your password "
+msgstr ""
+
+#: actions/recoverpassword.php:327
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95
+msgid "Password must be 6 or more characters."
+msgstr ""
+
+#: actions/register.php:216
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
+msgstr ""
+
+#: actions/register.php:227
+msgid "(You should receive a message by email momentarily, with "
+msgstr ""
+
+#: actions/remotesubscribe.php:51
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
+msgstr ""
+
+#: actions/showfavorites.php:61
+#, php-format
+msgid "Feed for favorites of %s"
+msgstr ""
+
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+msgid "Could not retrieve favorite notices."
+msgstr ""
+
+#: actions/showmessage.php:33
+msgid "No such message."
+msgstr ""
+
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
+msgstr ""
+
+#: actions/showmessage.php:61
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr ""
+
+#: actions/showmessage.php:66
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr ""
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr ""
+
+#: actions/smssettings.php:312
+#, php-format
+msgid "Mobile carrier for your phone. "
+msgstr ""
+
+#: actions/twitapidirect_messages.php:76
+#, php-format
+msgid "Direct messages to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:77
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:81
+msgid "Direct Messages You've Sent"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:82
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:128
+msgid "No message text!"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:138
+msgid "Recipient user not found."
+msgstr ""
+
+#: actions/twitapidirect_messages.php:141
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
+#: actions/twitapifavorites.php:92
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr ""
+
+#: actions/twitapifavorites.php:95
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr ""
+
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#, php-format
+msgid "%s added your notice as a favorite"
+msgstr ""
+
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+msgstr ""
+
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+msgstr ""
+
+#: actions/twittersettings.php:41
+msgid "Twitter settings"
+msgstr ""
+
+#: actions/twittersettings.php:48
+msgid "Twitter Account"
+msgstr ""
+
+#: actions/twittersettings.php:56
+msgid "Current verified Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr ""
+
+#: actions/twittersettings.php:65
+msgid "No spaces, please."
+msgstr ""
+
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr ""
+
+#: actions/twittersettings.php:72
+msgid "Automatically send my notices to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:75
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:78
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+
+#: actions/twittersettings.php:128
+msgid "Could not verify your Twitter credentials!"
+msgstr ""
+
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+msgid "Unable to save your Twitter settings!"
+msgstr ""
+
+#: actions/twittersettings.php:174
+msgid "Twitter settings saved."
+msgstr ""
+
+#: actions/twittersettings.php:192
+msgid "That is not your Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+msgid "Couldn't remove Twitter user."
+msgstr ""
+
+#: actions/twittersettings.php:212
+msgid "Twitter account removed."
+msgstr ""
+
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+msgid "Couldn't save Twitter preferences."
+msgstr ""
+
+#: actions/twittersettings.php:245
+msgid "Twitter preferences saved."
+msgstr ""
+
+#: actions/userauthorization.php:84
+msgid "Please check these details to make sure "
+msgstr ""
+
+#: actions/userauthorization.php:324
+msgid "The subscription has been authorized, but no "
+msgstr ""
+
+#: actions/userauthorization.php:334
+msgid "The subscription has been rejected, but no "
+msgstr ""
+
+#: classes/Channel.php:113
+msgid "Command results"
+msgstr ""
+
+#: classes/Channel.php:148
+msgid "Command complete"
+msgstr ""
+
+#: classes/Channel.php:158
+msgid "Command failed"
+msgstr ""
+
+#: classes/Command.php:39
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: classes/Command.php:96
+#, php-format
+msgid "Subscriptions: %1$s\n"
+msgstr ""
+
+#: classes/Command.php:125 classes/Command.php:242
+msgid "User has no last notice"
+msgstr ""
+
+#: classes/Command.php:146
+msgid "Notice marked as fave."
+msgstr ""
+
+#: classes/Command.php:166
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr ""
+
+#: classes/Command.php:169
+#, php-format
+msgid "Fullname: %s"
+msgstr ""
+
+#: classes/Command.php:172
+#, php-format
+msgid "Location: %s"
+msgstr ""
+
+#: classes/Command.php:175
+#, php-format
+msgid "Homepage: %s"
+msgstr ""
+
+#: classes/Command.php:178
+#, php-format
+msgid "About: %s"
+msgstr ""
+
+#: classes/Command.php:200
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
+
+#: classes/Command.php:214
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
+
+#: classes/Command.php:216
+msgid "Error sending direct message."
+msgstr ""
+
+#: classes/Command.php:263
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: classes/Command.php:270
+#, php-format
+msgid "Subscribed to %s"
+msgstr ""
+
+#: classes/Command.php:288
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
+
+#: classes/Command.php:295
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr ""
+
+#: classes/Command.php:310 classes/Command.php:330
+msgid "Command not yet implemented."
+msgstr ""
+
+#: classes/Command.php:313
+msgid "Notification off."
+msgstr ""
+
+#: classes/Command.php:315
+msgid "Can't turn off notification."
+msgstr ""
+
+#: classes/Command.php:333
+msgid "Notification on."
+msgstr ""
+
+#: classes/Command.php:335
+msgid "Can't turn on notification."
+msgstr ""
+
+#: classes/Command.php:344
+msgid "Commands:\n"
+msgstr ""
+
+#: classes/Message.php:53
+msgid "Could not insert message."
+msgstr ""
+
+#: classes/Message.php:63
+msgid "Could not update message with new URI."
+msgstr ""
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr ""
+
+#: lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:249
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:253
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+msgstr ""
+
+#: lib/mailbox.php:43
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/openid.php:195
+msgid "This form should automatically submit itself. "
+msgstr ""
+
+#: lib/personal.php:65
+msgid "Favorites"
+msgstr ""
+
+#: lib/personal.php:66
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
+#: lib/personal.php:66
+msgid "User"
+msgstr ""
+
+#: lib/personal.php:75
+msgid "Inbox"
+msgstr ""
+
+#: lib/personal.php:76
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personal.php:80
+msgid "Outbox"
+msgstr ""
+
+#: lib/personal.php:81
+msgid "Your sent messages"
+msgstr ""
+
+#: lib/settingsaction.php:99
+msgid "Twitter"
+msgstr ""
+
+#: lib/settingsaction.php:100
+msgid "Twitter integration options"
+msgstr ""
+
+#: lib/util.php:1718
+msgid "To"
+msgstr ""
+
+#: scripts/maildaemon.php:45
+msgid "Could not parse message."
+msgstr ""
diff --git a/locale/uk_UA/LC_MESSAGES/laconica.mo b/locale/uk_UA/LC_MESSAGES/laconica.mo
index 4167b2865..15d92e5aa 100644
--- a/locale/uk_UA/LC_MESSAGES/laconica.mo
+++ b/locale/uk_UA/LC_MESSAGES/laconica.mo
diff --git a/locale/uk_UA/LC_MESSAGES/laconica.po b/locale/uk_UA/LC_MESSAGES/laconica.po
index 5187e4801..329397dbb 100644
--- a/locale/uk_UA/LC_MESSAGES/laconica.po
+++ b/locale/uk_UA/LC_MESSAGES/laconica.po
@@ -1,8 +1,16 @@
+# #-#-#-#-#  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.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  laconica.po  #-#-#-#-#\n"
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-27 14:57-0400\n"
+"POT-Creation-Date: 2008-07-29 20:02+1200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Kostyantyn Bakarzhiev <boogie@e-mail.ua>\n"
 "Language-Team: \n"
@@ -11,70 +19,50 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Ukrainian\n"
 "X-Poedit-Country: UKRAINE\n"
+"#-#-#-#-#  laconica.new.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: ../actions/noticesearchrss.php:64
 #, php-format
 msgid " Search Stream for \"%s\""
 msgstr "Потік пошуку дл� \"%s\""
 
-#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
-msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr ""
-"окрім цих приватних даних: пароль, електронна адре�а, адре�а IM, телефонний "
-"номер."
+#: ../actions/tag.php:139
+msgid " by "
+msgstr "від"
 
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-msgid " from "
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:255
+msgid ""
+" except this private data: password, email address, IM address, phone "
+"number."
 msgstr ""
+"окрім цих приватних даних: пароль, "
+"електронна адре�а, адре�а IM, телефонний номер."
 
-#: ../actions/twitapistatuses.php:478
+#: ../actions/twitapistatuses.php:469
 #, php-format
 msgid "%1$s / Updates replying to %2$s"
 msgstr "%1$s / Оновленні відповіді %2$s"
 
-#: ../actions/invite.php:168
-#, fuzzy, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s тепер �лідкує за вашими повідомлен�ми на %2$s."
-
-#: ../actions/invite.php:170
+#: ../actions/tag.php:127
 #, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
+msgid "%1$s Notices recently tagged with %2$s"
+msgstr "%1$s Повідомленн� щойно позначені з %2$s"
 
-#: ../lib/mail.php:124
+#: ../lib/mail.php:120
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s тепер �лідкує за вашими повідомлен�ми на %2$s."
 
-#: ../lib/mail.php:126
+#: ../lib/mail.php:122
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -84,14 +72,10 @@ msgid ""
 "Faithfully yours,\n"
 "%4$s.\n"
 msgstr ""
-"%1$s тепер �лідкує за вашими повідомлен�ми на %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Щиро ваші,\n"
-"%4$s.\n"
+"%1$s тепер �лідкує за вашими повідомлен�ми "
+"на %2$s.\n\n\t%3$s\n\nЩиро ваші,\n%4$s.\n"
 
-#: ../actions/twitapistatuses.php:482
+#: ../actions/twitapistatuses.php:473
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s оновив(ла) цю відповідь на оновленн� від %2$s / %3$s."
@@ -101,18 +85,13 @@ msgstr "%1$s оновив(ла) цю відповідь на оновленн�
 msgid "%1$s's status on %2$s"
 msgstr "%1$s має �тату� на %2$s"
 
-#: ../actions/invite.php:84 ../actions/invite.php:92
-#, php-format
-msgid "%s (%s)"
-msgstr ""
-
-#: ../actions/publicrss.php:62
+#: ../actions/publicrss.php:60
 #, php-format
 msgid "%s Public Stream"
 msgstr "%s Спільний потік"
 
 #: ../actions/all.php:47 ../actions/allrss.php:60
-#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51
+#: ../actions/twitapistatuses.php:235 ../lib/stream.php:51
 #, php-format
 msgid "%s and friends"
 msgstr "%s з друз�ми"
@@ -122,12 +101,12 @@ msgstr "%s з друз�ми"
 msgid "%s public timeline"
 msgstr "%s �пільний ча�овий потік"
 
-#: ../lib/mail.php:206
+#: ../lib/mail.php:202
 #, php-format
 msgid "%s status"
 msgstr "%s �тату�"
 
-#: ../actions/twitapistatuses.php:338
+#: ../actions/twitapistatuses.php:335
 #, php-format
 msgid "%s timeline"
 msgstr "%s ча�овий потік"
@@ -137,101 +116,84 @@ msgstr "%s ча�овий потік"
 msgid "%s updates from everyone!"
 msgstr "%s оновленн� від в�іх!"
 
-#: ../actions/register.php:213
+#: ../actions/register.php:277
 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:244
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** is a microblogging service brought to you by "
+"[%%site.broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
-"**%%site.name%%** це �ерві� мікроблогів наданий вам [%%site.broughtby%%](%%"
-"site.broughtbyurl%%)."
+"**%%site.name%%** це �ерві� мікроблогів наданий "
+"вам [%%site.broughtby%%](%%site.broughtbyurl%%)."
 
-#: ../lib/util.php:259
+#: ../lib/util.php:246
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** це �ерві� мікроблогів."
 
-#: ../lib/util.php:274
+#: ../lib/util.php:261
 msgid ". Contributors should be attributed by full name or nickname."
 msgstr ""
-". Контрибутори мають бути зазначені повним ім'�м або ім'�м кори�тувача."
+". Контрибутори мають бути зазначені "
+"повним ім'�м або ім'�м кори�тувача."
 
 #: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 букви нижнього регі�тра і цифри, ні�кої пунктуації або інтервалів"
 
-#: ../actions/register.php:152
+#: ../actions/register.php:221
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
-"1-64 букви нижнього регі�тра і цифри, ні�кої пунктуації або інтервалів. "
-"�еодмінно."
+"1-64 букви нижнього регі�тра і цифри, "
+"ні�кої пунктуації або інтервалів. �еодмінно."
 
 #: ../actions/password.php:42
 msgid "6 or more characters"
 msgstr "6 або більше знаків"
 
-#: ../actions/recoverpassword.php:180
+#: ../actions/recoverpassword.php:165
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 або більше знаків, і не забудьте їх!"
 
-#: ../actions/register.php:154
+#: ../actions/register.php:223
 msgid "6 or more characters. Required."
 msgstr "6 або більше знаків. �еодмінно."
 
 #: ../actions/imsettings.php:197
 #, php-format
 msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
+"A confirmation code was sent to the IM address you added. You must approve "
+"%s for sending messages to you."
 msgstr ""
-"Код підтвердженн� був відправлений на адре�у IM, �ку ви додали. Ви повинні "
-"�хвалити %s дл� відправленн� вам повідомлень."
+"Код підтвердженн� був відправлений на "
+"адре�у IM, �ку ви додали. Ви повинні �хвалити %s дл� відправленн� вам повідомлень."
 
 #: ../actions/emailsettings.php:213
 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 ""
-"Код підтвердженн� був відправлений на електронну адре�у, �ку ви додали. "
-"Перевірте вхідну пошту (і теку зі �памом також!), там має бути код та "
-"подальші ін�трукції."
+"Код підтвердженн� був відправлений на "
+"електронну адре�у, �ку ви додали. "
+"Перевірте вхідну пошту (і теку зі �памом також!), там має бути код та подальші ін�трукції."
 
 #: ../actions/smssettings.php:216
 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 ""
-"Код підтвердженн� був відправлений на телефонний номер, �кий ви додали. "
+"Код підтвердженн� був відправлений на "
+"телефонний номер, �кий ви додали. "
 "Перевірте вхідні повідомленн�, там має бути код та подальші ін�трукції."
 
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122
-msgid "API method not found!"
-msgstr ""
-
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-msgid "API method under construction."
-msgstr ""
-
-#: ../lib/util.php:324
+#: ../lib/util.php:310
 msgid "About"
 msgstr "Про"
 
@@ -248,25 +210,16 @@ msgstr "Додати"
 msgid "Add OpenID"
 msgstr "Додати OpenID"
 
-#: ../lib/settingsaction.php:97
-#, fuzzy
-msgid "Add or remove OpenIDs"
-msgstr "Видалити OpenID"
-
 #: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
 #: ../actions/smssettings.php:39
 msgid "Address"
 msgstr "�дре�а"
 
-#: ../actions/invite.php:131
-msgid "Addresses of friends to invite (one per line)"
-msgstr ""
-
 #: ../actions/showstream.php:273
 msgid "All subscriptions"
 msgstr "В�і підпи�ки"
 
-#: ../actions/publicrss.php:64
+#: ../actions/publicrss.php:62
 #, php-format
 msgid "All updates for %s"
 msgstr "В�і оновленн� дл� %s"
@@ -281,7 +234,7 @@ msgstr "В�і оновленн� за збігом з \"%s\""
 msgid "Already logged in."
 msgstr "Тепер ви увійшли."
 
-#: ../lib/subs.php:42
+#: ../actions/subscribe.php:49
 msgid "Already subscribed!."
 msgstr "Тепер ви підпи�ані!"
 
@@ -293,18 +246,19 @@ msgstr "Ви впевненні, що бажаєте видалити це поÐ
 msgid "Authorize subscription"
 msgstr "�вторизувати підпи�ку"
 
-#: ../actions/login.php:104 ../actions/register.php:178
+#: ../actions/login.php:104 ../actions/register.php:242
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "�втоматично входити у майбутньому; не дл� "
 
 #: ../actions/profilesettings.php:65
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for "
+"non-humans)"
 msgstr ""
-"�втоматично підпи�увати�ь до тих, хто підпи�ав�� до мене (�кщо ви бот, це "
-"�аме дл� ва�)"
+"�втоматично підпи�увати�ь до тих, хто "
+"підпи�ав�� до мене (�кщо ви бот, це �аме дл� ва�)"
 
-#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: ../actions/avatar.php:32
 msgid "Avatar"
 msgstr "�ватара"
 
@@ -318,31 +272,31 @@ 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
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
-"Очікуванн� підтвердженн� цієї адре�и. Перевірте вхідну пошту (і теку зі "
-"�памом також!), там має бути повідомленн� з подальшими ін�трукці�ми."
+"Очікуванн� підтвердженн� цієї адре�и. "
+"Перевірте вхідну пошту (і теку зі �памом також!), там має бути повідомленн� з подальшими ін�трукці�ми."
 
 #: ../actions/smssettings.php:58
 msgid "Awaiting confirmation on this phone number."
 msgstr "Очікуванн� підтвердженн� телефонного номера."
 
-#: ../lib/util.php:1318
+#: ../lib/util.php:1290
 msgid "Before »"
 msgstr "Раніше"
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: ../actions/profilesettings.php:49 ../actions/register.php:234
 msgid "Bio"
 msgstr "Про �ебе"
 
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
+#: ../actions/profilesettings.php:101 ../actions/register.php:78
 #: ../actions/updateprofile.php:103
 msgid "Bio is too long (max 140 chars)."
 msgstr "Про �ебе забагато напи�ано (140 знаків мак�имум)"
@@ -356,7 +310,7 @@ msgstr "�е можна видалити це повідомленн�."
 msgid "Can't read avatar URL '%s'"
 msgstr "�е можна прочитати URL аватари '%s'"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
+#: ../actions/password.php:85 ../actions/recoverpassword.php:261
 msgid "Can't save new password."
 msgstr "�е можна зберегти новий пароль."
 
@@ -381,30 +335,16 @@ msgstr "�е можна полагодити цю поштову адре�у"
 msgid "Change"
 msgstr "Змінити"
 
-#: ../lib/settingsaction.php:88
-msgid "Change email handling"
-msgstr ""
-
 #: ../actions/password.php:32
 msgid "Change password"
 msgstr "Змінити пароль"
 
-#: ../lib/settingsaction.php:94
-#, fuzzy
-msgid "Change your password"
-msgstr "Змінити пароль"
-
-#: ../lib/settingsaction.php:85
-#, fuzzy
-msgid "Change your profile settings"
-msgstr "�алаштуванн� профілю"
-
-#: ../actions/password.php:43 ../actions/recoverpassword.php:181
-#: ../actions/register.php:155 ../actions/smssettings.php:65
+#: ../actions/password.php:43 ../actions/recoverpassword.php:166
+#: ../actions/register.php:224 ../actions/smssettings.php:65
 msgid "Confirm"
 msgstr "Підтвердити"
 
-#: ../actions/confirmaddress.php:90
+#: ../actions/confirmaddress.php:86
 msgid "Confirm Address"
 msgstr "Підтвердити адре�у"
 
@@ -421,7 +361,7 @@ msgstr "Код підтвердженн�"
 msgid "Confirmation code not found."
 msgstr "Код підтвердженн� не знайдено."
 
-#: ../actions/register.php:202
+#: ../actions/register.php:266
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -439,19 +379,16 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
-"Вітаємо, %s! І ла�каво про�имо до %%%%site.name%%%%. Звід�и ви, можливо, "
-"�хочете...\n"
-"\n"
-"*Подивити�ь [ваш профіль](%s) та напи�ати �воє перше повідомленн�.\n"
-"*Додати [адре�у Jabber/GTalk](%%%%action.imsettings%%%%), так щоб мати змогу "
-"над�илати повідомленн� через �лужбу миттєвих повідомлень.\n"
-"*[Розшукати людей](%%%%action.peoplesearch%%%%), �кі мають �пільні з вами "
-"інтере�и. \n"
-"*Прочитати [додаткову інформацію](%%%%doc.help%%%%), аби переконати�ь, що ви "
-"нічого не пропу�тили. \n"
+"Вітаємо, %s! І ла�каво про�имо до %%%%site.name%%%%. "
+"Звід�и ви, можливо, �хочете...\n"
 "\n"
-"Д�куємо, що зареє�трували�ь у на�, і, �подіваємо�ь, вам �подобаєть�� наш "
-"�ерві�."
+"*Подивити�ь [ваш профіль](%s) та напи�ати "
+"�воє перше повідомленн�.\n"
+"*Додати [адре�у Jabber/GTalk](%%%%action.imsettings%%%%), так "
+"щоб мати змогу над�илати повідомленн� "
+"через �лужбу миттєвих повідомлень.\n"
+"*[Розшукати людей](%%%%action.peoplesearch%%%%), �кі "
+"мають �пільні з вами інтере�и. \n*Прочитати [додаткову інформацію](%%%%doc.help%%%%), аби переконати�ь, що ви нічого не пропу�тили. \n\nД�куємо, що зареє�трували�ь у на�, і, �подіваємо�ь, вам �подобаєть�� наш �ерві�."
 
 #: ../actions/finishopenidlogin.php:91
 msgid "Connect"
@@ -461,7 +398,7 @@ msgstr "З'єднати�ь"
 msgid "Connect existing account"
 msgstr "З'єднати�ь викори�товуючи і�нуючий рахунок"
 
-#: ../lib/util.php:332
+#: ../lib/util.php:318
 msgid "Contact"
 msgstr "Контакт"
 
@@ -470,12 +407,7 @@ msgstr "Контакт"
 msgid "Could not create OpenID form: %s"
 msgstr "�е вдало�� �творити форму OpenID: %s"
 
-#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
-#, fuzzy, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr "�е вдало�� �лідувати за кори�тувачем: кори�тувача не знайдено."
-
-#: ../actions/twitapifriendships.php:53
+#: ../actions/twitapifriendships.php:48
 msgid "Could not follow user: User not found."
 msgstr "�е вдало�� �лідувати за кори�тувачем: кори�тувача не знайдено."
 
@@ -492,38 +424,28 @@ msgstr "Ð�е вдалоÑ�Ñ� зберегти інформацію про аваÑ
 msgid "Could not save new profile info"
 msgstr "�е вдало�� зберегти інформацію про новий профіль"
 
-#: ../lib/subs.php:54
+#: ../actions/subscribe.php:62
 msgid "Could not subscribe other to you."
 msgstr "�е вдало�� підпи�ати іншого до ва�."
 
-#: ../lib/subs.php:46
+#: ../actions/subscribe.php:54
 msgid "Could not subscribe."
 msgstr "�евдала підпи�ка."
 
-#: ../actions/recoverpassword.php:102
-#, fuzzy
-msgid "Could not update user with confirmed email address."
-msgstr "Поточна підтверджена поштова адре�а."
-
 #: ../actions/finishremotesubscribe.php:99
 msgid "Couldn't convert request tokens to access tokens."
 msgstr "�е вдало�� перетворити токени запиту на токени зверненн�."
 
-#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
+#: ../actions/confirmaddress.php:80 ../actions/emailsettings.php:234
 #: ../actions/imsettings.php:218 ../actions/smssettings.php:241
 msgid "Couldn't delete email confirmation."
 msgstr "�е вдало�� видалити підтвердженн� поштової адре�и."
 
-#: ../lib/subs.php:103
+#: ../actions/unsubscribe.php:57
 msgid "Couldn't delete subscription."
 msgstr "�е вдало�� видалити підпи�ку."
 
-#: ../actions/twitapistatuses.php:93
-#, fuzzy
-msgid "Couldn't find any statuses."
-msgstr "�е вдало�� оновити кори�тувача."
-
-#: ../actions/remotesubscribe.php:127
+#: ../actions/remotesubscribe.php:125
 msgid "Couldn't get a request token."
 msgstr "�е вдало�� отримати токен запиту."
 
@@ -536,11 +458,11 @@ msgstr "�е вдало�� додати код підтвердженн�."
 msgid "Couldn't insert new subscription."
 msgstr "�е вдало�� додати нову підпи�ку."
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: ../actions/profilesettings.php:181 ../actions/twitapiaccount.php:92
 msgid "Couldn't save profile."
 msgstr "�е вдало�� зберегти профіль."
 
-#: ../actions/profilesettings.php:161
+#: ../actions/profilesettings.php:158
 msgid "Couldn't update user for autosubscribe."
 msgstr "�е вдало�� оновити кори�тувача дл� автопідпи�ки."
 
@@ -592,7 +514,7 @@ msgstr "Поточне"
 msgid "DB error inserting hashtag: %s"
 msgstr "Помилка бази даних при додаванні мітки: %s"
 
-#: ../lib/util.php:1061
+#: ../lib/util.php:1033
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Помилка бази даних при додаванні відповіді: %s"
@@ -601,12 +523,11 @@ msgstr "Помилка бази даних при додаванні відпоÐ
 msgid "Delete notice"
 msgstr "Видалити повідомленн�"
 
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: ../actions/profilesettings.php:51 ../actions/register.php:236
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "Опишіть �ебе та �вої інтере�и (140 знаків)"
 
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87
+#: ../actions/register.php:226
 msgid "Email"
 msgstr "Пошта"
 
@@ -618,7 +539,7 @@ msgstr "Електронна адре�а"
 msgid "Email Settings"
 msgstr "�алаштуванн� пошти"
 
-#: ../actions/register.php:73
+#: ../actions/register.php:69
 msgid "Email address already exists."
 msgstr "Ц� адре�а вже викори�товуєть��."
 
@@ -630,12 +551,7 @@ msgstr "Підтвердженн� електронної адре�и"
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Електронна адре�а, на зразок \"UserName@example.org\""
 
-#: ../actions/invite.php:129
-#, fuzzy
-msgid "Email addresses"
-msgstr "Електронна адре�а"
-
-#: ../actions/recoverpassword.php:191
+#: ../actions/recoverpassword.php:176
 msgid "Enter a nickname or email address."
 msgstr "Введіть ім'� або електронну адре�у."
 
@@ -647,7 +563,7 @@ msgstr "Введіть код, �кий ви отримали телефоном
 msgid "Error authorizing token"
 msgstr "Помилка токена авторизації"
 
-#: ../actions/finishopenidlogin.php:253
+#: ../actions/finishopenidlogin.php:282
 msgid "Error connecting user to OpenID."
 msgstr "Помилка при підключенні кори�тувача до OpenID."
 
@@ -663,11 +579,15 @@ msgstr "Помилка при додаванні аватари"
 msgid "Error inserting new profile"
 msgstr "Помилка при додаванні нового профілю"
 
+#: ../actions/postnotice.php:89
+msgid "Error inserting notice"
+msgstr "Помилка при додаванні повідомленн�"
+
 #: ../actions/finishremotesubscribe.php:167
 msgid "Error inserting remote profile"
 msgstr "Помилка при додаванні віддаленого профілю"
 
-#: ../actions/recoverpassword.php:240
+#: ../actions/recoverpassword.php:201
 msgid "Error saving address confirmation."
 msgstr "Помилка при збереженні підтвердженн� адре�и."
 
@@ -675,7 +595,7 @@ msgstr "Помилка при збереженні підтвердженн� а
 msgid "Error saving remote profile"
 msgstr "Помилка при збереженні віддаленого профілю"
 
-#: ../lib/openid.php:226
+#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
 msgid "Error saving the profile."
 msgstr "Помилка при збереженні профілю."
 
@@ -688,7 +608,7 @@ msgid "Error saving user; invalid."
 msgstr "Помилка при збереженні кори�тувача; недій�ний."
 
 #: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
+#: ../actions/recoverpassword.php:268 ../actions/register.php:92
 msgid "Error setting user."
 msgstr "Помилка в налаштуванн�х кори�тувача."
 
@@ -700,7 +620,7 @@ msgstr "Помилка при оновленні профілю"
 msgid "Error updating remote profile"
 msgstr "Помилка при оновленні віддаленого профілю"
 
-#: ../actions/recoverpassword.php:80
+#: ../actions/recoverpassword.php:79
 msgid "Error with confirmation code."
 msgstr "Помилка з кодом підтвердженн�."
 
@@ -708,7 +628,7 @@ msgstr "Помилка з кодом підтвердженн�."
 msgid "Existing nickname"
 msgstr "І�нуюче ім'�"
 
-#: ../lib/util.php:326
+#: ../lib/util.php:312
 msgid "FAQ"
 msgstr "Пширені запитанн�"
 
@@ -744,31 +664,31 @@ msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
-"З міркувань безпеки, будь ла�ка введіть ще раз ім'� та пароль, перед тим �к "
-"змінювати налатуванн�."
+"З міркувань безпеки, будь ла�ка введіть "
+"ще раз ім'� та пароль, перед тим �к змінювати налатуванн�."
 
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: ../actions/profilesettings.php:44 ../actions/register.php:228
 msgid "Full name"
 msgstr "Повне ім'�"
 
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
+#: ../actions/profilesettings.php:98 ../actions/register.php:75
 #: ../actions/updateprofile.php:93
 msgid "Full name is too long (max 255 chars)."
 msgstr "Повне ім'� задовге (255 знаків мак�имум)"
 
-#: ../lib/util.php:322
+#: ../lib/util.php:291
 msgid "Help"
 msgstr "Допомога"
 
-#: ../lib/util.php:298
+#: ../lib/util.php:285
 msgid "Home"
 msgstr "Дім"
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: ../actions/profilesettings.php:46 ../actions/register.php:231
 msgid "Homepage"
 msgstr "Домашн� �торінка"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: ../actions/profilesettings.php:95 ../actions/register.php:72
 msgid "Homepage is not a valid URL."
 msgstr "Домашн� �торінка має недій�ну URL-адре�у."
 
@@ -776,10 +696,6 @@ msgstr "Домашн� �торінка має недій�ну URL-адре�у
 msgid "I want to post notices by email."
 msgstr "Я хочу над�илати повідомленн� поштою."
 
-#: ../lib/settingsaction.php:102
-msgid "IM"
-msgstr ""
-
 #: ../actions/imsettings.php:60
 msgid "IM Address"
 msgstr "�дре�а IM"
@@ -793,25 +709,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 до вашого рахунку, введіть адре�у в поле нижче "
-"і нати�ніть \"Add\"."
+"Якщо ви бажаєте додати OpenID до вашого "
+"рахунку, введіть адре�у в поле нижче і нати�ніть \"Add\"."
 
-#: ../actions/recoverpassword.php:137
-#, fuzzy
+#: ../actions/recoverpassword.php:122
 msgid ""
-"If you've forgotten or lost your password, you can get a new one sent to the "
+"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 ""
-"Якщо ви забули, або загубили �вій пароль, ви можете отримати новий на "
-"електронну адре�у, �ку ви закріпили за �воїм рахунком."
+"Якщо ви забули, або загубили �вій пароль, "
+"ви можете отримати новий на електронну адре�у, �ку ви закріпили за �воїм рахунком."
 
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 msgid "Incoming email"
@@ -829,24 +744,19 @@ msgstr "Старий пароль неточний"
 msgid "Incorrect username or password."
 msgstr "�еточне ім'� або пароль."
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:226
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
-"Ін�трукції з відновленн� паролю було наді�лано на електронну адре�у, �ку ви "
-"закріпили за �воїм ранком."
+"Ін�трукції з відновленн� паролю було "
+"наді�лано на електронну адре�у, �ку ви закріпили за �воїм ранком."
 
 #: ../actions/updateprofile.php:114
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "�едій�на URL-адре�а аватари '%s'"
 
-#: ../actions/invite.php:55
-#, fuzzy, php-format
-msgid "Invalid email address: %s"
-msgstr "Це не дій�на електронна адре�а"
-
 #: ../actions/updateprofile.php:98
 #, php-format
 msgid "Invalid homepage '%s'"
@@ -886,37 +796,22 @@ msgstr "�едій�ну URL-адре�у профілю було поверну
 msgid "Invalid size."
 msgstr "�едій�ний розмір."
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111
+#: ../actions/finishopenidlogin.php:264 ../actions/register.php:87
+#: ../actions/register.php:103
 msgid "Invalid username or password."
 msgstr "�едій�не ім'� або пароль."
 
-#: ../actions/invite.php:79
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: ../actions/invite.php:97
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
-
-#: ../lib/util.php:306
-msgid "Invite"
-msgstr ""
-
-#: ../actions/invite.php:123
-msgid "Invite new users"
-msgstr ""
-
-#: ../lib/util.php:261
+#: ../lib/util.php:248
 #, 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 ""
-"Серві� працює на [Laconica](http://laconi.ca/) - програмному забезпеченні "
-"дл� мікроблогів, вер�і� %s, до�тупному під [GNU Affero General Public "
+"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 ""
+"Серві� працює на [Laconica](http://laconi.ca/) - "
+"програмному забезпеченні дл� "
+"мікроблогів, вер�і� %s, до�тупному під [GNU "
+"Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #: ../actions/imsettings.php:173
 msgid "Jabber ID already belongs to another user."
@@ -928,9 +823,9 @@ 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 або GTalk адре�а, на зразок \"UserName@example.org\". �ле �першу "
-"переконайте��, що додали %s до �пи�ку контактів в �воєму IM-клієнті або в "
-"GTalk."
+"Jabber або GTalk адре�а, на зразок "
+"\"UserName@example.org\". �ле �першу переконайте��, "
+"що додали %s до �пи�ку контактів в �воєму IM-клієнті або в GTalk."
 
 #: ../actions/profilesettings.php:57
 msgid "Language"
@@ -940,17 +835,21 @@ msgstr "Мова"
 msgid "Language is too long (max 50 chars)."
 msgstr "Мова задовга (50 знаків мак�имум)"
 
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: ../actions/tag.php:133
+msgid "Last message posted: "
+msgstr "О�таннє повідомленн�:"
+
+#: ../actions/profilesettings.php:52 ../actions/register.php:237
 msgid "Location"
 msgstr "Мі�цезнаходженн�"
 
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
+#: ../actions/profilesettings.php:104 ../actions/register.php:81
 #: ../actions/updateprofile.php:108
 msgid "Location is too long (max 255 chars)."
 msgstr "Мі�цезнаходженн� задовге (255 знаків мак�имум)"
 
 #: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310
+#: ../actions/openidlogin.php:68 ../lib/util.php:298
 msgid "Login"
 msgstr "Увійти"
 
@@ -962,19 +861,19 @@ msgstr "Увійти з [OpenID](%%doc.openid%%)."
 #: ../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%"
-"%). "
+"Login with your username and password. Don't have a username yet? "
+"[Register](%%action.register%%) a new account, or try "
+"[OpenID](%%action.openidlogin%%). "
 msgstr ""
-"Увійти викри�товуючи ім'� та пароль. Ще не маєте імені кори�тувача? "
-"[Зареє�трувати](%%action.register%%) новий акаунт, або �пробувати [OpenID](%%"
-"action.openidlogin%%)."
+"Увійти викри�товуючи ім'� та пароль. Ще не "
+"маєте імені кори�тувача? "
+"[Зареє�трувати](%%action.register%%) новий акаунт, або �пробувати [OpenID](%%action.openidlogin%%)."
 
-#: ../lib/util.php:308
+#: ../lib/util.php:296
 msgid "Logout"
 msgstr "Вийти"
 
-#: ../actions/register.php:166
+#: ../actions/register.php:230
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Довше ім'�, переважно це ваше \"real\" ім'�"
 
@@ -1006,11 +905,11 @@ 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 ""
-"Оператор мобільного зв'�зку. Якщо вам відомий оператор, що підтримує "
-"над�иланн� SMS через електронну пошту, але він тут не вказаний, напишіть нам "
-"і ми вне�емо його до �пи�ку."
+"Оператор мобільного зв'�зку. Якщо вам "
+"відомий оператор, що підтримує "
+"над�иланн� SMS через електронну пошту, але він тут не вказаний, напишіть нам і ми вне�емо його до �пи�ку."
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:252
 msgid "My text and files are available under "
 msgstr "Мої повідомленн� та файли до�тупні під"
 
@@ -1018,7 +917,7 @@ msgstr "Мої повідомленн� та файли до�тупні під"
 msgid "New"
 msgstr "�ове"
 
-#: ../lib/mail.php:144
+#: ../lib/mail.php:140
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "�ова електронна адре�а дл� над�иланн� повідомлень на %s"
@@ -1031,34 +930,34 @@ msgstr "Ð�ову адреÑ�у длÑ� вхідних повідомлень доÐ
 msgid "New nickname"
 msgstr "�ове ім'�"
 
-#: ../actions/newnotice.php:87
+#: ../actions/newnotice.php:102
 msgid "New notice"
 msgstr "�ове повідомленн�"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
+#: ../actions/password.php:41 ../actions/recoverpassword.php:164
 msgid "New password"
 msgstr "�овий пароль"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:275
 msgid "New password successfully saved. You are now logged in."
 msgstr "�овий пароль у�пішно збережено. Тепер ви увійшли."
 
 #: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151
+#: ../actions/register.php:220
 msgid "Nickname"
 msgstr "Ім'� кори�тувача"
 
 #: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69
+#: ../actions/register.php:65
 msgid "Nickname already in use. Try another one."
 msgstr "Це ім'� вже викори�товуєть��. Спробуйте інше."
 
 #: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:67 ../actions/updateprofile.php:77
+#: ../actions/register.php:63 ../actions/updateprofile.php:77
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
-"Ім'� кори�тувача повинно �кладати�ь з літер нижнього регі�тру і цифр, ні�ких "
-"інтервалів."
+"Ім'� кори�тувача повинно �кладати�ь з "
+"літер нижнього регі�тру і цифр, ні�ких інтервалів."
 
 #: ../actions/finishopenidlogin.php:170
 msgid "Nickname not allowed."
@@ -1068,7 +967,7 @@ msgstr "Таке ім'� неприпу�тиме."
 msgid "Nickname of the user you want to follow"
 msgstr "Ім'� кори�тувача, за �ким ви бажаєте �лідувати"
 
-#: ../actions/recoverpassword.php:162
+#: ../actions/recoverpassword.php:147
 msgid "Nickname or email"
 msgstr "Ім'� або електронна адре�а"
 
@@ -1096,7 +995,7 @@ msgstr "Код не введено"
 msgid "No confirmation code."
 msgstr "�емає коду підтвердженн�."
 
-#: ../actions/newnotice.php:44
+#: ../actions/newnotice.php:50
 msgid "No content!"
 msgstr "�емає змі�ту!"
 
@@ -1133,7 +1032,7 @@ msgstr "�емає телефонного номера."
 msgid "No profile URL returned by server."
 msgstr "�емає URL-адре�и профілю повернітої �ервером."
 
-#: ../actions/recoverpassword.php:226
+#: ../actions/recoverpassword.php:189
 msgid "No registered email address for that user."
 msgstr "Дл� цього кори�тувача немає зареє�трованої електронної адре�и."
 
@@ -1149,14 +1048,6 @@ msgstr "�емає результатів"
 msgid "No size."
 msgstr "�емає розміру."
 
-#: ../actions/twitapistatuses.php:595
-msgid "No status found with that ID."
-msgstr ""
-
-#: ../actions/twitapistatuses.php:555
-msgid "No status with that ID found."
-msgstr ""
-
 #: ../actions/openidsettings.php:135
 msgid "No such OpenID."
 msgstr "Такого OpenID немає."
@@ -1180,19 +1071,15 @@ msgstr "�емає такої підпи�ки"
 
 #: ../actions/all.php:34 ../actions/allrss.php:35
 #: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
-#: ../actions/remotesubscribe.php:84 ../actions/remotesubscribe.php:91
-#: ../actions/replies.php:57 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:110 ../actions/userbyid.php:36
-#: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
-#: ../lib/subs.php:33 ../lib/subs.php:82
+#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
+#: ../actions/remotesubscribe.php:91 ../actions/replies.php:57
+#: ../actions/repliesrss.php:35 ../actions/showstream.php:110
+#: ../actions/subscribe.php:44 ../actions/unsubscribe.php:39
+#: ../actions/userbyid.php:36 ../actions/userrss.php:35 ../actions/xrds.php:35
+#: ../lib/gallery.php:57
 msgid "No such user."
 msgstr "Такого кори�тувача немає."
 
-#: ../actions/recoverpassword.php:211
-#, fuzzy
-msgid "No user with that email address or username."
-msgstr "Дл� цього кори�тувача немає зареє�трованої електронної адре�и."
-
 #: ../lib/gallery.php:80
 msgid "Nobody to show!"
 msgstr "Об'єктів дл� показу немає!"
@@ -1201,17 +1088,6 @@ msgstr "Об'єктів дл� показу немає!"
 msgid "Not a recovery code."
 msgstr "Це не код оновленн�."
 
-#: ../scripts/maildaemon.php:50
-#, fuzzy
-msgid "Not a registered user."
-msgstr "Це не код оновленн�."
-
-#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
-#: ../lib/twitterapi.php:332
-#, fuzzy
-msgid "Not a supported data format."
-msgstr "формат даних не підтримуєть��"
-
 #: ../actions/imsettings.php:167
 msgid "Not a valid Jabber ID"
 msgstr "Це не дій�ний Jabber ID"
@@ -1224,19 +1100,19 @@ msgstr "Це не дій�ний OpenID."
 msgid "Not a valid email address"
 msgstr "Це не дій�на електронна адре�а"
 
-#: ../actions/register.php:63
+#: ../actions/register.php:59
 msgid "Not a valid email address."
 msgstr "Це не дій�на електронна адре�а."
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
+#: ../actions/profilesettings.php:91 ../actions/register.php:67
 msgid "Not a valid nickname."
 msgstr "Це не дій�не ім'� кори�тувача."
 
-#: ../actions/remotesubscribe.php:120
+#: ../actions/remotesubscribe.php:118
 msgid "Not a valid profile URL (incorrect services)."
 msgstr "Це не дій�на URL-адре�а профілю (некоректні по�луги)."
 
-#: ../actions/remotesubscribe.php:113
+#: ../actions/remotesubscribe.php:111
 msgid "Not a valid profile URL (no XRDS defined)."
 msgstr "Це не дій�на URL-адре�а профілю (немає певного XRDS)."
 
@@ -1256,11 +1132,6 @@ msgstr "�е авторизовано."
 msgid "Not expecting this response!"
 msgstr "Ц� відповідь не очікуєть��!"
 
-#: ../actions/twitapistatuses.php:422
-#, fuzzy
-msgid "Not found"
-msgstr "�емає знайденого запиту!"
-
 #: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
 #: ../actions/newnotice.php:29 ../actions/subscribe.php:28
 #: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
@@ -1268,7 +1139,7 @@ msgstr "�емає знайденого запиту!"
 msgid "Not logged in."
 msgstr "�е увійшли."
 
-#: ../lib/subs.php:91
+#: ../actions/unsubscribe.php:44
 msgid "Not subscribed!."
 msgstr "�е підпи�ано!."
 
@@ -1289,7 +1160,7 @@ msgstr "Повідомленн� не має профілю"
 msgid "Notices"
 msgstr "Повідомленн�"
 
-#: ../actions/tag.php:35 ../actions/tag.php:81
+#: ../actions/tag.php:35 ../actions/tag.php:81 ../actions/tag.php:124
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Повідомленн� позначені з %s"
@@ -1298,7 +1169,7 @@ msgstr "Повідомленн� позначені з %s"
 msgid "Old password"
 msgstr "Старий пароль"
 
-#: ../lib/settingsaction.php:96 ../lib/util.php:314
+#: ../lib/util.php:302
 msgid "OpenID"
 msgstr "OpenID"
 
@@ -1341,36 +1212,32 @@ msgstr "OpenID видалено."
 msgid "OpenID settings"
 msgstr "�алаштуванн� OpenID"
 
-#: ../actions/invite.php:135
-msgid "Optionally add a personal message to the invitation."
-msgstr ""
-
 #: ../actions/avatar.php:84
 msgid "Partial upload."
 msgstr "Ча�ткове завантаженн�."
 
 #: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
-#: ../actions/register.php:153 ../lib/settingsaction.php:93
+#: ../actions/register.php:222
 msgid "Password"
 msgstr "Пароль"
 
-#: ../actions/recoverpassword.php:288
+#: ../actions/recoverpassword.php:249
 msgid "Password and confirmation do not match."
 msgstr "Пароль та підтвердженн� не �півпадають."
 
-#: ../actions/recoverpassword.php:284
+#: ../actions/recoverpassword.php:245
 msgid "Password must be 6 chars or more."
 msgstr "Пароль мі�тить 6 або більше знаків."
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
 msgid "Password recovery requested"
 msgstr "Запит на відновленн� паролю відправлено."
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: ../actions/password.php:89 ../actions/recoverpassword.php:274
 msgid "Password saved."
 msgstr "Пароль збережено."
 
-#: ../actions/password.php:61 ../actions/register.php:88
+#: ../actions/password.php:61 ../actions/register.php:84
 msgid "Passwords don't match."
 msgstr "Паролі не �півпадають."
 
@@ -1390,11 +1257,6 @@ msgstr "Пошук людей"
 msgid "Personal"
 msgstr "О�оби�те"
 
-#: ../actions/invite.php:133
-#, fuzzy
-msgid "Personal message"
-msgstr "О�оби�те"
-
 #: ../actions/smssettings.php:69
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Телефонний номер та регіональний код, ні�кої пунктуації чи інтервалів"
@@ -1405,9 +1267,10 @@ msgid ""
 "user's notices. If you didn't just ask to subscribe to someone's notices, "
 "click \"Cancel\"."
 msgstr ""
-"Будь ла�ка, перевірте в�і деталі, щоб упевнити�ь, що ви дій�но бажаєте "
-"підпи�ати�ь на повідомленн� даного кори�тувача. Якщо ви не збирали�ь "
-"підпи�увати�ь ні на чиї повідомленн�, про�то нати�ніть \"Cancel\"."
+"Будь ла�ка, перевірте в�і деталі, щоб "
+"упевнити�ь, що ви дій�но бажаєте "
+"підпи�ати�ь на повідомленн� даного "
+"кори�тувача. Якщо ви не збирали�ь підпи�увати�ь ні на чиї повідомленн�, про�то нати�ніть \"Cancel\"."
 
 #: ../actions/imsettings.php:73
 msgid "Post a notice when my Jabber/GTalk status changes."
@@ -1427,15 +1290,15 @@ msgstr "Переваги збережно."
 msgid "Preferred language"
 msgstr "Мова, �кій надаєте перевагу"
 
-#: ../lib/util.php:328
+#: ../lib/util.php:314
 msgid "Privacy"
 msgstr "Конфіденційні�ть"
 
-#: ../classes/Notice.php:95 ../classes/Notice.php:106
+#: ../actions/newnotice.php:62 ../actions/newnotice.php:70
 msgid "Problem saving notice."
 msgstr "Проблема при збереженні повідомленн�."
 
-#: ../lib/settingsaction.php:84 ../lib/stream.php:60
+#: ../lib/stream.php:60
 msgid "Profile"
 msgstr "Профіль"
 
@@ -1451,6 +1314,10 @@ msgstr "�алаштуванн� профілю"
 msgid "Profile unknown"
 msgstr "�евідомий профіль"
 
+#: ../lib/util.php:287
+msgid "Public"
+msgstr "Загал"
+
 #: ../actions/public.php:54
 msgid "Public Stream Feed"
 msgstr "Живленн� �пільного потоку"
@@ -1471,11 +1338,11 @@ msgstr "Позначати MicroID моєї електронної адре�и.
 msgid "Recent Tags"
 msgstr "�едавні мітки"
 
-#: ../actions/recoverpassword.php:166
+#: ../actions/recoverpassword.php:151
 msgid "Recover"
 msgstr "Відновити"
 
-#: ../actions/recoverpassword.php:156
+#: ../actions/recoverpassword.php:141
 msgid "Recover password"
 msgstr "Відновити пароль"
 
@@ -1483,7 +1350,7 @@ msgstr "Відновити пароль"
 msgid "Recovery code for unknown user."
 msgstr "Код відновленн� невідомого кори�тувача."
 
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: ../actions/register.php:216 ../actions/register.php:257 ../lib/util.php:300
 msgid "Register"
 msgstr "Зареє�трувати�ь"
 
@@ -1491,7 +1358,7 @@ msgstr "Зареє�трувати�ь"
 msgid "Registration not allowed."
 msgstr "Реє�трацію не дозволено."
 
-#: ../actions/register.php:200
+#: ../actions/register.php:264
 msgid "Registration successful"
 msgstr "Реє�траці� у�пішна"
 
@@ -1499,7 +1366,7 @@ msgstr "Реє�траці� у�пішна"
 msgid "Reject"
 msgstr "Забраковано"
 
-#: ../actions/login.php:103 ../actions/register.php:176
+#: ../actions/login.php:103 ../actions/register.php:240
 msgid "Remember me"
 msgstr "Пам'�тати мене"
 
@@ -1526,8 +1393,8 @@ 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, �кщо ви його "
+"видалите, то не зможете увійти знову! Перед тим �к видалити його, з початку додайте інший."
 
 #: ../lib/stream.php:55
 msgid "Replies"
@@ -1538,18 +1405,14 @@ msgstr "Відповіді"
 msgid "Replies to %s"
 msgstr "Відповіді %s"
 
-#: ../actions/recoverpassword.php:183
+#: ../actions/recoverpassword.php:168
 msgid "Reset"
 msgstr "Скинути"
 
-#: ../actions/recoverpassword.php:173
+#: ../actions/recoverpassword.php:158
 msgid "Reset password"
 msgstr "Скинути пароль"
 
-#: ../lib/settingsaction.php:99
-msgid "SMS"
-msgstr ""
-
 #: ../actions/smssettings.php:67
 msgid "SMS Phone number"
 msgstr "Телефонний номер"
@@ -1558,15 +1421,15 @@ msgstr "Телефонний номер"
 msgid "SMS Settings"
 msgstr "�алаштуванн� SMS"
 
-#: ../lib/mail.php:219
+#: ../lib/mail.php:215
 msgid "SMS confirmation"
 msgstr "Підтвердженн� SMS"
 
-#: ../actions/recoverpassword.php:182
+#: ../actions/recoverpassword.php:167
 msgid "Same as password above"
 msgstr "Такий же, �к пароль вище"
 
-#: ../actions/register.php:156
+#: ../actions/register.php:225
 msgid "Same as password above. Required."
 msgstr "Такий же, �к пароль вище. �еодмінно."
 
@@ -1575,7 +1438,7 @@ msgstr "Такий же, �к пароль вище. �еодмінно."
 msgid "Save"
 msgstr "Зберегти"
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300
+#: ../lib/searchaction.php:84 ../lib/util.php:288
 msgid "Search"
 msgstr "Пошук"
 
@@ -1589,8 +1452,9 @@ 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
@@ -1598,15 +1462,15 @@ 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
 msgid "Select a carrier"
 msgstr "Оберіть оператора"
 
-#: ../actions/invite.php:137 ../lib/util.php:1172
+#: ../lib/util.php:1144
 msgid "Send"
 msgstr "�аді�лати"
 
@@ -1627,20 +1491,20 @@ msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
-"Повідомл�ти мене за допомогою SMS; Я розімію, що, можливо, поне�у надмірні "
-"витрати від мого мобільного оператора."
+"Повідомл�ти мене за допомогою SMS; Я "
+"розімію, що, можливо, поне�у надмірні витрати від мого мобільного оператора."
 
 #: ../actions/imsettings.php:76
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
-"�ад�илати також мені відповіді через Jabber/GTalk від людей, до �ких � не "
-"підпи�аний."
+"�ад�илати також мені відповіді через "
+"Jabber/GTalk від людей, до �ких � не підпи�аний."
 
-#: ../lib/util.php:304
+#: ../lib/util.php:294
 msgid "Settings"
 msgstr "�алаштуванн�"
 
-#: ../actions/profilesettings.php:192
+#: ../actions/profilesettings.php:189
 msgid "Settings saved."
 msgstr "�алаштуванн� збережено."
 
@@ -1656,17 +1520,7 @@ msgstr "Хто�ь вже кори�туєть�� цим OpenID."
 msgid "Something weird happened."
 msgstr "Стало�� що�ь погане."
 
-#: ../scripts/maildaemon.php:58
-#, fuzzy
-msgid "Sorry, no incoming email allowed."
-msgstr "�емає адре�и дл� вхідної пошти."
-
-#: ../scripts/maildaemon.php:54
-#, fuzzy
-msgid "Sorry, that is not your incoming email address."
-msgstr "Це не ваша адре�а."
-
-#: ../lib/util.php:330
+#: ../lib/util.php:316
 msgid "Source"
 msgstr "Джерело"
 
@@ -1674,7 +1528,7 @@ msgstr "Джерело"
 msgid "Statistics"
 msgstr "Стати�тика"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
 msgid "Stored OpenID not found."
 msgstr "Збережений OpenID не знайдено."
 
@@ -1704,7 +1558,7 @@ msgstr "Підпи�ки"
 msgid "System error uploading file."
 msgstr "Си�тема відповіла помилкою при завантаженні цього файла."
 
-#: ../actions/tag.php:41 ../lib/util.php:301
+#: ../actions/tag.php:41 ../lib/util.php:289
 msgid "Tags"
 msgstr "Мітки"
 
@@ -1772,16 +1626,11 @@ msgstr "Це помилковий код підтвердженн�."
 msgid "That phone number already belongs to another user."
 msgstr "Цей телефонний номер належить іншому кори�тувачу."
 
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: ../actions/newnotice.php:53
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "Задовге. Мак�имальний розмір повідомленн� - 140 знаків."
 
-#: ../actions/twitapiaccount.php:74
-#, fuzzy
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "Задовге. Мак�имальний розмір повідомленн� - 140 знаків."
-
-#: ../actions/confirmaddress.php:92
+#: ../actions/confirmaddress.php:88
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "�дре�у \"%s\" було підтверджено дл� вашого рахунку."
@@ -1797,9 +1646,9 @@ msgid ""
 "with the site's instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
-"Підпи�ку було авторизовано, але URL-адре�а у відповідь не передавала��. "
-"Звірте�ь з ін�трукці�ми на �айті дл� більш конкретної інформації про те, �к "
-"авторизувати підпи�ку. Ваш підпи�ний токен:"
+"Підпи�ку було авторизовано, але URL-адре�а "
+"у відповідь не передавала��. Звірте�ь з "
+"ін�трукці�ми на �айті дл� більш конкретної інформації про те, �к авторизувати підпи�ку. Ваш підпи�ний токен:"
 
 #: ../actions/userauthorization.php:322
 msgid ""
@@ -1807,9 +1656,9 @@ msgid ""
 "with the site's instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
-"Підпи�ку було �кинуно, але URL-адре�а у відповідь не передавала��. Звірте�ь "
-"з ін�трукці�ми на �айті дл� більш конкретної інформації про те, �к �кинути "
-"підпи�ку."
+"Підпи�ку було �кинуно, але URL-адре�а у "
+"відповідь не передавала��. Звірте�ь з "
+"ін�трукці�ми на �айті дл� більш конкретної інформації про те, �к �кинути підпи�ку."
 
 #: ../actions/subscribers.php:35
 #, php-format
@@ -1829,12 +1678,7 @@ msgstr "Тут пред�тавлені ті, за чиїми повідомле
 msgid "These are the people whose notices you listen to."
 msgstr "Тут пред�тавлені ті, за чиїми повідомленн�ми ви �лідкуєте."
 
-#: ../actions/invite.php:89
-msgid ""
-"These people are already users and you were automatically subscribed to them:"
-msgstr ""
-
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:87
 msgid "This confirmation code is too old. Please start again."
 msgstr "Цей код підтвердженн� за�тарий. Будь ла�ка, розпочніть з початку."
 
@@ -1843,9 +1687,9 @@ msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr ""
-"Ц� форма повинна автоматично �ебе пред�тавити. Якщо цього не �тало��, "
-"нати�ніть на кнопку пред�тавленн� і ви будете перенаправлені до вашого "
-"OpenID провайдера."
+"Ц� форма повинна автоматично �ебе "
+"пред�тавити. Якщо цього не �тало��, "
+"нати�ніть на кнопку пред�тавленн� і ви будете перенаправлені до вашого OpenID провайдера."
 
 #: ../actions/finishopenidlogin.php:56
 #, php-format
@@ -1854,20 +1698,11 @@ 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 до "
-"локального рахунку. Ви можете також �творити новий рахунок, або приєднати "
-"OpenID до вашого вже і�нуючого рахунку, �кщо ви його маєте."
+"Ви вперше увійшли до %s, так що ми повинні "
+"приєднати ваш OpenID до локального рахунку. "
+"Ви можете також �творити новий рахунок, або приєднати OpenID до вашого вже і�нуючого рахунку, �кщо ви його маєте."
 
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-msgid "This method requires a POST or DELETE."
-msgstr ""
-
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381
-msgid "This method requires a POST."
-msgstr ""
-
-#: ../lib/util.php:164
+#: ../lib/util.php:151
 msgid "This page is not available in a media type you accept"
 msgstr "Ц� �торінка не до�тупна в медіа-типі, �кий ви приймаєте"
 
@@ -1882,19 +1717,21 @@ msgstr "Ча�овий по�� не обрано."
 #: ../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."
+"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 ""
-"Щоб підпи�ати�ь, ви можете [увійти](%%action.login%%), або [зареє�трувати](%%"
-"action.register%%) новий рахунок. Якщо ви вже маєте рахунок на [�умі�ному "
-"�айті](%%doc.openmublog%%), введіть URL-адре�у вашого профілю."
+"Щоб підпи�ати�ь, ви можете "
+"[увійти](%%action.login%%), або "
+"[зареє�трувати](%%action.register%%) новий рахунок. "
+"Якщо ви вже маєте рахунок на [�умі�ному �айті](%%doc.openmublog%%), введіть URL-адре�у вашого профілю."
 
-#: ../actions/twitapifriendships.php:163
+#: ../actions/twitapifriendships.php:150
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Два ID або імені_у_мережі повинні підтримувати�ь."
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
+#: ../actions/profilesettings.php:48 ../actions/register.php:233
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL-адре�а вашої домашньої �торінки, блогу, "
 
@@ -1907,25 +1744,21 @@ msgstr "URL-адреÑ�а вашого профілю на іншому Ñ�уміÑ
 msgid "Unexpected form submission."
 msgstr "�е�подіване пред�тавленн� форми."
 
-#: ../actions/recoverpassword.php:276
+#: ../actions/recoverpassword.php:237
 msgid "Unexpected password reset."
 msgstr "�е�подіване �киданн� паролю."
 
-#: ../index.php:57
-msgid "Unknown action"
-msgstr ""
-
 #: ../actions/finishremotesubscribe.php:58
 msgid "Unknown version of OMB protocol."
 msgstr "�евідома вер�і� протоколу OMB."
 
-#: ../lib/util.php:269
+#: ../lib/util.php:256
 msgid ""
 "Unless otherwise specified, contents of this site are copyright by the "
 "contributors and available under the "
 msgstr ""
-"Якщо не зазначено інше, автор�ьке право на вмі�т цього �айту належить "
-"контрибуторам і до�тупний під"
+"Якщо не зазначено інше, автор�ьке право "
+"на вмі�т цього �айту належить контрибуторам і до�тупний під"
 
 #: ../actions/confirmaddress.php:48
 #, php-format
@@ -1944,20 +1777,16 @@ msgstr "Вер�і� OMB не підтримуєть��"
 msgid "Unsupported image file format."
 msgstr "Формат зображенн� не підтримуєть��."
 
-#: ../lib/settingsaction.php:100
-msgid "Updates by SMS"
-msgstr ""
-
-#: ../lib/settingsaction.php:103
-msgid "Updates by instant messenger (IM)"
-msgstr ""
+#: ../lib/twitterapi.php:257 ../lib/twitterapi.php:278
+msgid "Unsupported type"
+msgstr "Тип не підтримуєть��"
 
-#: ../actions/twitapistatuses.php:241
+#: ../actions/twitapistatuses.php:238
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Оновленн� від %1$s та друзів на %2$s!"
 
-#: ../actions/twitapistatuses.php:341
+#: ../actions/twitapistatuses.php:338
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Оновленн� від %1$s на %2$s!"
@@ -1973,26 +1802,18 @@ msgid ""
 "site license, also. Use a picture that belongs to you and that you want to "
 "share."
 msgstr ""
-"Завантажити нову \"avatar\" (зображенн� кори�тувача) можна тут. Ви не "
-"зможете відредагувати �вою аватару пі�л� завантаженн�, так що з початку "
-"переконайте��, що вона має більш-менш квадратну форму. Ваше зображенн� "
-"зберігатиметь�� під ліцензією �айту, також. Викори�товуйте зображенн�, �кі "
-"належать вам, і �кі ви можете вільно демон�трувати."
-
-#: ../lib/settingsaction.php:91
-#, fuzzy
-msgid "Upload a new profile image"
-msgstr "�е вдало�� зберегти інформацію про новий профіль"
+"Завантажити нову \"avatar\" (зображенн� "
+"кори�тувача) можна тут. Ви не зможете "
+"відредагувати �вою аватару пі�л� "
+"завантаженн�, так що з початку "
+"переконайте��, що вона має більш-менш "
+"квадратну форму. Ваше зображенн� зберігатиметь�� під ліцензією �айту, також. Викори�товуйте зображенн�, �кі належать вам, і �кі ви можете вільно демон�трувати."
 
-#: ../actions/invite.php:114
-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:227
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
-"Викори�товуєть�� лише дл� оновлень, оголошень та переу�тановленн� паролю"
+"Викори�товуєть�� лише дл� оновлень, "
+"оголошень та переу�тановленн� паролю"
 
 #: ../actions/finishremotesubscribe.php:86
 msgid "User being listened to doesn't exist."
@@ -2000,9 +1821,8 @@ msgstr "Кори�тувача, �кий �лідкував за вашими п
 
 #: ../actions/all.php:41 ../actions/avatarbynickname.php:48
 #: ../actions/foaf.php:47 ../actions/replies.php:41
-#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
-#: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
-#: ../actions/twitapiusers.php:82
+#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:78
+#: ../actions/twitapistatuses.php:316 ../actions/twitapistatuses.php:621
 msgid "User has no profile."
 msgstr "Кори�тувач не має профілю."
 
@@ -2010,21 +1830,16 @@ msgstr "Кори�тувач не має профілю."
 msgid "User nickname"
 msgstr "Ім'� кори�тувача"
 
-#: ../actions/twitapiusers.php:75
-#, fuzzy
-msgid "User not found."
-msgstr "Збережений OpenID не знайдено."
-
 #: ../actions/profilesettings.php:63
 msgid "What timezone are you normally in?"
 msgstr "За �ким ча�овим по��ом ви живете?"
 
-#: ../lib/util.php:1159
+#: ../lib/util.php:1131
 #, php-format
 msgid "What's up, %s?"
 msgstr "Як �� маєш, %s?"
 
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: ../actions/profilesettings.php:54 ../actions/register.php:239
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Де ви живете, на зразок \"City, State (or Region), Country\""
 
@@ -2051,19 +1866,14 @@ msgid ""
 "You are about to permanently delete a notice.  Once this is done, it cannot "
 "be undone."
 msgstr ""
-"Ви видал�єте повідомленн� назавжди. Якщо ви так зробите, це не матиме "
-"зворотньої дії."
+"Ви видал�єте повідомленн� назавжди. Якщо "
+"ви так зробите, це не матиме зворотньої дії."
 
 #: ../actions/recoverpassword.php:31
 msgid "You are already logged in!"
 msgstr "Ви вже в �и�темі!"
 
-#: ../actions/invite.php:81
-#, fuzzy
-msgid "You are already subscribed to these users:"
-msgstr "Ви не є друз�ми із вказаним кори�тувачем."
-
-#: ../actions/twitapifriendships.php:128
+#: ../actions/twitapifriendships.php:115
 msgid "You are not friends with the specified user."
 msgstr "Ви не є друз�ми із вказаним кори�тувачем."
 
@@ -2071,7 +1881,7 @@ msgstr "Ви не є друз�ми із вказаним кори�туваче
 msgid "You can change your password here. Choose a good one!"
 msgstr "Тут ви можете замінити пароль. Оберіть �обі �кий�ь гарний!"
 
-#: ../actions/register.php:135
+#: ../actions/register.php:209
 msgid "You can create a new account to start posting notices."
 msgstr "Ви можете �творити новий рахунок, щоб почати пи�ати повідомленн�."
 
@@ -2085,29 +1895,32 @@ msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr ""
-"Ви можете видалити OpenID із �вого рахунку, �кщо нати�нете кнопку \"Remove\"."
+"Ви можете видалити OpenID із �вого рахунку, "
+"�кщо нати�нете кнопку \"Remove\"."
 
 #: ../actions/imsettings.php:28
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/GTalk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
-"Ви можете над�илати на отримувати повідомленн� через Jabber/GTalk [�лужбу "
+"Ви можете над�илати на отримувати "
+"повідомленн� через Jabber/GTalk [�лужбу "
 "миттевих повідомлень](%%doc.im%%). Вкажить �вою адре�у і налаштуйте це нижче."
 
 #: ../actions/profilesettings.php:27
 msgid ""
-"You can update your personal profile info here so people know more about you."
+"You can update your personal profile info here so people know more about "
+"you."
 msgstr ""
-"Ви можете доповнити �вій о�оби�тий профіль, так що люди знатимуть про ва� "
-"більше."
+"Ви можете доповнити �вій о�оби�тий "
+"профіль, так що люди знатимуть про ва� більше."
 
 #: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
 msgid "You can use the local subscription!"
 msgstr "Ви можете кори�тувати�ь локальними підпи�ками!"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:57
 msgid "You can't register if you don't agree to the license."
 msgstr "Ви не зможете зареє�трувати�ь, �кщо не погодите�ь з умовами ліцензії."
 
@@ -2115,7 +1928,7 @@ msgstr "Ви не зможете зареєÑ�труватиÑ�ÑŒ, Ñ�кщо не Ð
 msgid "You did not send us that profile"
 msgstr "Ви не над�илали нам цього профілю"
 
-#: ../lib/mail.php:147
+#: ../lib/mail.php:143
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -2129,29 +1942,12 @@ msgid ""
 msgstr ""
 "Ви маєте нову поштову адре�у на %1$s.\n"
 "\n"
-"�ад�илайте ли�ти на %2$s, щоб друкувати нові повідомленн�.\n"
+"�ад�илайте ли�ти на %2$s, щоб друкувати "
+"нові повідомленн�.\n"
 "\n"
-"Більше інформації про викори�танн� електронної пошти на %3$s.\n"
-"\n"
-"Щиро ваші,\n"
-"%4$s"
-
-#: ../actions/twitapistatuses.php:612
-msgid "You may not delete another user's status."
-msgstr ""
-
-#: ../actions/invite.php:31
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr ""
-
-#: ../actions/invite.php:103
-msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr ""
+"Більше інформації про викори�танн� електронної пошти на %3$s.\n\nЩиро ваші,\n%4$s"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:134
 msgid "You've been identified. Enter a  new password below. "
 msgstr "Ва� ідентифіковано. Введіть новий пароль нижче."
 
@@ -2159,10 +1955,11 @@ msgstr "ВаÑ� ідентифіковано. Введіть новий пароÐ
 msgid "Your OpenID URL"
 msgstr "URL-адре�а вашого OpenID"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:149
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
-"Ваше ім'� кори�тувача на цьому �ервері, або зареє�трована електронна адре�а."
+"Ваше ім'� кори�тувача на цьому �ервері, "
+"або зареє�трована електронна адре�а."
 
 #: ../actions/openidsettings.php:28
 #, php-format
@@ -2170,64 +1967,69 @@ msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
 "account.  Manage your associated OpenIDs from here."
 msgstr ""
-"[OpenID](%%doc.openid%%) дає вам можливі�ть реє�трувати�� на багатьох "
-"�айтах, кори�туючи�ь єдиним рахунком. Керувати вашими OpenID можна звід�и."
+"[OpenID](%%doc.openid%%) дає вам можливі�ть "
+"реє�трувати�� на багатьох �айтах, "
+"кори�туючи�ь єдиним рахунком. Керувати вашими OpenID можна звід�и."
 
-#: ../lib/util.php:943
+#: ../lib/util.php:919
 msgid "a few seconds ago"
 msgstr "кілька �екунд тому"
 
-#: ../lib/util.php:955
+#: ../lib/util.php:931
 #, php-format
 msgid "about %d days ago"
 msgstr "близько %d днів тому"
 
-#: ../lib/util.php:951
+#: ../lib/util.php:927
 #, php-format
 msgid "about %d hours ago"
 msgstr "близько %d годин тому"
 
-#: ../lib/util.php:947
+#: ../lib/util.php:923
 #, php-format
 msgid "about %d minutes ago"
 msgstr "близько %d хвилин тому"
 
-#: ../lib/util.php:959
+#: ../lib/util.php:935
 #, php-format
 msgid "about %d months ago"
 msgstr "близько %d мі��ців тому"
 
-#: ../lib/util.php:953
+#: ../lib/util.php:929
 msgid "about a day ago"
 msgstr "день тому"
 
-#: ../lib/util.php:945
+#: ../lib/util.php:921
 msgid "about a minute ago"
 msgstr "хвилину тому"
 
-#: ../lib/util.php:957
+#: ../lib/util.php:933
 msgid "about a month ago"
 msgstr "мі��ць тому"
 
-#: ../lib/util.php:961
+#: ../lib/util.php:937
 msgid "about a year ago"
 msgstr "рік тому"
 
-#: ../lib/util.php:949
+#: ../lib/util.php:925
 msgid "about an hour ago"
 msgstr "годину тому"
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: ../actions/showstream.php:424 ../lib/stream.php:130
 msgid "delete"
 msgstr "видалити"
 
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117
+#: ../actions/noticesearch.php:126 ../actions/showstream.php:408
+#: ../lib/stream.php:114
 msgid "in reply to..."
 msgstr "у відповідь на..."
 
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124
+#: ../lib/twitterapi.php:363
+msgid "not a supported data format"
+msgstr "формат даних не підтримуєть��"
+
+#: ../actions/noticesearch.php:133 ../actions/showstream.php:415
+#: ../lib/stream.php:121
 msgid "reply"
 msgstr "відпові�ти"
 
@@ -2235,28 +2037,862 @@ msgstr "відпові�ти"
 msgid "same as password above"
 msgstr "такий же, �к пароль вище"
 
-#: ../actions/twitapistatuses.php:755
+#: ../actions/twitapistatuses.php:691
 msgid "unsupported file type"
 msgstr "тип файлу не підтримуєть��"
 
-#: ../lib/util.php:1309
+#: ../lib/util.php:1281
 msgid "« After"
 msgstr "« Вперед"
 
-#~ msgid " by "
-#~ msgstr "від"
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+msgid " from "
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55
+msgid "API method not found!"
+msgstr ""
+
+#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
+#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
+#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
+#: ../actions/twitapidirect_messages.php:49
+#: ../actions/twitapidirect_messages.php:56
+#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
+#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
+#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
+#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
+#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
+#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
+#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
+#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
+#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
+#: actions/twitapistatuses.php:690
+msgid "API method under construction."
+msgstr ""
+
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+msgid "Change email handling"
+msgstr ""
+
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+msgid "Change your profile settings"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr ""
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+msgid "IM"
+msgstr ""
+
+#: ../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/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+msgid "No status with that ID found."
+msgstr ""
+
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+msgid "Not a registered user."
+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
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+msgid "Not found"
+msgstr ""
+
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../actions/invite.php:133 actions/invite.php:141
+msgid "Personal message"
+msgstr ""
+
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+msgid "SMS"
+msgstr ""
+
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/invite.php:89 actions/invite.php:96
+msgid ""
+"These people are already users and you were automatically subscribed to "
+"them:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511
+msgid "This method requires a POST or 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
+msgid "This method requires a POST."
+msgstr ""
+
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this "
+"service."
+msgstr ""
+
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
 
-#~ msgid "%1$s Notices recently tagged with %2$s"
-#~ msgstr "%1$s Повідомленн� щойно позначені з %2$s"
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr ""
+
+#: ../actions/invite.php:103 actions/invite.php:110
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
+msgstr ""
+
+#: actions/deletenotice.php:74 actions/disfavor.php:43
+#: actions/emailsettings.php:127 actions/favor.php:45
+#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
+#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
+#: actions/openidsettings.php:123 actions/profilesettings.php:47
+#: actions/recoverpassword.php:282 actions/register.php:42
+#: actions/remotesubscribe.php:40 actions/smssettings.php:124
+#: actions/subscribe.php:44 actions/twittersettings.php:97
+#: actions/unsubscribe.php:41 actions/userauthorization.php:35
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/disfavor.php:55
+msgid "This notice is not a favorite!"
+msgstr ""
 
-#~ msgid "Error inserting notice"
-#~ msgstr "Помилка при додаванні повідомленн�"
+#: actions/disfavor.php:63
+msgid "Could not delete favorite."
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Favor"
+msgstr ""
 
-#~ msgid "Last message posted: "
-#~ msgstr "О�таннє повідомленн�:"
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+
+#: actions/emailsettings.php:95
+msgid "Send me email when someone sends me a private message."
+msgstr ""
 
-#~ msgid "Public"
-#~ msgstr "Загал"
+#: actions/favor.php:53 actions/twitapifavorites.php:142
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132
+msgid "Could not create favorite."
+msgstr ""
+
+#: actions/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#, php-format
+msgid "%s favorite notices"
+msgstr ""
+
+#: actions/favoritesrss.php:64
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr ""
+
+#: actions/inbox.php:28
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+
+#: actions/invite.php:178
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+msgstr ""
+
+#: actions/login.php:104
+msgid "Automatically login in the future; "
+msgstr ""
+
+#: actions/login.php:122
+msgid "For security reasons, please re-enter your "
+msgstr ""
+
+#: actions/login.php:126
+msgid "Login with your username and password. "
+msgstr ""
+
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+msgid "That's too long. Max message size is 140 chars."
+msgstr ""
+
+#: actions/newmessage.php:65
+msgid "No recipient specified."
+msgstr ""
+
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206
+msgid "You can't send a message to this user."
+msgstr ""
+
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly "
+"instead."
+msgstr ""
+
+#: actions/newmessage.php:108
+msgid "No such user"
+msgstr ""
+
+#: actions/newmessage.php:117
+msgid "New message"
+msgstr ""
+
+#: actions/noticesearch.php:95
+msgid "Notice without matching profile"
+msgstr ""
+
+#: actions/openidsettings.php:28
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr ""
+
+#: actions/openidsettings.php:46
+msgid "If you want to add an OpenID to your account, "
+msgstr ""
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr ""
+
+#: actions/openidsettings.php:87
+msgid "You can remove an OpenID from your account "
+msgstr ""
+
+#: actions/outbox.php:28
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr ""
+
+#: actions/outbox.php:30
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#: actions/outbox.php:53
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+
+#: actions/peoplesearch.php:28
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+msgstr ""
+
+#: actions/profilesettings.php:27
+msgid "You can update your personal profile info here "
+msgstr ""
+
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+msgid "User without matching profile"
+msgstr ""
+
+#: actions/recoverpassword.php:91
+msgid "This confirmation code is too old. "
+msgstr ""
+
+#: actions/recoverpassword.php:141
+msgid "If you've forgotten or lost your"
+msgstr ""
+
+#: actions/recoverpassword.php:154
+msgid "You've been identified. Enter a "
+msgstr ""
+
+#: actions/recoverpassword.php:169
+msgid "Your nickname on this server, "
+msgstr ""
+
+#: actions/recoverpassword.php:271
+msgid "Instructions for recovering your password "
+msgstr ""
+
+#: actions/recoverpassword.php:327
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95
+msgid "Password must be 6 or more characters."
+msgstr ""
+
+#: actions/register.php:216
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
+msgstr ""
+
+#: actions/register.php:227
+msgid "(You should receive a message by email momentarily, with "
+msgstr ""
+
+#: actions/remotesubscribe.php:51
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
+msgstr ""
+
+#: actions/showfavorites.php:61
+#, php-format
+msgid "Feed for favorites of %s"
+msgstr ""
+
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+msgid "Could not retrieve favorite notices."
+msgstr ""
+
+#: actions/showmessage.php:33
+msgid "No such message."
+msgstr ""
+
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
+msgstr ""
+
+#: actions/showmessage.php:61
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr ""
+
+#: actions/showmessage.php:66
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr ""
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr ""
+
+#: actions/smssettings.php:312
+#, php-format
+msgid "Mobile carrier for your phone. "
+msgstr ""
 
-#~ msgid "Unsupported type"
-#~ msgstr "Тип не підтримуєть��"
+#: actions/twitapidirect_messages.php:76
+#, php-format
+msgid "Direct messages to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:77
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:81
+msgid "Direct Messages You've Sent"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:82
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:128
+msgid "No message text!"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:138
+msgid "Recipient user not found."
+msgstr ""
+
+#: actions/twitapidirect_messages.php:141
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
+#: actions/twitapifavorites.php:92
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr ""
+
+#: actions/twitapifavorites.php:95
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr ""
+
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#, php-format
+msgid "%s added your notice as a favorite"
+msgstr ""
+
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+msgstr ""
+
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+msgstr ""
+
+#: actions/twittersettings.php:41
+msgid "Twitter settings"
+msgstr ""
+
+#: actions/twittersettings.php:48
+msgid "Twitter Account"
+msgstr ""
+
+#: actions/twittersettings.php:56
+msgid "Current verified Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr ""
+
+#: actions/twittersettings.php:65
+msgid "No spaces, please."
+msgstr ""
+
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr ""
+
+#: actions/twittersettings.php:72
+msgid "Automatically send my notices to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:75
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:78
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+
+#: actions/twittersettings.php:128
+msgid "Could not verify your Twitter credentials!"
+msgstr ""
+
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+msgid "Unable to save your Twitter settings!"
+msgstr ""
+
+#: actions/twittersettings.php:174
+msgid "Twitter settings saved."
+msgstr ""
+
+#: actions/twittersettings.php:192
+msgid "That is not your Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+msgid "Couldn't remove Twitter user."
+msgstr ""
+
+#: actions/twittersettings.php:212
+msgid "Twitter account removed."
+msgstr ""
+
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+msgid "Couldn't save Twitter preferences."
+msgstr ""
+
+#: actions/twittersettings.php:245
+msgid "Twitter preferences saved."
+msgstr ""
+
+#: actions/userauthorization.php:84
+msgid "Please check these details to make sure "
+msgstr ""
+
+#: actions/userauthorization.php:324
+msgid "The subscription has been authorized, but no "
+msgstr ""
+
+#: actions/userauthorization.php:334
+msgid "The subscription has been rejected, but no "
+msgstr ""
+
+#: classes/Channel.php:113
+msgid "Command results"
+msgstr ""
+
+#: classes/Channel.php:148
+msgid "Command complete"
+msgstr ""
+
+#: classes/Channel.php:158
+msgid "Command failed"
+msgstr ""
+
+#: classes/Command.php:39
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: classes/Command.php:96
+#, php-format
+msgid "Subscriptions: %1$s\n"
+msgstr ""
+
+#: classes/Command.php:125 classes/Command.php:242
+msgid "User has no last notice"
+msgstr ""
+
+#: classes/Command.php:146
+msgid "Notice marked as fave."
+msgstr ""
+
+#: classes/Command.php:166
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr ""
+
+#: classes/Command.php:169
+#, php-format
+msgid "Fullname: %s"
+msgstr ""
+
+#: classes/Command.php:172
+#, php-format
+msgid "Location: %s"
+msgstr ""
+
+#: classes/Command.php:175
+#, php-format
+msgid "Homepage: %s"
+msgstr ""
+
+#: classes/Command.php:178
+#, php-format
+msgid "About: %s"
+msgstr ""
+
+#: classes/Command.php:200
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
+
+#: classes/Command.php:214
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
+
+#: classes/Command.php:216
+msgid "Error sending direct message."
+msgstr ""
+
+#: classes/Command.php:263
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: classes/Command.php:270
+#, php-format
+msgid "Subscribed to %s"
+msgstr ""
+
+#: classes/Command.php:288
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
+
+#: classes/Command.php:295
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr ""
+
+#: classes/Command.php:310 classes/Command.php:330
+msgid "Command not yet implemented."
+msgstr ""
+
+#: classes/Command.php:313
+msgid "Notification off."
+msgstr ""
+
+#: classes/Command.php:315
+msgid "Can't turn off notification."
+msgstr ""
+
+#: classes/Command.php:333
+msgid "Notification on."
+msgstr ""
+
+#: classes/Command.php:335
+msgid "Can't turn on notification."
+msgstr ""
+
+#: classes/Command.php:344
+msgid "Commands:\n"
+msgstr ""
+
+#: classes/Message.php:53
+msgid "Could not insert message."
+msgstr ""
+
+#: classes/Message.php:63
+msgid "Could not update message with new URI."
+msgstr ""
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr ""
+
+#: lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:249
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:253
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+msgstr ""
+
+#: lib/mailbox.php:43
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/openid.php:195
+msgid "This form should automatically submit itself. "
+msgstr ""
+
+#: lib/personal.php:65
+msgid "Favorites"
+msgstr ""
+
+#: lib/personal.php:66
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
+#: lib/personal.php:66
+msgid "User"
+msgstr ""
+
+#: lib/personal.php:75
+msgid "Inbox"
+msgstr ""
+
+#: lib/personal.php:76
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personal.php:80
+msgid "Outbox"
+msgstr ""
+
+#: lib/personal.php:81
+msgid "Your sent messages"
+msgstr ""
+
+#: lib/settingsaction.php:99
+msgid "Twitter"
+msgstr ""
+
+#: lib/settingsaction.php:100
+msgid "Twitter integration options"
+msgstr ""
+
+#: lib/util.php:1718
+msgid "To"
+msgstr ""
+
+#: scripts/maildaemon.php:45
+msgid "Could not parse message."
+msgstr ""
diff --git a/locale/vi_VN/LC_MESSAGES/laconica.mo b/locale/vi_VN/LC_MESSAGES/laconica.mo
new file mode 100644
index 000000000..aecd4454d
--- /dev/null
+++ 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
new file mode 100644
index 000000000..3ab63f8c4
--- /dev/null
+++ b/locale/vi_VN/LC_MESSAGES/laconica.po
@@ -0,0 +1,3157 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: laconica\n"
+"Report-Msgid-Bugs-To: mikec@resnet.net.nz\n"
+"POT-Creation-Date: 2008-07-13 17:15+1200\n"
+"PO-Revision-Date: \n"
+"Last-Translator: LienNguyen <lien.nguyen@anhone.vn>\n"
+"Language-Team:  <support@saigonica.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-Language: English\n"
+"X-Poedit-Country: NEW ZEALAND\n"
+
+#: ../actions/noticesearchrss.php:64
+#, php-format
+msgid " Search Stream for \"%s\""
+msgstr " Tìm dòng thông tin cho \"%s\""
+
+#: ../actions/finishopenidlogin.php:82
+#: ../actions/register.php:193
+msgid ""
+" except this private data: password, email address, IM address, phone "
+"number."
+msgstr " ngoại trừ thông tin riêng: mật khẩu, email, địa chỉ IM, số điện thoại"
+
+#: ../actions/subscribe.php:84
+#, 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."
+
+#: ../actions/subscribe.php:86
+#, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s.\n"
+msgstr ""
+"%1$s đang theo dõi các tin nhắn của bạn trên %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Ngư�i bạn trung thành của bạn,\n%4$s.\n"
+
+#: ../actions/shownotice.php:45
+#, php-format
+msgid "%1$s's status on %2$s"
+msgstr "Trạng thái của %1$s vào %2$s"
+
+#: ../actions/publicrss.php:60
+#, php-format
+msgid "%s Public Stream"
+msgstr "%s Dòng tin công cộng"
+
+#: ../actions/all.php:47
+#: ../actions/allrss.php:70
+#: ../lib/stream.php:45
+#, php-format
+msgid "%s and friends"
+msgstr "%s và bạn bè"
+
+#: ../lib/util.php:233
+#, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by "
+"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+msgstr ""
+"**%%site.name%%** là dịch vụ gửi tin nhắn được cung cấp từ "
+"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+
+#: ../lib/util.php:235
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** là dịch vụ gửi tin nhắn. "
+
+#: ../lib/util.php:250
+msgid ". Contributors should be attributed by full name or nickname."
+msgstr "Ngư�i đăng ký nên được phân theo tên hoặc nickname"
+
+#: ../actions/finishopenidlogin.php:73
+#: ../actions/profilesettings.php:43
+#: ../actions/register.php:176
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+"1-64 chữ cái thư�ng hoặc là chữ số, không có dấu chấm hay "
+
+#: ../actions/password.php:42
+#: ../actions/register.php:178
+msgid "6 or more characters"
+msgstr "Nhi�u hơn 6 ký tự"
+
+#: ../actions/register.php:178
+msgid " Required."
+msgstr " Bắt buộc."
+
+#: ../actions/register.php:178
+msgid "Longer name, preferably your \"real\" name"
+msgstr "H� tên đầy đủ của bạn, tốt nhất là tên thật của bạn."
+
+#: ../actions/recoverpassword.php:165
+msgid "6 or more characters, and don't forget it!"
+msgstr "Nhi�u hơn 6 ký tự, đừng quên nó!"
+
+#: ../actions/imsettings.php:188
+#, php-format
+msgid ""
+"A confirmation code was sent to the IM address you added. You must approve "
+"%s for sending messages to you."
+msgstr ""
+"Mã xác nhận đã được gửi đến địa chỉ IM. Bạn phải "
+"chấp nhận %s để có thể gửi tin nhắn đến bạn."
+
+#: ../lib/util.php:296
+msgid "About"
+msgstr "Giới thiệu"
+
+#: ../actions/userauthorization.php:118
+msgid "Accept"
+msgstr "Chấp nhận"
+
+#: ../actions/imsettings.php:64
+#: ../actions/openidsettings.php:57
+msgid "Add"
+msgstr "Thêm"
+
+#: ../actions/openidsettings.php:43
+msgid "Add OpenID"
+msgstr "Thêm OpenID"
+
+#: ../actions/imsettings.php:39
+msgid "Address"
+msgstr "�ịa chỉ"
+
+#: ../actions/showstream.php:254
+msgid "All subscriptions"
+msgstr "Tất cả đăng nhận"
+
+#: ../actions/publicrss.php:62
+#, php-format
+msgid "All updates for %s"
+msgstr "Tất cả các cập nhật của %s"
+
+#: ../actions/noticesearchrss.php:66
+#, php-format
+msgid "All updates matching search term \"%s\""
+msgstr "Các thay đổi phù hợp với từ \"%s\""
+
+#: ../actions/finishopenidlogin.php:29
+#: ../actions/login.php:27
+#: ../actions/openidlogin.php:29
+#: ../actions/register.php:28
+msgid "Already logged in."
+msgstr "�ã đăng nhập."
+
+#: ../actions/subscribe.php:48
+msgid "Already subscribed!."
+msgstr "�ã đăng nhận rồi!"
+
+#: ../actions/userauthorization.php:76
+msgid "Authorize subscription"
+msgstr "�ăng nhận cho phép"
+
+#: ../actions/login.php:100
+#: ../actions/register.php:184
+msgid "Automatically login in the future; not for shared computers!"
+msgstr "Sẽ tự động đăng nhập, không dành cho các máy sử dụng chung!"
+
+#: ../actions/avatar.php:32
+msgid "Avatar"
+msgstr "Hình đại diện"
+
+#: ../actions/avatar.php:113
+msgid "Avatar updated."
+msgstr "Hình đại diện đã được cập nhật."
+
+#: ../actions/imsettings.php:55
+#, 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 ""
+"�ang đợi xác nhận đến địa chỉ này. Hãy kiểm tra tài "
+"khoản Jabber/GTalk để nhận tin nhắn và l�i hướng dẫn. "
+"(Bạn đã thêm %s vào danh sách bạn thân chưa?)"
+
+#: ../actions/imsettings.php:55
+#, php-format
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
+"�ang đợi xác nhận đến địa chỉ này. Hãy kiểm tra hộp "
+"thư đến (hoặc thư rác) để nhận tin nhắn và l�i hướng dẫn."
+
+#: ../lib/util.php:1136
+msgid "Before"
+msgstr "TrÆ°á»›c"
+
+#: ../actions/profilesettings.php:52
+msgid "Bio"
+msgstr "Lý lịch"
+
+#: ../actions/profilesettings.php:93
+#: ../actions/updateprofile.php:102
+msgid "Bio is too long (max 140 chars)."
+msgstr "Lý lịch quá dài (không quá 140 ký tự)"
+
+#: ../actions/updateprofile.php:118
+#, php-format
+msgid "Can't read avatar URL '%s'"
+msgstr "Không thể đ�c URL cho hình đại diện '%s'"
+
+#: ../actions/password.php:85
+#: ../actions/recoverpassword.php:261
+msgid "Can't save new password."
+msgstr "Không thể lưu mật khẩu mới"
+
+#: ../actions/imsettings.php:59
+msgid "Cancel"
+msgstr "Hủy"
+
+#: ../lib/openid.php:121
+msgid "Cannot instantiate OpenID consumer object."
+msgstr "Không thể thiết lập đối tượng OpenID."
+
+#: ../actions/imsettings.php:154
+msgid "Cannot normalize that Jabber ID"
+msgstr "Không thể bình thư�ng hóa Jabber ID"
+
+#: ../actions/password.php:45
+msgid "Change"
+msgstr "Thay đổi"
+
+#: ../actions/password.php:32
+msgid "Change password"
+msgstr "�ổi mật khẩu"
+
+#: ../actions/password.php:43
+#: ../actions/recoverpassword.php:166
+#: ../actions/register.php:179
+msgid "Confirm"
+msgstr "Xác nhận"
+
+#: ../actions/confirmaddress.php:84
+msgid "Confirm Address"
+msgstr "Xác nhận địa chỉ"
+
+#: ../actions/imsettings.php:213
+msgid "Confirmation cancelled."
+msgstr "Sự xác nhận đã bị hủy b�."
+
+#: ../actions/confirmaddress.php:38
+msgid "Confirmation code not found."
+msgstr "Không tìm thấy mã xác nhận."
+
+#: ../actions/finishopenidlogin.php:91
+msgid "Connect"
+msgstr "Kết nối"
+
+#: ../actions/finishopenidlogin.php:86
+msgid "Connect existing account"
+msgstr "Kết nối đến tài khoản hiện hữu"
+
+#: ../lib/util.php:304
+msgid "Contact"
+msgstr "Liên hệ"
+
+#: ../lib/openid.php:178
+#, php-format
+msgid "Could not create OpenID form: %s"
+msgstr "Không thể tạo OpenID mẫu: %s"
+
+#: ../lib/openid.php:160
+#, php-format
+msgid "Could not redirect to server: %s"
+msgstr "Không thể chuyển đến máy chủ: %s"
+
+#: ../actions/updateprofile.php:161
+msgid "Could not save avatar info"
+msgstr "Không thể lưu hình đại diện"
+
+#: ../actions/updateprofile.php:154
+msgid "Could not save new profile info"
+msgstr "Không thể lưu thông tin v� hồ sơ cá nhân"
+
+#: ../actions/profilesettings.php:146
+msgid "Couldn't confirm email."
+msgstr "Không thể xác nhận địa chỉ email."
+
+#: ../actions/finishremotesubscribe.php:99
+msgid "Couldn't convert request tokens to access tokens."
+msgstr "Không thể chuyển các token yêu cầu đến token truy cập."
+
+#: ../actions/subscribe.php:59
+msgid "Couldn't create subscription."
+msgstr "Không thể tạo đăng nhận."
+
+#: ../actions/confirmaddress.php:78
+#: ../actions/imsettings.php:209
+msgid "Couldn't delete email confirmation."
+msgstr "Không thể xóa email xác nhận."
+
+#: ../actions/unsubscribe.php:56
+msgid "Couldn't delete subscription."
+msgstr "Không thể xóa đăng nhận."
+
+#: ../actions/remotesubscribe.php:125
+msgid "Couldn't get a request token."
+msgstr "Không thể lấy token yêu cầu."
+
+#: ../actions/imsettings.php:178
+msgid "Couldn't insert confirmation code."
+msgstr "Không thể  chèn mã xác nhận."
+
+#: ../actions/finishremotesubscribe.php:180
+msgid "Couldn't insert new subscription."
+msgstr "Không thể chèn thêm vào đăng nhận."
+
+#: ../actions/profilesettings.php:175
+msgid "Couldn't save profile."
+msgstr "Không thể lưu hồ sơ cá nhân."
+
+#: ../actions/confirmaddress.php:70
+#: ../actions/imsettings.php:129
+#: ../actions/imsettings.php:234
+#: ../actions/profilesettings.php:123
+msgid "Couldn't update user."
+msgstr "Không thể cập nhật thành viên."
+
+#: ../actions/finishopenidlogin.php:84
+msgid "Create"
+msgstr "Tạo"
+
+#: ../actions/finishopenidlogin.php:70
+msgid "Create a new user with this nickname."
+msgstr "Tạo ngư�i dùng mới với tên đăng nhập này."
+
+#: ../actions/finishopenidlogin.php:68
+msgid "Create new account"
+msgstr "Tạo tài khoản mới"
+
+#: ../actions/finishopenidlogin.php:191
+msgid "Creating new account for OpenID that already has a user."
+msgstr "Tạo tài khoản mới hoặc dùng OpenID"
+
+#: ../actions/imsettings.php:45
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "�ịa chỉ Jabber/GTalk vừa được xác nhận."
+
+#: ../actions/showstream.php:337
+msgid "Currently"
+msgstr "Hiện tại"
+
+#: ../lib/util.php:893
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr "Lỗi cơ sở dữ liệu khi chèn trả l�i: %s"
+
+#: ../actions/profilesettings.php:54
+msgid "Describe your group's interest in 140 characters"
+msgstr "Nói v� những sở thích của nhóm trong vòng 140 ký tự"
+
+#: ../actions/register.php:181
+msgid "Email"
+msgstr "Email"
+
+#: ../actions/profilesettings.php:46
+msgid "Email address"
+msgstr "�ịa chỉ email"
+
+#: ../actions/profilesettings.php:102
+#: ../actions/register.php:63
+msgid "Email address already exists."
+msgstr "�ịa chỉ email đã tồn tại."
+
+#: ../lib/mail.php:82
+msgid "Email address confirmation"
+msgstr "Xac nhan dia chi email"
+
+#: ../actions/recoverpassword.php:176
+msgid "Enter a nickname or email address."
+msgstr "Nhập biệt hiệu hoặc email."
+
+#: ../actions/userauthorization.php:136
+msgid "Error authorizing token"
+msgstr "Lỗi cho phép token"
+
+#: ../actions/finishopenidlogin.php:282
+msgid "Error connecting user to OpenID."
+msgstr "Lỗi xảy ra khi kết nối với OpenId"
+
+#: ../actions/finishaddopenid.php:78
+msgid "Error connecting user."
+msgstr "Lỗi khi kết nối ngư�i dùng."
+
+#: ../actions/finishremotesubscribe.php:151
+msgid "Error inserting avatar"
+msgstr "Lỗi xảy ra khi thêm mới hình đại diện"
+
+#: ../actions/finishremotesubscribe.php:143
+msgid "Error inserting new profile"
+msgstr "Lỗi xảy ra khi thêm mới hồ sơ cá nhân"
+
+#: ../actions/postnotice.php:88
+msgid "Error inserting notice"
+msgstr "Lỗi xảy ra khi thêm mới tin nhắn"
+
+#: ../actions/finishremotesubscribe.php:167
+msgid "Error inserting remote profile"
+msgstr "Lỗi xảy ra khi thêm mới hồ sơ cá nhân"
+
+#: ../actions/recoverpassword.php:201
+msgid "Error saving address confirmation."
+msgstr "Lỗi xảy ra khi lưu địa chỉ đã được xác nhận."
+
+#: ../actions/userauthorization.php:139
+msgid "Error saving remote profile"
+msgstr "Lỗi xảy ra khi lưu hồ sơ cá nhân"
+
+#: ../actions/finishopenidlogin.php:222
+#: ../lib/openid.php:226
+msgid "Error saving the profile."
+msgstr "Lỗi xảy ra khi lưu hồ sơ cá nhân."
+
+#: ../lib/openid.php:237
+msgid "Error saving the user."
+msgstr "Lỗi xảy ra khi lưu thành viên."
+
+#: ../actions/password.php:80
+msgid "Error saving user; invalid."
+msgstr "Lỗi xảy ra khi lưu thành viên;  không hợp lệ."
+
+#: ../actions/login.php:43
+#: ../actions/login.php:69
+#: ../actions/recoverpassword.php:268
+#: ../actions/register.php:73
+msgid "Error setting user."
+msgstr "Lỗi xảy ra khi tạo thành viên."
+
+#: ../actions/finishaddopenid.php:83
+msgid "Error updating profile"
+msgstr "Lỗi xảy ra khi cập nhật hồ sơ cá nhân"
+
+#: ../actions/finishremotesubscribe.php:161
+msgid "Error updating remote profile"
+msgstr "Lỗi xảy ra khi cập nhật hồ sơ cá nhân"
+
+#: ../actions/recoverpassword.php:79
+msgid "Error with confirmation code."
+msgstr "Lỗi xảy ra với mã xác nhận."
+
+#: ../actions/finishopenidlogin.php:89
+msgid "Existing nickname"
+msgstr "Biệt hiệu này đã tồn tại"
+
+#: ../lib/util.php:298
+msgid "FAQ"
+msgstr "FAQ"
+
+msgid "FAQ "
+msgstr "FAQ - H�i đáp"
+
+#: ../actions/avatar.php:115
+msgid "Failed updating avatar."
+msgstr "Cập nhật hình đại diện không thành công."
+
+#: ../actions/all.php:61
+#: ../actions/allrss.php:74
+#, php-format
+msgid "Feed for friends of %s"
+msgstr "Ch�n những ngư�i bạn của %s"
+
+#: ../actions/replies.php:61
+#: ../actions/repliesrss.php:80
+#, php-format
+msgid "Feed for replies to %s"
+msgstr "Ch�n các phản hồi đến %s"
+
+#: ../actions/profilesettings.php:44
+msgid "Full name"
+msgstr "Tên đầy đủ"
+
+#: ../actions/profilesettings.php:90
+#: ../actions/updateprofile.php:92
+msgid "Full name is too long (max 255 chars)."
+msgstr "Tên đầy đủ quá dài (tối đa là 255 ký tự)."
+
+#: ../lib/util.php:279
+msgid "Help"
+msgstr "Hướng dẫn"
+
+#: ../lib/util.php:274
+msgid "Home"
+msgstr "Trang chủ"
+
+#: ../actions/profilesettings.php:49
+msgid "Homepage"
+msgstr "Trang chủ hoặc Blog"
+
+#: ../actions/profilesettings.php:87
+msgid "Homepage is not a valid URL."
+msgstr "Trang chủ không phải là URL"
+
+#: ../actions/imsettings.php:61
+msgid "IM Address"
+msgstr "IM"
+
+#: ../actions/imsettings.php:33
+msgid "IM Settings"
+msgstr "Cấu hình IM"
+
+#: ../actions/finishopenidlogin.php:88
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your OpenID."
+msgstr ""
+"Bạn đã có tài khoản rồi, hãy đăng nhập bằng tên đăng "
+"nhập và mật khẩu để kết nối với OpenId của bạn."
+
+#: ../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 ""
+"Bạn muốn thêm một OpenId vào tài khoản của bạn, đánh nó "
+"vào hộp dưới đây và nhấn\" Thêm\"."
+
+#: ../actions/recoverpassword.php:122
+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 ""
+"Nếu bạn đã quên hoặc mất mật khẩu, bạn có thể tạo "
+"mới và được gửi đến địa chỉ email lưu trong tài khoản của bạn."
+
+#: ../actions/password.php:69
+msgid "Incorrect old password"
+msgstr "Mật khẩu cũ sai"
+
+#: ../actions/login.php:63
+msgid "Incorrect username or password."
+msgstr "Sai tên đăng nhập hoặc mật khẩu."
+
+#: ../actions/recoverpassword.php:226
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr ""
+"Hướng dẫn cách khôi phục mật khẩu đã được gửi đến "
+"địa chỉ email đăng ký trong tài khoản của bạn."
+
+#: ../actions/updateprofile.php:113
+#, php-format
+msgid "Invalid avatar URL '%s'"
+msgstr "URL cho hình đại diện '%s'  không hợp lệ "
+
+#: ../actions/updateprofile.php:97
+#, php-format
+msgid "Invalid homepage '%s'"
+msgstr "Trang chủ '%s'  không hợp lệ"
+
+#: ../actions/updateprofile.php:81
+#, php-format
+msgid "Invalid license URL '%s'"
+msgstr "URL cấp phép '%s'  không hợp lệ"
+
+#: ../actions/postnotice.php:61
+msgid "Invalid notice content"
+msgstr "Nội dung tin nhắn không hợp lệ"
+
+#: ../actions/postnotice.php:67
+msgid "Invalid notice uri"
+msgstr "URI tin nhắn không hợp lệ"
+
+#: ../actions/postnotice.php:72
+msgid "Invalid notice url"
+msgstr "URL tin nhắn không hợp lệ"
+
+#: ../actions/updateprofile.php:86
+#, php-format
+msgid "Invalid profile URL '%s'."
+msgstr "URL hồ sơ cá nhân của '%s' không hợp lệ"
+
+#: ../actions/remotesubscribe.php:96
+msgid "Invalid profile URL (bad format)"
+msgstr "URL hồ sơ cá nhân không đúng định dạng."
+
+#: ../actions/finishremotesubscribe.php:77
+msgid "Invalid profile URL returned by server."
+msgstr "URL hồ sơ cá nhân không hợp lệ."
+
+#: ../actions/avatarbynickname.php:37
+msgid "Invalid size."
+msgstr "Kích thước không hợp lệ."
+
+#: ../actions/finishopenidlogin.php:264
+#: ../actions/register.php:68
+#: ../actions/register.php:84
+msgid "Invalid username or password."
+msgstr "Tên đăng nhập hoặc mật khẩu không hợp lệ."
+
+#: ../lib/util.php:237
+#, 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 ""
+"Microblogging [Laconica](http://laconi.ca/), version %s đã có ở [GNU "
+"Affero General Public License] "
+"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+
+#: ../actions/imsettings.php:164
+msgid "Jabber ID already belongs to another user."
+msgstr "Jabber ID này đã thuộc v� ngư�i khác rồi."
+
+#: ../actions/imsettings.php:63
+#, 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 ""
+"�ịa chỉ Jabber hoặc GTalk, giống như \"UserName@example.org\". "
+"�ầu tiên, hãy tạo thêm %s vào danh sách buddy trên IM client hoặc GTalk của bạn."
+
+#: ../actions/profilesettings.php:55
+msgid "Location"
+msgstr "Thành phố"
+
+#: ../actions/profilesettings.php:96
+#: ../actions/updateprofile.php:107
+msgid "Location is too long (max 255 chars)."
+msgstr "Tên khu vực quá dài (không quá 255 ký tự)."
+
+#: ../actions/login.php:93
+#: ../actions/login.php:102
+#: ../actions/openidlogin.php:68
+#: ../lib/util.php:286
+msgid "Login"
+msgstr "�ăng nhập"
+
+#: ../actions/openidlogin.php:44
+#, php-format
+msgid "Login with an [OpenID](%%doc.openid%%) account."
+msgstr "�ăng nhập bằng tài khoản [OpenID](%%doc.openid%%)."
+
+#: ../actions/login.php:112
+#, 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 ""
+"Hãy đăng nhập với tên đăng nhập và mật khẩu của bạn. "
+"Nếu bạn chưa có tài khoản, [hãy đăng ký](%%action.register%%) "
+"tài khoản mới, hoặc thử đăng nhập bằng [OpenID](%%action.openidlogin%%). "
+
+msgid ""
+"Login with your username and password. Don't have a username yet? "
+"[Register](%%action.register%%) a new account."
+msgstr ""
+"Hãy đăng nhập với tên đăng nhập và mật khẩu của bạn. "
+"Nếu bạn chưa có tài khoản, [hãy đăng ký](%%action.register%%) tài khoản mới."
+
+#: ../lib/util.php:284
+msgid "Logout"
+msgstr "Thoát"
+
+#: ../actions/login.php:106
+msgid "Lost or forgotten password?"
+msgstr "Mất hoặc quên mật khẩu?"
+
+#: ../actions/showstream.php:281
+msgid "Member since"
+msgstr "Gia nhập từ"
+
+#: ../actions/userrss.php:70
+#, php-format
+msgid "Microblog by %s"
+msgstr "Microblog bởi  %s"
+
+#: ../actions/finishopenidlogin.php:79
+#: ../actions/register.php:190
+msgid "My text and files are available under "
+msgstr "Ghi chú và các file của tôi đã có ở phía dưới"
+
+#: ../actions/finishopenidlogin.php:71
+msgid "New nickname"
+msgstr "Biệt hiệu mới"
+
+#: ../actions/newnotice.php:100
+msgid "New notice"
+msgstr "Thông báo mới"
+
+#: ../actions/password.php:41
+#: ../actions/recoverpassword.php:164
+msgid "New password"
+msgstr "Mật khẩu mới"
+
+#: ../actions/recoverpassword.php:275
+msgid "New password successfully saved. You are now logged in."
+msgstr "Mật khẩu mới đã được lưu. Bạn có thể đăng nhập ngay bây gi�."
+
+#: ../actions/login.php:97
+#: ../actions/profilesettings.php:41
+#: ../actions/register.php:175
+msgid "Nickname"
+msgstr "Biệt danh"
+
+#: ../actions/finishopenidlogin.php:175
+#: ../actions/profilesettings.php:99
+#: ../actions/register.php:59
+msgid "Nickname already in use. Try another one."
+msgstr "Biệt hiệu này đã dùng rồi. Hãy nhập biệt hiệu khác."
+
+#: ../actions/finishopenidlogin.php:165
+#: ../actions/profilesettings.php:80
+#: ../actions/register.php:57
+#: ../actions/updateprofile.php:76
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "Biệt hiệu phải là chữ viết thư�ng hoặc số và không có khoảng trắng."
+
+#: ../actions/finishopenidlogin.php:170
+msgid "Nickname not allowed."
+msgstr "Biệt hiệu không được cho phép."
+
+#: ../actions/remotesubscribe.php:72
+msgid "Nickname of the user you want to follow"
+msgstr "Biệt hiệu của thành viên mà bạn muốn theo"
+
+#: ../actions/recoverpassword.php:147
+msgid "Nickname or email"
+msgstr "Biệt hiệu hoặc email"
+
+#: ../actions/imsettings.php:147
+msgid "No Jabber ID."
+msgstr "Không có Jabber ID."
+
+#: ../actions/userauthorization.php:128
+msgid "No authorization request!"
+msgstr "Không có yêu cầu!"
+
+#: ../actions/confirmaddress.php:33
+msgid "No confirmation code."
+msgstr "Không có mã số xác nhận."
+
+#: ../actions/newnotice.php:49
+msgid "No content!"
+msgstr "Không có nội dung!"
+
+#: ../actions/userbyid.php:27
+msgid "No id."
+msgstr "Không có id."
+
+#: ../actions/finishremotesubscribe.php:65
+msgid "No nickname provided by remote server."
+msgstr "Không có biệt hiệu được cung cấp."
+
+#: ../actions/avatarbynickname.php:27
+msgid "No nickname."
+msgstr "Không có biệt hiệu."
+
+#: ../actions/imsettings.php:197
+msgid "No pending confirmation to cancel."
+msgstr "Sự xác nhận chưa được hủy b�."
+
+#: ../actions/finishremotesubscribe.php:72
+msgid "No profile URL returned by server."
+msgstr "Không có URL cho hồ sơ để quay v�."
+
+#: ../actions/recoverpassword.php:189
+msgid "No registered email address for that user."
+msgstr "Thành viên này đã không đăng ký địa chỉ email."
+
+#: ../actions/userauthorization.php:48
+msgid "No request found!"
+msgstr "Không tìm thấy yêu cầu nào!"
+
+#: ../actions/noticesearch.php:64
+#: ../actions/peoplesearch.php:64
+msgid "No results"
+msgstr "Không có kết quả nào"
+
+#: ../actions/avatarbynickname.php:32
+msgid "No size."
+msgstr "Không có kích thước."
+
+#: ../actions/openidsettings.php:135
+msgid "No such OpenID."
+msgstr "Không có OpenID nào."
+
+#: ../actions/doc.php:29
+msgid "No such document."
+msgstr "Không có tài liệu nào."
+
+#: ../actions/shownotice.php:32
+#: ../actions/shownotice.php:65
+msgid "No such notice."
+msgstr "Không có tin nhắn nào."
+
+#: ../actions/recoverpassword.php:56
+msgid "No such recovery code."
+msgstr "Không có mã khôi phục nào."
+
+#: ../actions/postnotice.php:56
+msgid "No such subscription"
+msgstr "Không có đăng ký nào."
+
+#: ../actions/all.php:34
+#: ../actions/allrss.php:35
+#: ../actions/avatarbynickname.php:43
+#: ../actions/foaf.php:36
+#: ../actions/recoverpassword.php:185
+#: ../actions/remotesubscribe.php:84
+#: ../actions/remotesubscribe.php:91
+#: ../actions/repliesrss.php:35
+#: ../actions/showstream.php:95
+#: ../actions/subscribe.php:43
+#: ../actions/unsubscribe.php:38
+#: ../actions/userbyid.php:31
+#: ../actions/userrss.php:35
+#: ../actions/xrds.php:31
+#: ../lib/gallery.php:53
+msgid "No such user."
+msgstr "Không có user nào."
+
+#: ../lib/gallery.php:76
+msgid "Nobody to show!"
+msgstr "Không có ai!"
+
+#: ../actions/recoverpassword.php:60
+msgid "Not a recovery code."
+msgstr "Mã khôi phục không đúng."
+
+#: ../actions/imsettings.php:158
+msgid "Not a valid Jabber ID"
+msgstr "Jabber ID không hợp lệ"
+
+#: ../lib/openid.php:131
+msgid "Not a valid OpenID."
+msgstr "OpenID không hợp lệ."
+
+#: ../actions/profilesettings.php:75
+#: ../actions/register.php:53
+msgid "Not a valid email address."
+msgstr "�ịa chỉ email không hợp lệ."
+
+#: ../actions/profilesettings.php:83
+#: ../actions/register.php:61
+msgid "Not a valid nickname."
+msgstr "Biệt hiệu không hợp lệ."
+
+#: ../actions/remotesubscribe.php:118
+msgid "Not a valid profile URL (incorrect services)."
+msgstr "Không phải là URL v� hồ sơ cá nhân hợp lệ (dịch vụ không xác định)."
+
+#: ../actions/remotesubscribe.php:111
+msgid "Not a valid profile URL (no XRDS defined)."
+msgstr "Không phải là URL v� hồ sơ cá nhân hợp lệ (chưa định nghĩa XRDS)."
+
+#: ../actions/remotesubscribe.php:104
+msgid "Not a valid profile URL (no YADIS document)."
+msgstr ""
+"Không phải là URL v� hồ sơ cá nhân hợp lệ (không phải là "
+
+#: ../actions/avatar.php:95
+msgid "Not an image or corrupt file."
+msgstr "File h�ng hoặc không phải là file ảnh."
+
+#: ../actions/finishremotesubscribe.php:51
+msgid "Not authorized."
+msgstr "Chưa được phép."
+
+#: ../actions/finishremotesubscribe.php:38
+msgid "Not expecting this response!"
+msgstr "Không mong đợi trả l�i lại!"
+
+#: ../actions/finishaddopenid.php:29
+#: ../actions/logout.php:28
+#: ../actions/newnotice.php:29
+#: ../actions/subscribe.php:27
+#: ../actions/unsubscribe.php:24
+#: ../lib/settingsaction.php:27
+msgid "Not logged in."
+msgstr "Chưa đăng nhập."
+
+#: ../actions/unsubscribe.php:43
+msgid "Not subscribed!."
+msgstr "Chưa đăng nhận!"
+
+#: ../actions/showstream.php:82
+#, php-format
+msgid "Notice feed for %s"
+msgstr "Dòng tin nhắn cho %s"
+
+#: ../actions/shownotice.php:39
+msgid "Notice has no profile"
+msgstr "Tin nhắn không có hồ sơ cá nhân"
+
+#: ../actions/showstream.php:297
+msgid "Notices"
+msgstr "Tin nhắn"
+
+#: ../actions/password.php:39
+msgid "Old password"
+msgstr "Mật khẩu cũ"
+
+#: ../lib/util.php:288
+msgid "OpenID"
+msgstr "OpenID"
+
+#: ../actions/finishopenidlogin.php:61
+msgid "OpenID Account Setup"
+msgstr "Tạo tài khoản OpenID"
+
+#: ../lib/openid.php:180
+msgid "OpenID Auto-Submit"
+msgstr "Tự động nhập OpenID"
+
+#: ../actions/finishaddopenid.php:99
+#: ../actions/finishopenidlogin.php:140
+#: ../actions/openidlogin.php:60
+msgid "OpenID Login"
+msgstr "�ăng nhập OpenID"
+
+#: ../actions/openidlogin.php:65
+#: ../actions/openidsettings.php:49
+msgid "OpenID URL"
+msgstr "OpenID URL"
+
+#: ../actions/finishaddopenid.php:42
+#: ../actions/finishopenidlogin.php:103
+msgid "OpenID authentication cancelled."
+msgstr "Xác thực OpenID bị hủy."
+
+#: ../actions/finishaddopenid.php:46
+#: ../actions/finishopenidlogin.php:107
+#, php-format
+msgid "OpenID authentication failed: %s"
+msgstr "Xác thực OpendID bị lỗi: %s"
+
+#: ../lib/openid.php:133
+#, php-format
+msgid "OpenID failure: %s"
+msgstr "OpenID lá»—i: %s"
+
+#: ../actions/openidsettings.php:144
+msgid "OpenID removed."
+msgstr "OpenID đã xóa."
+
+#: ../actions/openidsettings.php:37
+msgid "OpenID settings"
+msgstr "Cấu hình OpenID"
+
+#: ../actions/avatar.php:84
+msgid "Partial upload."
+msgstr "Upload từng phần."
+
+#: ../actions/finishopenidlogin.php:90
+#: ../actions/login.php:98
+#: ../actions/register.php:177
+msgid "Password"
+msgstr "Mật khẩu"
+
+#: ../actions/recoverpassword.php:249
+msgid "Password and confirmation do not match."
+msgstr "Mật khẩu và mật khẩu xác nhận không khớp nhau."
+
+#: ../actions/recoverpassword.php:245
+msgid "Password must be 6 chars or more."
+msgstr "Mật khẩu phải nhi�u hơn 6 ký tự."
+
+#: ../actions/recoverpassword.php:222
+#: ../actions/recoverpassword.php:224
+msgid "Password recovery requested"
+msgstr "Yêu cầu khôi phục lại mật khẩu đã được gửi"
+
+msgid "Password recovery requested "
+msgstr "Yeu cau khoi phuc lai mat khau da duoc gui"
+
+#: ../actions/password.php:89
+#: ../actions/recoverpassword.php:274
+msgid "Password saved."
+msgstr "�ã lưu mật khẩu."
+
+#: ../actions/password.php:61
+#: ../actions/register.php:65
+msgid "Passwords don't match."
+msgstr "Mật khẩu không khớp."
+
+#: ../actions/peoplesearch.php:33
+msgid "People search"
+msgstr "Tìm kiếm nhi�u ngư�i"
+
+#: ../lib/stream.php:44
+msgid "Personal"
+msgstr "Cá nhân"
+
+#: ../actions/userauthorization.php:77
+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 \"Cancel\"."
+msgstr ""
+"Vui lòng kiểm tra các chi tiết để chắc chắn rằng bạn muốn "
+"đăng nhận xem tin nhắn của các thành viên này. Nếu bạn "
+"không yêu cầu đăng nhận xem tin nhắn của h�, hãy nhấn \"Hủy b�\""
+
+#: ../actions/imsettings.php:74
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr ""
+"Gửi một tin nhắn khi trạng thái của tôi trên Jabber hay GTalk "
+
+#: ../actions/imsettings.php:68
+msgid "Preferences"
+msgstr "Tính năng"
+
+#: ../actions/imsettings.php:135
+msgid "Preferences saved."
+msgstr "Các tính năng đã được lưu."
+
+#: ../lib/util.php:300
+msgid "Privacy"
+msgstr "Riêng tư"
+
+#: ../actions/newnotice.php:61
+#: ../actions/newnotice.php:69
+msgid "Problem saving notice."
+msgstr "Có lỗi xảy ra khi lưu tin nhắn."
+
+#: ../lib/stream.php:54
+msgid "Profile"
+msgstr "Hồ sơ "
+
+#: ../actions/remotesubscribe.php:73
+msgid "Profile URL"
+msgstr "URL của Hồ sơ cá nhân"
+
+#: ../actions/profilesettings.php:34
+msgid "Profile settings"
+msgstr "Các thiết lập cho Hồ sơ cá nhân"
+
+#: ../actions/postnotice.php:51
+#: ../actions/updateprofile.php:51
+msgid "Profile unknown"
+msgstr "Hồ sơ này không biết"
+
+#: ../lib/util.php:276
+msgid "Public"
+msgstr "Công cộng"
+
+#: ../actions/public.php:54
+msgid "Public Stream Feed"
+msgstr "Dòng tin công cộng"
+
+#: ../actions/public.php:33
+msgid "Public timeline"
+msgstr "Dòng tin công cộng"
+
+#: ../actions/recoverpassword.php:151
+msgid "Recover"
+msgstr "Khôi phục"
+
+#: ../actions/recoverpassword.php:141
+msgid "Recover password"
+msgstr "Khôi phục mật khẩu"
+
+#: ../actions/recoverpassword.php:67
+msgid "Recovery code for unknown user."
+msgstr "Khôi phục lại code cho user không đăng ký."
+
+#: ../actions/register.php:171
+#: ../actions/register.php:195
+#: ../lib/util.php:287
+msgid "Register"
+msgstr "�ăng ký"
+
+#: ../actions/userauthorization.php:119
+msgid "Reject"
+msgstr "Từ chối"
+
+#: ../actions/login.php:99
+#: ../actions/register.php:183
+msgid "Remember me"
+msgstr "Nhớ tôi"
+
+#: ../actions/updateprofile.php:69
+msgid "Remote profile with no matching profile"
+msgstr "Hồ sơ ở nơi khác không khớp với hồ sơ này của bạn"
+
+#: ../actions/remotesubscribe.php:65
+msgid "Remote subscribe"
+msgstr "�ăng nhận từ xa"
+
+#: ../actions/imsettings.php:48
+#: ../actions/openidsettings.php:106
+msgid "Remove"
+msgstr "Xóa"
+
+#: ../actions/openidsettings.php:68
+msgid "Remove OpenID"
+msgstr "Xóa 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 ""
+"Việc xóa OpenID của bạn có thể sẽ không đăng nhập được! "
+"Nếu bạn cần xóa nó, hãy tạo một OpenID khác trước đã."
+
+#: ../lib/stream.php:49
+msgid "Replies"
+msgstr "Trả l�i"
+
+#: ../actions/replies.php:47
+#: ../actions/repliesrss.php:76
+#: ../lib/stream.php:50
+#, php-format
+msgid "Replies to %s"
+msgstr "Trả l�i cho %s"
+
+#: ../actions/recoverpassword.php:168
+msgid "Reset"
+msgstr "Khởi tạo"
+
+#: ../actions/recoverpassword.php:158
+msgid "Reset password"
+msgstr "Khởi tạo lại mật khẩu"
+
+#: ../actions/recoverpassword.php:167
+#: ../actions/register.php:180
+msgid "Same as password above"
+msgstr "Cùng mật khẩu ở trên"
+
+#: ../actions/imsettings.php:76
+#: ../actions/profilesettings.php:58
+msgid "Save"
+msgstr "LÆ°u"
+
+#: ../lib/searchaction.php:73
+#: ../lib/util.php:277
+msgid "Search"
+msgstr "Tìm kiếm"
+
+#: ../actions/noticesearch.php:80
+msgid "Search Stream Feed"
+msgstr "Tìm kiếm dòng thông tin"
+
+#: ../actions/noticesearch.php:30
+#, 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 ""
+"Tìm kiếm những tin nhắn trên %%site.name%% bằng nội dung. Chia "
+"các cụm từ cần tìm bởi khoảng trắng; và phải là 3 ký tự trở lên."
+
+#: ../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 ""
+"Tìm kiếm những ngư�i trên %%site.name%% bằng tên, vị trí, "
+"hoặc sở thích của h�. Chia các cụm từ bởi khoảng trắng; và phải là 3 ký tự trở lên."
+
+#: ../lib/util.php:982
+msgid "Send"
+msgstr "Gá»­i"
+
+#: ../actions/imsettings.php:71
+msgid "Send me notices through Jabber/GTalk."
+msgstr "Hãy gửi tin nhắn đến tôi qua Jabber hay GTalk"
+
+#: ../lib/util.php:282
+msgid "Settings"
+msgstr "�i�u chỉnh"
+
+#: ../actions/profilesettings.php:183
+msgid "Settings saved."
+msgstr "�ã lưu các đi�u chỉnh."
+
+#: ../actions/finishaddopenid.php:66
+msgid "Someone else already has this OpenID."
+msgstr "�ã có ngư�i sử dụng OpenID này rồi."
+
+#: ../actions/finishopenidlogin.php:42
+#: ../actions/openidsettings.php:126
+msgid "Something weird happened."
+msgstr "Vài đi�u bất thư�ng xảy ra."
+
+#: ../lib/util.php:302
+msgid "Source"
+msgstr "Nguồn"
+
+#: ../actions/showstream.php:277
+msgid "Statistics"
+msgstr "Số liệu thống kê"
+
+#: ../actions/finishopenidlogin.php:182
+#: ../actions/finishopenidlogin.php:275
+msgid "Stored OpenID not found."
+msgstr "Không tìm thấy OpenID."
+
+#: ../actions/remotesubscribe.php:75
+#: ../actions/showstream.php:172
+#: ../actions/showstream.php:181
+msgid "Subscribe"
+msgstr "Theo bạn này"
+
+#: ../actions/showstream.php:294
+#: ../actions/subscribers.php:27
+msgid "Subscribers"
+msgstr "Bạn này theo tôi"
+
+#: ../actions/showstream.php:294
+#: ../actions/subscribers.php:27
+msgid "Subscribers "
+msgstr "Theo tôi"
+
+#: ../actions/userauthorization.php:309
+msgid "Subscription authorized"
+msgstr "�ăng nhận được phép"
+
+#: ../actions/userauthorization.php:319
+msgid "Subscription rejected"
+msgstr "�ăng nhận từ chối"
+
+#: ../actions/showstream.php:212
+#: ../actions/showstream.php:288
+#: ../actions/subscriptions.php:27
+msgid "Subscriptions"
+msgstr "Tôi theo bạn này"
+
+#: ../actions/showstream.php:212
+#: ../actions/showstream.php:288
+#: ../actions/subscriptions.php:27
+msgid "Subscriptions "
+msgstr "Tôi theo"
+
+#: ../actions/avatar.php:87
+msgid "System error uploading file."
+msgstr "Hệ thống xảy ra lỗi trong khi tải file."
+
+#: ../actions/noticesearch.php:34
+msgid "Text search"
+msgstr "Chuỗi cần tìm"
+
+#: ../actions/openidsettings.php:140
+msgid "That OpenID does not belong to you."
+msgstr "OpenID này không phải của bạn."
+
+#: ../actions/confirmaddress.php:52
+msgid "That address has already been confirmed."
+msgstr "�ịa chỉ đó đã được xác nhận rồi."
+
+#: ../actions/confirmaddress.php:43
+msgid "That confirmation code is not for you!"
+msgstr "Mã xác nhận này không phải của bạn!"
+
+#: ../actions/avatar.php:80
+msgid "That file is too big."
+msgstr "File quá lớn."
+
+#: ../actions/imsettings.php:161
+msgid "That is already your Jabber ID."
+msgstr "Tài khoản đó đã là tên tài khoản Jabber của bạn rồi."
+
+#: ../actions/imsettings.php:224
+msgid "That is not your Jabber ID."
+msgstr "�ây không phải Jabber ID của bạn."
+
+#: ../actions/imsettings.php:201
+msgid "That is the wrong IM address."
+msgstr "Sai IM."
+
+#: ../actions/newnotice.php:52
+msgid "That's too long. Max notice size is 140 chars."
+msgstr "Quá dài. Tối đa là 140 ký tự."
+
+#: ../actions/confirmaddress.php:86
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "�ịa chỉ \"%s\" đã được xác nhận từ tài khoản của bạn."
+
+#: ../actions/imsettings.php:241
+msgid "The address was removed."
+msgstr "�ã xóa địa chỉ."
+
+#: ../actions/userauthorization.php:311
+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 ""
+"�ăng nhận được phép, nhưng URL trả lại không được gởi "
+"trả. Hãy kiểm tra các hướng dẫn chi tiết trên site để "
+"biết cách cho phép đăng ký. �ăng nhận token của bạn là:"
+
+#: ../actions/userauthorization.php:321
+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 ""
+"�ăng nhận này đã bị từ chối, nhưng không có URL nào để "
+"quay v�. Hãy kiểm tra các hướng dẫn chi tiết trên site để "
+
+#: ../actions/subscribers.php:35
+#, php-format
+msgid "These are the people who listen to %s's notices."
+msgstr "Có nhi�u ngư�i nghe theo l�i nhắn của %s."
+
+#: ../actions/subscribers.php:33
+msgid "These are the people who listen to your notices."
+msgstr "Có nhi�u ngư�i nghe theo l�i nhắn của bạn."
+
+#: ../actions/subscriptions.php:35
+#, php-format
+msgid "These are the people whose notices %s listens to."
+msgstr "Có nhi�u ngư�i gửi l�i nhắn để  %s nghe theo."
+
+#: ../actions/subscriptions.php:33
+msgid "These are the people whose notices you listen to."
+msgstr "Có nhi�u ngư�i gửi l�i nhắn để bạn nghe theo."
+
+#: ../actions/recoverpassword.php:87
+msgid "This confirmation code is too old. Please start again."
+msgstr "Mã xác nhận quá cũ. Hãy thử lại cái khác."
+
+#: ../lib/openid.php:195
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+"Trang này sẽ tự động gửi đi. Nếu không, hãy click lên nút "
+"Gửi để gửi đến nhà cung cấp OpenID của bạn."
+
+#: ../actions/finishopenidlogin.php:56
+#, php-format
+msgid ""
+"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."
+msgstr ""
+"�ây là lần đầu tiên bạn đăng nhập vào %s, vì vậy chúng "
+"tôi phải kết nối tài khoản OpenID của bạn với tài khoản "
+"trên site này. Bạn có thể tạo một tài khoản mới, hoặc "
+"kết nối với tài khoản đã có của bạn, nếu như bạn đã có rồi."
+
+#: ../lib/util.php:147
+msgid "This page is not available in a media type you accept"
+msgstr "Trang này không phải là phương tiện truy�n thông mà bạn chấp nhận."
+
+#: ../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 ""
+"�ể đăng ký, bạn cần [�ăng nhập](%%action.login%%), hoặc "
+"[�ăng ký](%%action.register%%) tài khoản mới. Nếu bạn đã có "
+"một tài khoản khác trên [site microblogging tương "
+"ứng](%%doc.openmublog%%), hãy nhập URL v� hồ sơ cá nhân của bạn dưới đây."
+
+#: ../actions/profilesettings.php:51
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr ""
+"URL v� Trang chính, Blog, hoặc hồ sơ cá nhân của bạn trên "
+
+#: ../actions/remotesubscribe.php:74
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "URL trong hồ sơ cá nhân của bạn ở trên các trang microblogging khác"
+
+#: ../actions/imsettings.php:105
+#: ../actions/recoverpassword.php:39
+msgid "Unexpected form submission."
+msgstr "Bất ng� gửi mẫu thông tin. "
+
+#: ../actions/recoverpassword.php:237
+msgid "Unexpected password reset."
+msgstr "Bất ng� reset mật khẩu."
+
+#: ../actions/finishremotesubscribe.php:58
+msgid "Unknown version of OMB protocol."
+msgstr "Không biết phiên bản của giao thức OMB."
+
+#: ../lib/util.php:245
+msgid ""
+"Unless otherwise specified, contents of this site are copyright by the "
+"contributors and available under the "
+msgstr ""
+"Nếu không có các quy định khác, nội dung của trang web này có "
+"bản quy�n của ngư�i đóng góp và theo bản quy�n  "
+
+#: ../actions/confirmaddress.php:48
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr "Không nhận dạng kiểu địa chỉ %s"
+
+#: ../actions/showstream.php:193
+msgid "Unsubscribe"
+msgstr "Hết theo"
+
+#: ../actions/postnotice.php:44
+#: ../actions/updateprofile.php:44
+msgid "Unsupported OMB version"
+msgstr "Không hỗ trợ cho version OMB"
+
+#: ../actions/avatar.php:105
+msgid "Unsupported image file format."
+msgstr "Không hỗ trợ kiểu file ảnh này."
+
+#: ../actions/avatar.php:68
+msgid "Upload"
+msgstr "Tải file"
+
+#: ../actions/avatar.php:27
+msgid ""
+"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 license, also. Use a picture that belongs to you and that you want to "
+"share."
+msgstr ""
+"Tải \"hình đại diện\" mới (hình cá nhân) tại đây. Bạn "
+"không thể chỉnh sửa lại hình sau khi tải nó lên, vì thế "
+"nếu muốn hãy sửa trước khi tải lên. Hình phải phù hợp "
+
+#: ../actions/profilesettings.php:48
+#: ../actions/register.php:182
+msgid "Used only for updates, announcements, and password recovery"
+msgstr "Chỉ dùng để cập nhật, thông báo, và hồi phục mật khẩu"
+
+#: ../actions/finishremotesubscribe.php:86
+msgid "User being listened to doesn't exist."
+msgstr "Ngư�i dùng đang lắng nghe để không thoát kh�i."
+
+#: ../actions/all.php:41
+#: ../actions/avatarbynickname.php:48
+#: ../actions/foaf.php:43
+#: ../actions/replies.php:41
+#: ../actions/showstream.php:44
+msgid "User has no profile."
+msgstr "Ngư�i dùng không có thông tin."
+
+#: ../actions/remotesubscribe.php:71
+msgid "User nickname"
+msgstr "Biệt hiệu của ngư�i dùng"
+
+#: ../lib/util.php:969
+#, php-format
+msgid "What's up, %s?"
+msgstr "Bạn đang làm gì thế, %s?"
+
+#: ../lib/util.php:969
+#, php-format
+msgid "%s, Tell the world what's on your mind?"
+msgstr "%s, bạn đang làm gì?"
+
+#: ../actions/profilesettings.php:57
+msgid "City, State/Region, Country"
+msgstr "Thành phố, Tỉnh thành, Quốc gia"
+
+#: ../actions/updateprofile.php:127
+#, php-format
+msgid "Wrong image type for '%s'"
+msgstr "Kiểu file ảnh không phù hợp với  '%s'"
+
+#: ../actions/updateprofile.php:122
+#, php-format
+msgid "Wrong size image at '%s'"
+msgstr "Kích thước file ảnh không phù hợp đối với  '%s'"
+
+#: ../actions/finishaddopenid.php:64
+msgid "You already have this OpenID!"
+msgstr "Bạn đã có được tài khoản OpenID này rồi!"
+
+#: ../actions/recoverpassword.php:31
+msgid "You are already logged in!"
+msgstr "Bạn đã đăng nhập!"
+
+#: ../actions/password.php:27
+msgid "You can change your password here. Choose a good one!"
+msgstr "Bạn có thể thay đổi mật khẩu tại đây. Hãy ch�n mật khẩu mới!"
+
+#: ../actions/register.php:164
+msgid "You can create a new account to start posting notices."
+msgstr "Bạn có thể tạo tài khoản mới để có thể gửi ý kiến của mình."
+
+#: ../actions/openidsettings.php:86
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+"Bạn có thể loại b� OpenID kh�i tài khoản của bạn bằng "
+"cách nhấn vào nút \"Xóa\"."
+
+#: ../actions/imsettings.php:28
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
+msgstr ""
+"Bạn có thể gửi và nhận những tin nhắn qua Jabber hoặc GTalk "
+"[tin nhắn nhanh](%%doc.im%%). �ịnh dạng địa chỉ của bạn và các thiết lập sau."
+
+#: ../actions/profilesettings.php:27
+msgid ""
+"You can update your personal profile info here so people know more about "
+"you."
+msgstr ""
+"Bạn có thể cập nhật hồ sơ cá nhân tại đây để m�i "
+"ngư�i có thể biết thông tin v� bạn."
+
+#: ../actions/finishremotesubscribe.php:31
+#: ../actions/remotesubscribe.php:31
+msgid "You can use the local subscription!"
+msgstr "Bạn có thể đăng ký tại nơi bạn ở!"
+
+#: ../actions/finishopenidlogin.php:33
+#: ../actions/register.php:51
+msgid "You can't register if you don't agree to the license."
+msgstr "Bạn không thể đăng ký nếu không đồng ý các đi�u khoản."
+
+#: ../actions/updateprofile.php:62
+msgid "You did not send us that profile"
+msgstr "Bạn chưa cập nhật thông tin riêng"
+
+#: ../actions/recoverpassword.php:134
+msgid "You've been identified. Enter a  new password below. "
+msgstr "Bạn đã được xác định. Hãy nhập mật khẩu mới ở dưới."
+
+#: ../actions/openidlogin.php:67
+msgid "Your OpenID URL"
+msgstr "OpenID URL của bạn"
+
+#: ../actions/recoverpassword.php:149
+msgid "Your nickname on this server, or your registered email address."
+msgstr "Biệt hiệu của bạn đã tồn tại hoặc bạn đã đăng ký bằng email này rồi."
+
+#: ../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%%) đăng nhập nhi�u website với cùng 1 tài "
+"khoản. Quản lý các OpenID của bạn ở đây."
+
+#: ../lib/util.php:814
+msgid "a few seconds ago"
+msgstr "vài giây trước"
+
+#: ../lib/util.php:826
+#, php-format
+msgid "about %d days ago"
+msgstr "%d ngày trước"
+
+#: ../lib/util.php:822
+#, php-format
+msgid "about %d hours ago"
+msgstr "%d gi� trước"
+
+#: ../lib/util.php:818
+#, php-format
+msgid "about %d minutes ago"
+msgstr "%d phút trước"
+
+#: ../lib/util.php:830
+#, php-format
+msgid "about %d months ago"
+msgstr "%d tháng trước"
+
+#: ../lib/util.php:824
+msgid "about a day ago"
+msgstr "1 ngày trước"
+
+#: ../lib/util.php:816
+msgid "about a minute ago"
+msgstr "1 phút trước"
+
+#: ../lib/util.php:828
+msgid "about a month ago"
+msgstr "1 tháng trước"
+
+#: ../lib/util.php:832
+msgid "about a year ago"
+msgstr "1 năm trước"
+
+#: ../lib/util.php:820
+msgid "about an hour ago"
+msgstr "1 gi� trước"
+
+#: ../actions/noticesearch.php:126
+#: ../actions/showstream.php:383
+#: ../lib/stream.php:101
+msgid "in reply to..."
+msgstr "còn nữa..."
+
+#: ../actions/noticesearch.php:133
+#: ../actions/showstream.php:390
+#: ../lib/stream.php:108
+msgid "reply"
+msgstr "trả l�i"
+
+#: ../actions/password.php:44
+msgid "same as password above"
+msgstr "cùng mật khẩu ở trên"
+
+#: ../lib/util.php:1127
+msgid "After"
+msgstr "Sau"
+
+#: ../lib/util.php:
+msgid "Tags"
+msgstr "Từ khóa"
+
+#: ../lib/util.php:
+msgid "Register for a free account!"
+msgstr "�ăng ký tài khoản miễn phí!"
+
+#: ../lib/util.php:
+msgid "Everyone"
+msgstr "Tất cả m�i ngư�i"
+
+#: ../lib/util.php:
+msgid "Welcome to %s"
+msgstr "%s chào mừng bạn "
+
+#: ../lib/util.php:
+msgid "Blog + Chat = Fun"
+msgstr "Vừa Blog vừa Chat = Vui Lắm"
+
+#: ../lib/util.php:
+msgid ""
+"%s is a new way to send short messages to your friends, family, and "
+"co-workers."
+msgstr ""
+"%s là dịch vụ cho bạn bè, gia đình và đồng nghiệp liên "
+"lạc và kết nối qua những trao đổi ngắn."
+
+#: ../lib/util.php:
+msgid ""
+"Starting a conversation is fast and easy: You can shout messages to your "
+"followers, or whisper to your friends. Just think of something to say, and "
+"get started!"
+msgstr ""
+"�ể bắt đầu cuộc đàm luận: Bạn có thể gửi tin nhắn "
+"đến những ngư�i mà bạn theo, hoặc gửi những mong ước "
+"của bạn đến bạn bè, những câu trả l�i thông thư�ng cho một câu h�i đơn giản: Bạn đang làm gì vậy? "
+
+#: ../lib/util.php:
+msgid "Register now!"
+msgstr "Hãy đăng ký ngay!"
+
+#: ../lib/util.php:
+msgid "What's the latest?"
+msgstr "M�i ngư�i đang nói gì?"
+
+#: ../lib/util.php:
+msgid "What Everyone Is Talking About"
+msgstr "M�i ngư�i đang nói gì?"
+
+#: ../lib/searchaction.php:
+msgid "People"
+msgstr "Tên tài khoản"
+
+#: ../lib/searchaction.php:
+msgid "Find people on this site"
+msgstr "Tìm kiếm m�i ngư�i trên trang web này"
+
+#: ../lib/searchaction.php:
+msgid "Text"
+msgstr "Chuỗi bất kỳ"
+
+#: ../lib/util.php:
+msgid "Find content of notices"
+msgstr "Tìm theo nội dung của tin nhắn"
+
+#: ../actions/tag.php:
+msgid "Showing most popular tags from the last week"
+msgstr "Các từ khóa phổ biến."
+
+#: ../actions/tag.php:
+msgid "Recent Tags"
+msgstr "Các từ khóa hiện tại"
+
+#: ../actions/profileseting.php:
+msgid "What timezone are you normally in?"
+msgstr "Khu vực nào bạn thư�ng ở?"
+
+#: ../actions/profileseting.php:
+msgid "Timezone"
+msgstr "Khu vá»±c"
+
+#: ../actions/profileseting.php:
+msgid "Language"
+msgstr "Ngôn ngữ"
+
+#: ../actions/profileseting.php:
+msgid "Preferred language"
+msgstr "Ngôn ngữ bạn thích"
+
+#: ../actions/profileseting.php:
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for "
+"non-humans)"
+msgstr "Tự động theo những ngư�i nào đăng ký theo tôi"
+
+#: ../actions/profileseting.php:
+msgid "Could not save profile."
+msgstr "Không thể lưu hồ sơ cá nhân."
+
+#: ../lib/setingactions.php:
+msgid "Change your profile settings"
+msgstr "Thay đổi các thiết lập trong hồ sơ cá nhân của bạn"
+
+#: ../lib/setingactions.php:
+msgid "Change email handling"
+msgstr "�ang thực hiện việc thay đổi email"
+
+#: ../lib/setingactions.php:
+msgid "Upload a new profile image"
+msgstr "Tải lên một file ảnh mới cho hồ sơ cá nhân"
+
+#: ../lib/setingactions.php:
+msgid "Change your password"
+msgstr "Thay đổi mật khẩu của bạn"
+
+#: ../lib/setingactions.php:
+msgid "Add or remove OpenIDs"
+msgstr "Thêm mới hoặc xóa OpenIDs"
+
+#: ../lib/setingactions.php:
+msgid "Updates by SMS"
+msgstr "Thay đổi bởi SMS"
+
+#: ../lib/setingactions.php:
+msgid "Updates by instant messenger (IM)"
+msgstr "Thay đổi bởi tin nhắn nhanh (IM)"
+
+#: ../lib/smsseting.php:
+msgid "SMS Phone number"
+msgstr "Số điện thoại để nhắn SMS "
+
+#: ../lib/smsseting.php:
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+"Số điện thoại, không cho phép nhập dấu chấm và ký tự "
+
+#: ../lib/smsseting.php:
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr "Bạn có thể nhận tin nhắn SMS qua email từ %%site.name%%."
+
+#: ../lib/smsseting.php:
+msgid "SMS Settings"
+msgstr "Thiết lập SMS"
+
+#: ../lib/smsseting.php:
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "SMS xác nhận ngay - đã cho phép gửi qua điện thoại. "
+
+#: ../lib/smsseting.php:
+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 ""
+"Nhà cung cấp dịch vụ điện thoại di động của bạn. Nếu "
+"bạn biết nhà cung cấp dịch vụ điện thoại nào cho phép "
+"nhận SMS qua email  mà chưa có trong danh sách này, vui lòng gửi mail cho chúng tôi đến địa chỉ %s."
+
+#: ../lib/smsseting.php:
+msgid "No code entered"
+msgstr "Không có mã nào được nhập"
+
+#: ../lib/smsseting.php:
+msgid "Select a carrier"
+msgstr "Ch�n nhà cung cấp Mobile"
+
+#: ../lib/smsseting.php:
+msgid "That is not your phone number."
+msgstr "�ó không phải là số điện thoại của bạn."
+
+#: ../lib/smsseting.php:
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+"Hãy gửi thông báo đến tôi qua SMS; Tôi  biết là bạn đang "
+"phải trả giá cao cho dịch vụ của chúng tôi. "
+
+#: ../lib/imseting.php:
+msgid "Send me replies through Jabber/GTalk from people I’m not subscribed to."
+msgstr ""
+"Gửi tin nhắn trả l�i những ngư�i mà tôi không đăng ký qua "
+
+#: ../lib/imseting.php:
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Gửi MicroID đến địa chỉ Jabber/GTalk của tôi. "
+
+#: ../lib/emailseting.php:
+msgid "Manage how you get email from %%site.name%%."
+msgstr "Bạn nhận email từ %%site.name%% như thế nào."
+
+#: ../lib/emailseting.php:
+msgid "Send me notices of new subscriptions through email."
+msgstr "Hãy gửi email cho tôi thông báo v� các đăng nhận mới."
+
+#: ../lib/emailseting.php:
+msgid "I want to post notices by email."
+msgstr "Tôi muốn đưa tin nhắn lên bằng email."
+
+#: ../lib/emailseting.php:
+msgid "Publish a MicroID for my email address."
+msgstr "Xuất bản một MicroID đến địa chỉ email của tôi."
+
+#: ../lib/emailseting.php:
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr ""
+"Tạo một địa chỉ email mới để đưa tin nhắn lên; và xóa "
+
+#: ../lib/emailseting.php:
+msgid "Send email to this address to post new notices."
+msgstr "Gửi email đến địa chỉ này để đưa tin nhắn mới lên."
+
+#: ../actions/choosetheme.php:
+msgid ""
+"You can change the theme as you want by clicking a thumbnail image and then "
+"click Save button to active new theme."
+msgstr ""
+"Bạn có thể thay đổi theme bằng cách ch�n vào một hình ảnh "
+"theme bạn thích. Sau đó nhấn nút Lưu để thay đổi theme mới."
+
+#: ../actions/choosetheme.php:
+msgid "Choose a theme"
+msgstr "Ch�n theme"
+
+#: ../actions/choosetheme.php:
+msgid "Theme Error"
+msgstr "Lá»—i Theme"
+
+#: ../actions/choosetheme.php:
+msgid ""
+"Tired of the same old colors on your timeline? Change is good so spice up "
+"your %s page."
+msgstr ""
+"Nếu cảm thấy nhàm chán với màu sắc cũ trên timeline của "
+"bạn, hãy thay đổi màu sắc để trang %s của bạn hấp dẫn hơn."
+
+#: ../actions/choosetheme.php:
+msgid "Preview"
+msgstr "Xem trÆ°á»›c"
+
+#: ../actions/choosetheme.php:
+msgid "Background Theme:"
+msgstr "Background Theme:"
+
+#: ../actions/choosetheme.php:
+msgid "Customize your theme"
+msgstr "Tùy chỉnh theme "
+
+#: ../actions/choosetheme.php:
+msgid "Timeline Theme:"
+msgstr "Timeline Theme:"
+
+#: ../actions/choosetheme.php:
+msgid "Dashboard Theme:"
+msgstr "Dashboard Theme:"
+
+#: ../actions/choosetheme.php:
+msgid "Theme"
+msgstr "Theme"
+
+#: ../actions/public.php:
+msgid "Activity"
+msgstr "Các hoạt động"
+
+#: ../actions/public.php:
+msgid "Me & My Friends"
+msgstr "Tôi & bạn"
+
+#: ../actions/public.php:
+msgid "User & Friends"
+msgstr "Nhóm bạn"
+
+#: ../actions/public.php:
+msgid "My Profile"
+msgstr "Cá nhân"
+
+#: ../actions/public.php:
+msgid "User Profile"
+msgstr "Hồ sơ"
+
+#: ../actions/css.php:
+msgid "Customize your page even more with CSS"
+msgstr "Tùy chỉnh trang của bạn bằng CSS"
+
+#: ../actions/css.php:
+msgid "Save Changes"
+msgstr "LÆ°u"
+
+#: ../actions/css.php:
+msgid "Change css code"
+msgstr "Thay đổi code css"
+
+#: ../actions/css.php:
+msgid "You can change your css code here."
+msgstr "Bạn có thể thay đổi code css"
+
+#: ../actions/css.php:
+msgid "New css code saved."
+msgstr "CSS đã được lưu."
+
+#: ../lib/util.php:
+msgid "Reply"
+msgstr "Trả l�i"
+
+#: ../actions/avatar.php:
+msgid "Upload from your computer"
+msgstr "Tải từ máy tính cá nhân  "
+
+#: ../actions/avatar.php:
+msgid "Get from library"
+msgstr "Lấy từ tập ảnh có sẵn"
+
+#: ../actions/avatar.php:
+msgid "Male"
+msgstr "Nam"
+
+#: ../actions/avatar.php:
+msgid "Female"
+msgstr "Nữ"
+
+#: ../dasboard.php:
+msgid "Last message"
+msgstr "Tin mới nhất"
+
+#: ../stream.php:
+msgid "No reply yet"
+msgstr "chưa có trả l�i"
+
+msgid "replies"
+msgstr "trả l�i"
+
+#: ../actions/showstream.php:400
+#: ../lib/stream.php:109
+msgid " from "
+msgstr " từ"
+
+#: ../actions/invite.php:168
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s moi ban tham gia vao %2$s"
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+"%1$s m�i bạn tham gia vào %2$s (%3$s).\n"
+"\n"
+"%2$s là dịch vụ tin nhắn nhanh giúp bạn liên kết với ngư�i "
+"quen và những ngư�i yêu thích bạn.\n"
+"\n"
+"Bạn cũng có thể chia sẻ những suy nghĩ, thông tin v� bạn, "
+"hoặc đ�i sống của bạn lên trên mạng cho những ngư�i quen "
+"của bạn biết. Dịch vụ này cũng giúp bạn gặp gỡ những "
+"ngư�i chưa quen biết nhưng có cùng sở thích.\n"
+"\n"
+"%1$s nói:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Bạn có thể tham khảo trang thông tin cá nhân của  %1$s trên  "
+"%2$s tại đây:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Nếu bạn muốn sử dụng dịch vụ này, hãy nhấn chuột vào "
+"liên kết dưới đây để chấp nhận l�i m�i.\n\n%6$s\n\nNếu không thích tham gia, bạn có thể b� qua tin nhắn này. Rất cảm ơn sự kiên nhẫn vì đã làm mất th�i gian của bạn.\n\nThân, %2$s\n"
+
+#: ../actions/invite.php:84
+#: ../actions/invite.php:92
+#, php-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../actions/invite.php:131
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+"Các địa chỉ email của những ngư�i bạn muốn m�i (mỗi "
+"địa chỉ nằm trên 1 dòng)"
+
+#: ../actions/twitapifriendships.php:60
+#: ../actions/twitapifriendships.php:76
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
+
+#: ../actions/recoverpassword.php:102
+msgid "Could not update user with confirmed email address."
+msgstr "Không thể cập nhật thông tin user với địa chỉ email đã được xác nhận."
+
+#: ../actions/twitapistatuses.php:93
+msgid "Couldn't find any statuses."
+msgstr "Không tìm thấy bất kỳ trạng thái nào."
+
+#: ../actions/invite.php:129
+msgid "Email addresses"
+msgstr "�ịa chỉ email"
+
+#: ../lib/settingsaction.php:102
+msgid "IM"
+msgstr "IM"
+
+#: ../actions/invite.php:55
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "�ịa chỉ email không đúng:%s"
+
+#: ../actions/invite.php:79
+msgid "Invitation(s) sent"
+msgstr "Thư m�i đã gửi"
+
+#: ../actions/invite.php:97
+msgid "Invitation(s) sent to the following people:"
+msgstr "Thư m�i đã gửi đến:"
+
+#: ../lib/util.php:306
+msgid "Invite"
+msgstr "Thư m�i"
+
+#: ../actions/invite.php:123
+msgid "Invite new users"
+msgstr "Gửi thư m�i đến những ngư�i chưa có tài khoản"
+
+#: ../actions/twitapistatuses.php:595
+msgid "No status found with that ID."
+msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
+
+#: ../actions/twitapistatuses.php:555
+msgid "No status with that ID found."
+msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
+
+#: ../actions/recoverpassword.php:211
+msgid "No user with that email address or username."
+msgstr ""
+"Không tìm thấy ngư�i dùng nào tương ứng với địa chỉ "
+"email hoặc username đó."
+
+#: ../scripts/maildaemon.php:50
+msgid "Not a registered user."
+msgstr "Không có ngư�i dùng nào đăng ký"
+
+#: ../lib/twitterapi.php:226
+#: ../lib/twitterapi.php:247
+#: ../lib/twitterapi.php:332
+msgid "Not a supported data format."
+msgstr "Không hỗ trợ định dạng dữ liệu này."
+
+#: ../actions/twitapistatuses.php:422
+msgid "Not found"
+msgstr "Không tìm thấy"
+
+#: ../actions/invite.php:135
+msgid "Optionally add a personal message to the invitation."
+msgstr "Không bắt buộc phải thêm thông điệp vào thư m�i."
+
+#: ../actions/invite.php:133
+msgid "Personal message"
+msgstr "Tin nhắn cá nhân"
+
+#: ../lib/settingsaction.php:99
+msgid "SMS"
+msgstr "SMS"
+
+#: ../scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr "Xin lỗi, không có địa chỉ email cho phép."
+
+#: ../scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr "Xin lỗi, đó không phải là địa chỉ email mà bạn nhập vào."
+
+#: ../actions/twitapiaccount.php:74
+msgid "That's too long. Max notice size is 255 chars."
+msgstr "Tin nhắn quá dài. Chỉ được phép tối đa 255 ký tự."
+
+#: ../actions/invite.php:89
+msgid ""
+"These people are already users and you were automatically subscribed to "
+"them:"
+msgstr ""
+"Những ngư�i này đã là thành viên rồi và bạn chỉ cần "
+"nhấn nút \"Tôi theo ngư�i này\" để theo h�:"
+
+#: ../actions/twitapifriendships.php:108
+#: ../actions/twitapistatuses.php:586
+msgid "This method requires a POST or DELETE."
+msgstr "Phương thức này yêu cầu là POST hoặc DELETE"
+
+#: ../actions/twitapiaccount.php:65
+#: ../actions/twitapifriendships.php:44
+#: ../actions/twitapistatuses.php:381
+msgid "This method requires a POST."
+msgstr "Phương thức này yêu cầu là POST."
+
+#: ../index.php:57
+msgid "Unknown action"
+msgstr "Không tìm thấy action"
+
+#: ../actions/invite.php:114
+msgid ""
+"Use this form to invite your friends and colleagues to use this "
+"service."
+msgstr ""
+"�i�n địa chỉ email và nội dung tin nhắn để gửi thư m�i "
+"bạn bè và đồng nghiệp của bạn tham gia vào dịch vụ này."
+
+#: ../actions/twitapiusers.php:75
+msgid "User not found."
+msgstr "Không tìm thấy user."
+
+#: ../actions/invite.php:81
+msgid "You are already subscribed to these users:"
+msgstr "Bạn đã theo những ngư�i này:"
+
+#: ../actions/twitapistatuses.php:612
+msgid "You may not delete another user's status."
+msgstr "Bạn đã không xóa trạng thái của những ngư�i khác."
+
+#: ../actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr ""
+"Bạn phải đăng nhập vào mới có thể gửi thư m�i những "
+
+#: ../actions/invite.php:103
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
+msgstr ""
+"Bạn sẽ nhận được thông báo khi những ngư�i được bạn "
+"m�i nhận l�i m�i và đăng ký vào trang web này. Cảm ơn bạn "
+
+#: ..lib/personal.php:
+msgid "Favorites"
+msgstr "Ưa thích"
+
+#: ..lib/personal.php:
+msgid "%s's favorite notices"
+msgstr "Những tin nhắn ưa thích của %s"
+
+#: ..lib/personal.php:
+msgid "Inbox"
+msgstr "Hộp thư đến"
+
+#: ..lib/personal.php:
+msgid "Your incoming messages"
+msgstr "Thư đến của bạn"
+
+#: ..lib/personal.php:
+msgid "Outbox"
+msgstr "Há»™p thÆ° Ä‘i"
+
+#: ..lib/personal.php:
+msgid "Your sent messages"
+msgstr "Thư bạn đã gửi"
+
+#: ..actions/inbox.php:
+msgid "Inbox for %s - page %d"
+msgstr "Hộp thư đến của %s - trang %d"
+
+#: ..actions/inbox.php:
+msgid "Inbox for %s"
+msgstr "Hộp thư đến của %s"
+
+#: ..actions/inbox.php:
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr "�ây là hộp thư đến của bạn, bao gồm các tin nhắn gửi đến riêng cho bạn"
+
+#: ..actions/outbox.php:
+msgid "Outbox for %s - page %d"
+msgstr "Hộp thư gửi đi của %s - trang %d"
+
+#: ..actions/outbox.php:
+msgid "Outbox for %s"
+msgstr "Hộp thư đi của %s"
+
+#: ..actions/outbox.php:
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+"Hộp thư gửi đi của bạn, bao gồm danh sách các tin nhắn gửi "
+"trực tiếp mà bạn đã gửi."
+
+#: ..actions/showfavorites.php:
+msgid "%s favorite notices"
+msgstr "%s ưa thích các tin nhắn"
+
+#: ..actions/showfavorites.php:
+msgid "Feed for favorites of %s"
+msgstr "Tìm kiếm các tin nhắn ưa thích của %s"
+
+#: ..actions/showfavorites.php:
+msgid "Could not retrieve favorite notices."
+msgstr "Không thể lấy lại các tin nhắn ưa thích"
+
+#: ..actions/favor.php:
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa."
+
+#: ..actions/favor.php:
+msgid "Could not create favorite."
+msgstr "Không thể tạo favorite."
+
+#: ..actions/favor.php:
+msgid "Disfavor"
+msgstr "Không thích"
+
+#: ..actions/favor.php:
+msgid "This notice is already a favorite!"
+msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!"
+
+#: ..actions/inbox.php:
+msgid "%s added your notice as a favorite"
+msgstr "%s da them tin nhan cua ban vao danh sach tin nhan ua thich"
+
+#: ..actions/inbox.php:
+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 vừa thêm tin nhắn của bạn trên %2$s vào danh sách tin "
+"nhắn ưa thích của mình.\n"
+"\n"
+"Bạn có thể xem lại nội dung tin nhắn của bạn tại "
+"đây:\n"
+"\n"
+"%3$s\n"
+"\n"
+"Bạn có thể xem danh sách tin nhắn ưa thích của %1$s tại đây: \n\n%4$s\n\nChúc sức kh�e,\n%5$s\n"
+
+#: ../actions/twitapiaccount.php:49
+#: ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88
+#: ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370
+#: ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122
+msgid "API method not found!"
+msgstr "Phương thức API không tìm thấy!"
+
+#: ../actions/twitapiaccount.php:57
+#: ../actions/twitapiaccount.php:113
+#: ../actions/twitapiaccount.php:119
+#: ../actions/twitapiblocks.php:28
+#: ../actions/twitapiblocks.php:34
+#: ../actions/twitapidirect_messages.php:43
+#: ../actions/twitapidirect_messages.php:49
+#: ../actions/twitapidirect_messages.php:56
+#: ../actions/twitapidirect_messages.php:62
+#: ../actions/twitapifavorites.php:41
+#: ../actions/twitapifavorites.php:47
+#: ../actions/twitapifavorites.php:53
+#: ../actions/twitapihelp.php:52
+#: ../actions/twitapinotifications.php:29
+#: ../actions/twitapinotifications.php:35
+#: ../actions/twitapistatuses.php:768
+msgid "API method under construction."
+msgstr "Phương thức API dưới cấu trúc có sẵn."
+
+#: ../actions/register.php:176
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+"1-64 chữ cái thư�ng hoặc là chữ số, không có dấu chấm hay "
+"khoảng trắng. Bắt buộc."
+
+#: ../lib/Mailbox.php
+msgid "Direct Messages"
+msgstr "Tin nhắn riêng"
+
+#: ../.php
+msgid "Notices sent"
+msgstr "Tin đã gửi"
+
+#: ../action/deletenotice.php
+msgid "Delete notice"
+msgstr "Xóa tin nhắn"
+
+#: ../action/deletenotice.php
+msgid ""
+"You are about to permanently delete a notice.  Once this is done, it cannot "
+"be undone."
+msgstr "Bạn muốn xóa tin nhắn này? Sau khi xóa, bạn không thể lấy lại được."
+
+#: ../action/deletenotice.php
+msgid "No"
+msgstr "Không"
+
+#: ../action/deletenotice.php
+msgid "Yes"
+msgstr "Có"
+
+#: ../action/deletenotice.php
+msgid "Are you sure you want to delete this notice?"
+msgstr "Bạn có chắc chắn là muốn xóa tin nhắn này không?"
+
+#: ..//.php
+msgid "Flagged notices"
+msgstr "Các tin nhắn bị cảnh báo"
+
+#: ..//.php
+msgid "flag this notice"
+msgstr "cảnh báo tin nhắn"
+
+#: ..//.php
+msgid "Flag a notice"
+msgstr "Cảnh báo tin nhắn"
+
+#: ..//.php
+msgid "Flag this notice?"
+msgstr "Bạn muốn cảnh báo tin nhắn này?"
+
+#: ..//.php
+msgid ""
+"If you think this notice is an offensive message, please notify to the "
+"administrator. Thank you."
+msgstr ""
+"Nếu bạn nghĩ tin nhắn này có nội dung xấu không chấp nhận "
+"được, hãy báo cho ban quản trị web site. Cảm ơn rất nhi�u."
+
+#. ./lib/util.php
+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 ""
+"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)."
+
+msgid ""
+"To use this [Saigonica version](%%doc.source%%), you must write the license "
+"is of Laconica and has contributions from Saigonica."
+msgstr ""
+"�ể sử dụng [phiên bản Saigonica](%%doc.source%%) này, cần ghi "
+"rõ bản quy�n của Laconia cộng thêm sự đóng góp của Saigonica."
+
+#. ./.php
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+"Gửi email thông báo tôi khi có ai đó lưu tin nhắn của tôi vào "
+"danh sách ưa thích của h�."
+
+#. ./.php
+msgid "Send me email when someone sends me a private message."
+msgstr "Gửi email báo cho tôi biết khi có ai đó gửi tin nhắn riêng cho tôi."
+
+#. ./.php
+msgid "Current verified Twitter account."
+msgstr "Tài khoản Twitter đã được xác nhận."
+
+#. ./.php
+msgid "Subscribe to my Twitter friends here."
+msgstr "�ăng ký theo những bạn trên Twitter tại đây."
+
+#. ./.php
+msgid "Twitter Account"
+msgstr "Tài khoản Twitter"
+
+#. ./.php
+msgid "Twitter settings"
+msgstr "Thiết lập tài khoản Twitter"
+
+#. ./.php
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, and "
+"subscribe to Twitter friends already here."
+msgstr ""
+"Hãy đăng ký tài khoản Twitter của bạn để có thể gửi tin "
+"nhắn đến Twitter, bạn cũng có thể  đăng ký theo các bạn của mình trên Twitter tại đây."
+
+#. ./.php
+msgid "No spaces, please."
+msgstr "Không nhập ký tự trắng."
+
+#. ./.php
+msgid "Twitter Password"
+msgstr "Mật khẩu Twitter"
+
+#. ./.php
+msgid "That is not your Twitter account."
+msgstr "Không phải là tài khoản Twitter của bạn."
+
+#. ./.php
+msgid "Couldn't remove Twitter user."
+msgstr "Không thể xóa tài khoản Twitter."
+
+#. ./.php
+msgid "Twitter account removed."
+msgstr "Tài khoản Twitter đã xóa."
+
+#. ./.php
+msgid "Couldn't save Twitter preferences."
+msgstr "Không thể lưu các yêu cầu cho tài khoản Twitter. "
+
+#. ./.php
+msgid "Twitter preferences saved."
+msgstr "Các yêu cầu cho tài khoản Twitter đã lưu"
+
+#. ./.php
+msgid "Twitter Username"
+msgstr "Tên tài khoản Twitter"
+
+#. ./.php
+msgid "Could not verify your Twitter credentials!"
+msgstr "Không thể xác nhận tài khoản Twitter của bạn!"
+
+#. ./.php
+msgid "Unable to retrieve account information for '%s' from Twitter."
+msgstr "Không thể lấy thông tin tài khoản của '%s' từ Twitter."
+
+#. ./.php
+msgid "Unable to save your Twitter settings!"
+msgstr "Không thể lưu thông tin Twitter của bạn!"
+
+#. ./.php
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_)."
+msgstr ""
+"Tên tài khoản phải là các chữ số, chữ cái thư�ng hoặc "
+"viết hoa, hoặc là dấu gạch dưới (_)."
+
+msgid "Automatically send my notices to Twitter."
+msgstr "Tự động gửi tin nhắn của tôi đến Twitter."
+
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+"Gửi những tin nhắn trả l�i của tôi từ những ngư�i mà "
+"tôi không theo qua Jabber/GTalk."
+
+msgid "New email address for posting to %s"
+msgstr "Dia chi email moi de gui tin nhan den %s"
+
+msgid "Registration successful"
+msgstr "�ăng ký thành công"
+
+msgid ""
+"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."
+msgstr ""
+"Chúc mừng, %s! Chào mừng bạn đến với  %%%%site.name%%%%. Bây "
+"gi� bạn có thể...\n"
+"\n"
+"* Vào trang [Hồ sơ cá nhân](%s) của bạn và gửi tin nhắn "
+"đầu tiên. \n"
+"* Thêm [địa chỉ Jabber/GTalk](%%%%action.imsettings%%%%) để có "
+"thể gửi tin nhắn nhanh.\n"
+"* [Tìm kiếm ngư�i quen](%%%%action.peoplesearch%%%%) mà bạn nghĩ "
+"là có thể chia sẻ ni�m vui.\n"
+"* ��c xuyên suốt [hướng dẫn](%%%%doc.help%%%%) để hiểu thêm "
+"v� dịch vụ của chúng tôi.\n\nCảm ơn bạn đã đăng ký để là thành viên và rất mong bạn sẽ thích dịch vụ này."
+
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+"(Bạn sẽ nhận email thông báo, hãy đ�c hướng dẫn để xác "
+"nhận địa chỉ email của bạn.)"
+
+msgid "6 or more characters. Required."
+msgstr "Nhi�u hơn 6 ký tự. Bắt buộc"
+
+msgid "Same as password above. Required."
+msgstr "Cùng mật khẩu ở trên. Bắt buộc."
+
+msgid "Email Settings"
+msgstr "Thiết lập địa chỉ email"
+
+msgid "Change theme"
+msgstr "�ổi theme"
+
+msgid "Customize theme"
+msgstr "Tùy chỉnh theme"
+
+msgid ""
+"You can change the theme as you want by choosing a thumbnail and then click "
+"Save button to active new theme."
+msgstr ""
+"Bạn có thể thay đổi theme bằng cách ch�n một hình mẫu "
+"của các theme rồi nhấn nút \"Lưu\" để đổi theme. "
+
+msgid ""
+"Hey, %1$s .\n"
+"\n"
+"Someone just entered this email address on %2$s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below: \n"
+"\n"
+"\t%3$s\n"
+"\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time,\n"
+"\n"
+"%4$s\n"
+"\n"
+msgstr ""
+"Chào, %1$s .\n"
+"\n"
+"Không biết có phải bạn là ngư�i vừa nhập địa chỉ email "
+"này trên %2$s.\n"
+"\n"
+"Nếu bạn là ngư�i nhập, và bạn muốn xác nhận lại, hãy "
+"nhấn chuột vào đư�ng dẫn dưới đây: \n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Nếu không phải bạn, hãy b� qua tin nhắn này.\n\nCảm ơn bạn đã b� th�i gian để đ�c thư,\n\n%4$s\n\n"
+
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+"Bạn có địa chỉ mới để gửi tin nhắn trên %1$s.\n"
+"\n"
+"Hãy gửi email đến %2$s để  có thể nhắn tin.\n"
+"\n"
+"Bạn có thể đ�c hướng dẫn tại %3$s.\n\nChúc sức kh�e,\n%4$s"
+
+msgid "SMS confirmation"
+msgstr "Xác nhận SMS"
+
+msgid ""
+"%1$s: confirm you own this phone number with this code:\n"
+"\n"
+"%2$s\n"
+"\n"
+msgstr "%1$s: Hãy xác nhận bạn là chủ nhân số điện thoại :\n\n%2$s\n\n"
+
+msgid "New private message from %s"
+msgstr "Bạn có tin nhắn riêng từ %s"
+
+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 ""
+"%1$s (%2$s) đã gửi đến bạn tin nhắn riêng:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"Bạn có thể trả l�i tại:\n"
+"\n"
+"%4$s\n"
+"\n"
+"�ừng trả l�i lại thư này; sẽ không có ai nhận thư.\n\nChúc sức kh�e,\n%5$s\n"
+
+msgid "Terms of use"
+msgstr "TTSD"
+
+msgid " Terms of use"
+msgstr "Th�a thuận sử dụng"
+
+msgid "Termsofuse"
+msgstr "Th�a thuận sử dụng"
+
+msgid "Click here to view emotion icon"
+msgstr "Nhấn chuột vào đây để ch�n biểu tượng cảm xúc"
+
+msgid "Import from Web Address Book"
+msgstr "Nhập địa chỉ từ Yahoo hoặc Gmail"
+
+msgid "Incorrect email address or password."
+msgstr "�ịa chỉ email hoặc mật khẩu không đúng."
+
+msgid "Select All/None"
+msgstr "Ch�n tất cả/Không ch�n"
+
+msgid "Contacts not found."
+msgstr "Không tìm thấy kết nối."
+
+msgid ""
+"Please input your yahoo or gmail account. List of contacts will be loaded "
+"from your address book.\n"
+"\n"
+"Don't worry, we won't save your password and you'll get a chance to choose "
+"which friends to invite."
+msgstr ""
+"Hãy nhập tài khoản yahoo hoặc tài khoản gmail của bạn. Danh "
+"sách bạn bè, ngư�i thân sẽ được lấy từ sổ địa chỉ "
+"của bạn.\n"
+"\n"
+"�ừng lo, chúng tôi sẽ không lưu password của bạn và bạn sẽ có danh sách những ngư�i bạn để m�i."
+
+msgid "Import Address Book"
+msgstr "Thêm vào danh sách địa chỉ"
+
+msgid "Import Contacts Address Book from Yahoo, Gmail"
+msgstr "Nhập sổ địa chỉ liên lạc từ Yahoo, Gmail"
+
+msgid "Your email address"
+msgstr "�ịa chỉ email của bạn"
+
+msgid "Import Web Address Book from"
+msgstr "Nhập sổ địa chỉ web từ"
+
+msgid ""
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+msgstr ""
+"%2$s là một dịch vụ gửi tin nhắn mà nó cho phép bạn giữ "
+"liên lạc, cập nhật thông tin với bạn bè, ngư�i thân và "
+"những ngư�i quan tâm đến bạn.\n"
+"\n"
+"Ban cũng có thể chia sẻ thông tin v� bản thân, những suy "
+"nghĩ, cuộc sống của bạn với những ngư�i biết bạn. Là "
+"một công cụ hữu hiệu cho việc gặp gỡ ngư�i mới, những ngư�i có cùng sở thích với bạn.\n\n"
+
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+"%1$s đã m�i bạn tham gia vào %2$s (%3$s).\n"
+"\n"
+"%1$s đã nói:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Bạn có thể thấy trang hồ sơ của %1$s trên %2$s ở đây:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Nếu bạn muốn thử dịch vụ này, hãy bấm vào đư�ng liên "
+"kết bên dưới để chấp nhận l�i m�i.\n"
+"\n"
+"%6$s\n"
+"\n"
+"Nếu không, bạn có thể b� qua tin nhắn này. Cảm ơn sự kiên nhẫn và th�i gian của bạn dành cho chúng tôi.\n\nXin chân thành cảm ơn, %2$s\n"
+
+msgid ""
+"Hi, I recently created an account at %1$s and want to share it with "
+"you.\n"
+"\n"
+"%1$s is a free, micro-blogging service, which combines the best of blog and "
+"chat. You can use it to write short notices (less than 140 characters) about "
+"your daily life: where you are, what you are doing, and how you are "
+"feeling.\n"
+"\n"
+"It is a tool that allows you to communicate, share, and stay in touch with "
+"friends and to follow other people that interest you through the exchange of "
+"short frequent messages (micro-blogging).\n"
+"\n"
+msgstr ""
+"Chào bạn, mình đã tạo tài khoản trên %1$s và muốn giới "
+"thiệu cho bạn cùng biết v� dịch vụ này.\n"
+"\n"
+"%1$s là dịch vụ gửi tin nhắn ngắn miễn phí, một sự kết "
+"hợp tuyệt v�i giữa blog và chat. Bạn có thể viết tin nhắn "
+"khoảng 140 kí tự v� đ�i sống thư�ng nhật của bạn như: "
+"bạn ở đâu, bạn đang làm gì, và bạn cảm thấy thế "
+"nào.\n"
+"\n"
+"�ây là công cụ để bạn giao tiếp, chia sẻ, kết nối với bạn bè và theo những ngư�i có cùng sở thích với bạn bằng cách gửi cho nhau những tin nhắn ngắn.\n\n"
+
+msgid "Copy and paste the embed code to your website or blog"
+msgstr "Copy và dán mã trên vào website hay blog của bạn"
+
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr ""
+"Vì lý do bảo mật, bạn hãy nhập lại tên đăng nhập và mật "
+"khẩu trước khi thay đổi trong đi�u chỉnh."
+
+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 ""
+"Mã xác nhận đã được gửi tới địa chỉ email của bạn. "
+"Hãy kiểm tra hộp thư và làm theo hướng dẫn."
+
+msgid ""
+"Hey, %1$s\n"
+"\n"
+"Someone just asked for a new password for this account on %2$s.\n"
+"\n"
+"If it was you, and you want to confirm, use the URL below:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%1$s\n"
+msgstr ""
+"Xin chào, %1$s\n"
+"\n"
+"Không biết có phải bạn là ngư�i yêu cầu mật khẩu mới "
+"cho tài khoản này trên %2$s.\n"
+"\n"
+"Nếu chính là bạn và nếu bạn muốn xác nhận, hãy nhấn "
+"chuột vào đư�ng dẫn dưới đây:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Nếu không phải bạn, hãy b� qua tin nhắn này.\n\nCảm ơn bạn đã b� th�i gian để đ�c thư, \n%1$s\n"
+
+msgid "Create a group"
+msgstr "Tạo nhóm"
+
+msgid "No such message."
+msgstr "Không có tin nhắn nào."
+
+msgid "Only the sender and recipient may read this message"
+msgstr "Chỉ có ngư�i gửi hoặc ngư�i nhận mới có thể xem tin nhắn này"
+
+msgid "Are you sure you want to delete this message?"
+msgstr "Bạn có chắc chắn là muốn xóa tin nhắn này không?"
+
+msgid ""
+"You are about to permanently delete a message.  Once this is done, it cannot "
+"be undone."
+msgstr "Bạn muốn xóa tin nhắn này? Sau khi xóa, bạn không thể lấy lại được."
+
+msgid "Can't delete this message."
+msgstr "Không thể xóa tin nhắn này."
+
+msgid "Can't delete this notice."
+msgstr "Không thể xóa tin nhắn này."
+
+msgid "%s and group"
+msgstr "%s và nhóm"
+
+msgid "My Groups"
+msgstr "Nhóm"
+
+msgid "Group Profile"
+msgstr "Thông tin nhóm"
+
+msgid "Timeline"
+msgstr "Dòng tin"
+
+msgid "%s's timeline"
+msgstr "Dòng tin nhắn của %s"
+
+msgid "Share a thought? Vas-y, ton tour..."
+msgstr "Muốn chia sẽ ý nghĩ của bạn?"
+
+msgid "Group Members"
+msgstr "Thành viên"
+
+msgid "Group name"
+msgstr "Tên nhóm"
+
+msgid "Create date"
+msgstr "Ngày thành lập"
+
+msgid "Member count"
+msgstr "Số thành viên"
+
+msgid ""
+"By clicking on 'I accept' above, you confirm that you are over 13 years of "
+"age and accept the Terms of Service"
+msgstr ""
+"Nhấn vào 'Tôi đồng ý' ở trên để xác nhận là bạn trên 13 "
+"tuổi và chấp nhận những đi�u khoản của dịch vụ"
+
+msgid "I accept"
+msgstr "Tôi đồng ý"
+
+msgid "Group code invalid."
+msgstr "Mã số của nhóm không đúng."
+
+msgid "Register a Group"
+msgstr "�ăng ký nhóm"
+
+msgid "Group code"
+msgstr "Mã nhóm"
+
+msgid "Only people who know this code can join the group. Required."
+msgstr "Chỉ những ai biết mã này mới có thể gia nhập nhóm. Bắt buộc."
+
+msgid "Enter the code if you want to join this group"
+msgstr "Nhập vào mã của nhóm nếu bạn muốn tham gia."
+
+msgid "Manage"
+msgstr "Quản lý"
+
+msgid "You have no authentication to access this page."
+msgstr "Bạn không có quy�n truy cập trang này."
+
+msgid "Check the flagged notice and then delete or ignore it."
+msgstr ""
+"Kiểm tra lại tin bị cảnh báo, sau đó bạn hãy quyết định "
+"xóa tin đó hoặc xác nhận nó là hợp lệ."
+
+msgid "Flagged"
+msgstr "Kiểm tin"
+
+msgid "Description"
+msgstr "Mô tả"
+
+msgid "Short description of the group"
+msgstr "Mô tả ngắn g�n v� nhóm"
+
+msgid "Group"
+msgstr "Nhóm"
+
+msgid "Check notice flagged by user"
+msgstr "Kiểm tra các tin nhắn do ngư�i dùng cảnh báo"
+
+msgid "is more fun with friends."
+msgstr "vui hơn với bạn bè"
+
+msgid "Invite your friends"
+msgstr "M�i bạn bè"
+
+msgid "Hide recommendations"
+msgstr "Tắt"
+
+msgid ""
+"Sorry, but you need to activate your account first. We sent the activation "
+"email, so please check your email for details. Don't forget to look in your "
+"spam folder as well."
+msgstr ""
+"Xin lỗi, bạn cần phải kích hoạt tài khoản của bạn "
+"trước. Chúng tôi đã gửi email tới bạn, vì vậy hãy mở "
+"hộp mail để xem hướng dẫn chi tiết. �ừng quên tìm cả trong spam."
+
+msgid "Current confirmed email address."
+msgstr "�ã xác nhận địa chỉ này."
+
+msgid "Chat vs T8M"
+msgstr "Chat và T8M"
+
+msgid "Prev"
+msgstr "TrÆ°á»›c"
+
+msgid "Next"
+msgstr "Kế"
+
+#: ../actions/profilesettings.php:54
+msgid "Describe yourself and your interests in 140 chars"
+msgstr "Nói v� bạn và những sở thích của bạn khoảng 140 ký tự"
+
+#: ../actions/profilesettings.php:57
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "Bạn ở đâu, \"Thành phố, Tỉnh thành, Quốc gia\""
+
+msgid "Members"
+msgstr "Thành viên"
+
+msgid "Subscribe "
+msgstr "Theo nhóm này"
+
+msgid "Group View"
+msgstr "Xem theo nhóm"
+
+msgid "Linear View"
+msgstr "Xem tuần tự"
+
+msgid " and friends"
+msgstr " và bạn bè"
+
+msgid "Channels"
+msgstr "Kênh"
+
+msgid "Channel already exist. Try another one."
+msgstr "Kênh này đã có rồi. Hãy ch�n tên khác."
+
+msgid "Can't save this chanel"
+msgstr "Lỗi khi lưu kênh"
+
+msgid "You can create a new channel here."
+msgstr "Bạn có thể tạo kênh tại đây."
+
+msgid "Create Channel"
+msgstr "Tạo Kênh"
+
+msgid "Channel name"
+msgstr "Tên kênh"
+
+msgid "Name of channel. Required."
+msgstr "Tên kênh. Bắt buộc"
+
+msgid "Channel saved successfully"
+msgstr "Tạo kênh thành công."
+
+msgid " You have just created channel %s successfuly."
+msgstr "Bạn vừa tạo thành công kênh %s."
+
+msgid "Channel"
+msgstr "Kênh"
+
+msgid "No such chanel."
+msgstr "Không tìm thấy kênh nào."
+
+msgid "Channels View"
+msgstr "Hệ thống các  kênh"
+
+msgid "Create a channel"
+msgstr "Tạo kênh"
+
+msgid "Register user by channel"
+msgstr "�ăng ký theo kênh"
+
+msgid "The channel this user in"
+msgstr "Kênh mà bạn tham gia"
+
+msgid " Subscribe"
+msgstr "Theo kênh này"
+
+msgid "Your incoming and sent messages"
+msgstr "Hộp thư của bạn"
+
+msgid "Send me all replies through Yahoo Messenger."
+msgstr "Hãy gửi tin nhắn đến tôi qua Yahoo Messenger"
+
+msgid "Yahoo Messenger Settings"
+msgstr "Thiết lập địa chỉ Yahoo"
+
+msgid ""
+"You can send and receive notices through Yahoo Messenger [instant "
+"messages](%%doc.im%%). Configure your yahoo address and settings below."
+msgstr ""
+"Bạn có thể gửi và nhận những tin nhắn qua Yahoo Messenger [tin "
+"nhắn nhanh](%%doc.im%%). Hãy định dạng địa chỉ của bạn và các thiết lập sau."
+
+msgid ""
+"Awaiting confirmation on this address. Check your Yahoo inbox (and spam "
+"box!) for a message with further instructions."
+msgstr ""
+"�ang đợi xác nhận đến địa chỉ này. Hãy kiểm tra hộp "
+"thư đến(và thư rác) để nhận tin nhắn và l�i hướng dẫn. "
+
+msgid "Yahoo Address"
+msgstr "�ịa chỉ email Yahoo"
+
+msgid "Yahoo address, like \"UserName@yahoo.com\""
+msgstr "�ịa chỉ email Yahoo, Ví dụ: \"UserName@yahoo.com\""
+
+msgid "That yahoo address already belongs to another user."
+msgstr "�ịa chỉ email Yahoo này đã có ngư�i khác sử dụng rồi."
+
+msgid "That is already your yahoo address."
+msgstr "Bạn đã dùng địa chỉ email này rồi"
+
+msgid "Cannot normalize that Yahoo address"
+msgstr "Không thể bình thư�ng hóa địa chỉ Yahoo này"
+
+msgid "No yahoo address."
+msgstr "Chưa nhập địa chỉ email Yahoo"
+
+msgid ""
+"A confirmation code was sent to the yahoo email address you added. Check "
+"your inbox (and spam box!) for the code and instructions on how to use "
+"it."
+msgstr ""
+"Mã xác nhận đã được gửi đến địa chỉ email Yahoo của "
+"bạn. Hãy kiểm tra hộp thư đến (và thư rác) và làm theo hướng dẫn trong thư."
+
+msgid "says"
+msgstr "nói"
+
+msgid "Your message is posted successful."
+msgstr "Tin nhắn đã gửi đi"
+
+msgid "To use this service, You must register your YM with Saigonica."
+msgstr "�ể được sử dụng dịch vụ này, bạn phải đăng ký YM trên Saigonica"
+
+msgid "To use this service, You must register your Gtalk with Saigonica."
+msgstr "�ể được sử dụng dịch vụ này, bạn phải đăng ký GTalk trên Saigonica"
+
+msgid "Send me all replies through Jabber/GTalk."
+msgstr "Hãy gửi tin nhắn đến tôi qua Jabber/GTalk."
+
+msgid "GTalk Settings"
+msgstr "Thiết lập địa chỉ GTalk"
+
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant "
+"messages](%%doc.im%%). Configure your yahoo address and settings below."
+msgstr ""
+"Bạn có thể gửi và nhận những tin nhắn qua Jabber/GTalk [tin "
+"nhắn nhanh](%%doc.im%%). Hãy định dạng địa chỉ của bạn và các thiết lập sau."
+
+msgid ""
+"Awaiting confirmation on this address. Check your GTalk inbox (and spam "
+"box!) for a message with further instructions."
+msgstr ""
+"�ang đợi xác nhận đến địa chỉ này. Hãy kiểm tra hộp "
+"thư đến(và thư rác) để nhận tin nhắn và l�i hướng dẫn. "
+
+msgid "GTalk Address"
+msgstr "�ịa chỉ email GTalk"
+
+msgid "GTalk address, like \"UserName@gmail.com\""
+msgstr "�ịa chỉ email GTalk, Ví dụ: \"UserName@gmail.com\""
+
+msgid "That GTalk address already belongs to another user."
+msgstr "�ịa chỉ email GTalk này đã có ngư�i khác sử dụng rồi."
+
+msgid "That is already your GTalk address."
+msgstr "Bạn đã dùng địa chỉ email này rồi"
+
+msgid "Cannot normalize that GTalk address"
+msgstr "Không thể bình thư�ng hóa địa chỉ GTalk này"
+
+msgid "No GTalk address."
+msgstr "Chưa nhập địa chỉ email GTalk"
+
+msgid ""
+"A confirmation code was sent to the GTalk email address you added. Check "
+"your inbox (and spam box!) for the code and instructions on how to use "
+"it."
+msgstr ""
+"Mã xác nhận đã được gửi đến địa chỉ email GTalk của "
+"bạn. Hãy kiểm tra hộp thư đến (và thư rác) và làm theo hướng dẫn trong thư."
+
+msgid "Check virus"
+msgstr "Kiểm tra virus"
+
+msgid "Error"
+msgstr "Lá»—i"
+
+msgid "Avatar "
+msgstr "Hình"
+
+msgid "Avatar settings"
+msgstr "Thay đổi hình đại diện"
+
+msgid "No avatar is selected."
+msgstr "Bạn chưa ch�n hình để đưa lên."
+
+msgid "Change your avatar"
+msgstr "Thay đổi hình đại diện của bạn"
+
+msgid "Updates by Yahoo Messenger (YM)"
+msgstr "Cập nhật địa chỉ Yahoo để gửi tin qua Yahoo Mesenger(YM)"
+
+msgid "Twitter integration options"
+msgstr "Các lựa ch�n để tích hợp với Twitter "
+
+msgid "Ban from network"
+msgstr "Ban user ra kh�i mạng"
+
+msgid "Ban users violate rules of saigonica"
+msgstr "Ban user vi phạm nội quy của saigonica"
+
+msgid "Ban user"
+msgstr "Ban user"
+
+msgid "Are you sure to ban this user?"
+msgstr "Bạn có chắc muốn ban ngư�i này không?"
+
+msgid "Your account was banned."
+msgstr "Tài khoản của bạn đã bị ban."
+
+msgid "User has been baned."
+msgstr "User đã bị ban."
diff --git a/locale/zh_CN/LC_MESSAGES/laconica.po b/locale/zh_CN/LC_MESSAGES/laconica.po
new file mode 100644
index 000000000..df5b877a8
--- /dev/null
+++ b/locale/zh_CN/LC_MESSAGES/laconica.po
@@ -0,0 +1,3026 @@
+# Messages of identi.ca
+# Copyright (C) 2008 Gouki <gouki@goukihq.org>
+# This file is distributed under the same license as the identi.ca package.
+# Gouki <gouki@goukihq.org>, 2008
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: identi.ca\n"
+"Report-Msgid-Bugs-To: gouki@goukihq.org\n"
+"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"PO-Revision-Date: 2008-12-16 21:31+0800\n"
+"Last-Translator: Yuan Yijun <bbbush.yuan@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"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#, php-format
+msgid " Search Stream for \"%s\""
+msgstr "�索有关\"%s\"的��"
+
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
+#: actions/finishopenidlogin.php:88 actions/register.php:205
+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 " 从 "
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr "%1$s / 回� %2$s 的消�"
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s 邀请您加入 %2$s"
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+"%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为您效力的 %2$s\n"
+
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126
+#, php-format
+msgid "%1$s is now listening to your notices on %2$s."
+msgstr "%1$s 开始关注您的 %2$s 信�。"
+
+#: ../lib/mail.php:126
+#, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s.\n"
+msgstr ""
+"%1$s 开始关注您的 %2$s 信�。\n"
+"\n"
+"\t%3$s\n\n为您效力的 %4$s\n"
+
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr "回� %2$s / %3$s 的 %1$s 更新。"
+
+#: ../actions/shownotice.php:45 actions/shownotice.php:45
+#, php-format
+msgid "%1$s's status on %2$s"
+msgstr "%1$s 的 %2$s 状�"
+
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../actions/publicrss.php:62 actions/publicrss.php:48
+#, php-format
+msgid "%s Public Stream"
+msgstr "%s 公开��"
+
+#: ../actions/all.php:47 ../actions/allrss.php:60
+#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51 actions/all.php:47
+#: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
+#, php-format
+msgid "%s and friends"
+msgstr "%s �好�"
+
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#, php-format
+msgid "%s public timeline"
+msgstr "%s 公众时间表"
+
+#: ../lib/mail.php:206 lib/mail.php:212
+#, php-format
+msgid "%s status"
+msgstr "%s 状�"
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#, php-format
+msgid "%s timeline"
+msgstr "%s 时间表"
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#, php-format
+msgid "%s updates from everyone!"
+msgstr "�自所有人的 %s 消��"
+
+#: ../actions/register.php:213
+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
+#, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by "
+"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+msgstr ""
+"**%%site.name%%** 是一个微�客�务，�供者为 "
+"[%%site.broughtby%%](%%site.broughtbyurl%%)。"
+
+#: ../lib/util.php:259 lib/util.php:275
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** 是一个微�客�务。"
+
+#: ../lib/util.php:274 lib/util.php:290
+msgid ". Contributors should be attributed by full name or nickname."
+msgstr "。贡献者应当有全�或昵称。"
+
+#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
+#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+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 个�写字�或数字，�包�标点�空白。此项必填。"
+
+#: ../actions/password.php:42 actions/profilesettings.php:181
+msgid "6 or more characters"
+msgstr "6 个或更多字符"
+
+#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
+msgid "6 or more characters, and don't forget it!"
+msgstr "6 个或更多字符，�能忘记�"
+
+#: ../actions/register.php:154 actions/register.php:168
+msgid "6 or more characters. Required."
+msgstr "6 个或更多字符。此项必填。"
+
+#: ../actions/imsettings.php:197 actions/imsettings.php:205
+#, php-format
+msgid ""
+"A confirmation code was sent to the IM address you added. You must approve "
+"%s for sending messages to you."
+msgstr "验��已被��到您新增的�时通讯��。您必须�许 %s �您��信�。"
+
+#: ../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 "验��已被��到您新增的电�邮件。请检查收件箱(和垃圾箱)，找到验��并按�求使用它。"
+
+#: ../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 "验��已被��到您新增的电���。请检查收件箱(和垃圾箱)，找到验��并按�求使用它。"
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55
+msgid "API method not found!"
+msgstr "API 方法未实现�"
+
+#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
+#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
+#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
+#: ../actions/twitapidirect_messages.php:49
+#: ../actions/twitapidirect_messages.php:56
+#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
+#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
+#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
+#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
+#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
+#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
+#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
+#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
+#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
+#: actions/twitapistatuses.php:690
+msgid "API method under construction."
+msgstr "API 方法尚未实现。"
+
+#: ../lib/util.php:324 lib/util.php:340
+msgid "About"
+msgstr "关于"
+
+#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
+msgid "Accept"
+msgstr "接�"
+
+#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
+#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
+#: actions/emailsettings.php:63 actions/imsettings.php:64
+#: actions/openidsettings.php:58 actions/smssettings.php:71
+#: actions/twittersettings.php:85
+msgid "Add"
+msgstr "添加"
+
+#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
+msgid "Add OpenID"
+msgstr "添加 OpenID"
+
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+msgid "Add or remove OpenIDs"
+msgstr "添加或移除 OpenID"
+
+#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
+#: ../actions/smssettings.php:39 actions/emailsettings.php:39
+#: actions/imsettings.php:40 actions/smssettings.php:39
+msgid "Address"
+msgstr "地�"
+
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr "�邀请的好�地�(�行一个)"
+
+#: ../actions/showstream.php:273 actions/showstream.php:288
+msgid "All subscriptions"
+msgstr "所有订阅"
+
+#: ../actions/publicrss.php:64 actions/publicrss.php:50
+#, php-format
+msgid "All updates for %s"
+msgstr "所有 %s 消�"
+
+#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#, php-format
+msgid "All updates matching search term \"%s\""
+msgstr "所有匹��索�件\"%s\"的消�"
+
+#: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
+#: ../actions/openidlogin.php:29 ../actions/register.php:30
+#: actions/finishopenidlogin.php:29 actions/login.php:31
+#: actions/openidlogin.php:29 actions/register.php:30
+msgid "Already logged in."
+msgstr "已登录。"
+
+#: ../lib/subs.php:42 lib/subs.php:42
+msgid "Already subscribed!."
+msgstr "已订阅�"
+
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr "确定�删除这�通告�？"
+
+#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
+msgid "Authorize subscription"
+msgstr "确认订阅"
+
+#: ../actions/login.php:104 ../actions/register.php:178
+#: actions/register.php:192
+msgid "Automatically login in the future; not for shared computers!"
+msgstr "��这�机器上的登录状�。��在共用的机器上��登录�"
+
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for "
+"non-humans)"
+msgstr "自动订阅任何订阅我的更新的人(这个选项最适�机器人)"
+
+#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
+#: actions/profilesettings.php:34
+msgid "Avatar"
+msgstr "头�"
+
+#: ../actions/avatar.php:113 actions/profilesettings.php:350
+msgid "Avatar updated."
+msgstr "头�已更新。"
+
+#: ../actions/imsettings.php:55 actions/imsettings.php:56
+#, php-format
+msgid ""
+"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
+"message with further instructions. (Did you add %s to your buddy list?)"
+msgstr ""
+"ç"
+"­"
+"‰"
+"å"
+"¾…确认此地å�€ã€‚请查看您的Jabber/GTalkå¸�å�·æ˜¯å�¦æ”¶åˆ°äº†ä¿¡æ�¯ï¼Œå…¶ä¸­åŒ…å�«äº†è¿›ä¸€æ­¥çš„指示。(您必须预先将 %s 添加为好å�‹ï¼Œæ‰�能收到确认信æ�¯ï¼�)"
+
+#: ../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 "等待确认此地�。请查看您的收件箱(和垃圾箱)是�收到了邮件，其中包�了进一步的指示。"
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr "等待确认此电���。"
+
+#: ../lib/util.php:1318 lib/util.php:1452
+msgid "Before »"
+msgstr "之� »"
+
+#: ../actions/profilesettings.php:49 ../actions/register.php:170
+#: actions/profilesettings.php:82 actions/register.php:184
+msgid "Bio"
+msgstr "个人�传"
+
+#: ../actions/profilesettings.php:101 ../actions/register.php:82
+#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
+#: actions/register.php:89 actions/updateprofile.php:104
+msgid "Bio is too long (max 140 chars)."
+msgstr "个人�传过长(�能超过140字符)。"
+
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr "无法删除通告。"
+
+#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
+#, php-format
+msgid "Can't read avatar URL '%s'"
+msgstr "无法访问头�URL '%s'"
+
+#: ../actions/password.php:85 ../actions/recoverpassword.php:300
+#: actions/profilesettings.php:404 actions/recoverpassword.php:313
+msgid "Can't save new password."
+msgstr "无法�存新密�。"
+
+#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
+#: ../actions/smssettings.php:62 actions/emailsettings.php:58
+#: actions/imsettings.php:59 actions/smssettings.php:62
+msgid "Cancel"
+msgstr "�消"
+
+#: ../lib/openid.php:121 lib/openid.php:121
+msgid "Cannot instantiate OpenID consumer object."
+msgstr "无法创建 OpenID 用户对象。"
+
+#: ../actions/imsettings.php:163 actions/imsettings.php:171
+msgid "Cannot normalize that Jabber ID"
+msgstr "无法识别此Jabber ID"
+
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+msgid "Cannot normalize that email address"
+msgstr "无法识别此电�邮件"
+
+#: ../actions/password.php:45 actions/profilesettings.php:184
+msgid "Change"
+msgstr "修改"
+
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+msgid "Change email handling"
+msgstr "修改电�邮件"
+
+#: ../actions/password.php:32 actions/profilesettings.php:36
+msgid "Change password"
+msgstr "修改密�"
+
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr "修改密�"
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+msgid "Change your profile settings"
+msgstr "修改您的个人信�"
+
+#: ../actions/password.php:43 ../actions/recoverpassword.php:181
+#: ../actions/register.php:155 ../actions/smssettings.php:65
+#: actions/profilesettings.php:182 actions/recoverpassword.php:187
+#: actions/register.php:169 actions/smssettings.php:65
+msgid "Confirm"
+msgstr "确认"
+
+#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
+msgid "Confirm Address"
+msgstr "确认地�"
+
+#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
+#: ../actions/smssettings.php:245 actions/emailsettings.php:256
+#: actions/imsettings.php:230 actions/smssettings.php:253
+msgid "Confirmation cancelled."
+msgstr "已�消确认。"
+
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr "确认�"
+
+#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
+msgid "Confirmation code not found."
+msgstr "未找到确认�。"
+
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"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."
+msgstr ""
+"�贺您，%s�欢迎�到 "
+"%%%%site.name%%%%。在这里，您�以：\n"
+"\n"
+"* 转到[个人信�](%s)页�，�表第一�消�。\n"
+"* "
+"æ"
+"·"
+"»"
+"å"
+"Š"
+" "
+"ä"
+"¸"
+"€"
+"ä"
+"¸"
+"ª"
+"["
+"J"
+"a"
+"b"
+"b"
+"e"
+"r"
+"/"
+"G"
+"T"
+"a"
+"l"
+"k"
+"å"
+"¸"
+"�"
+"å"
+"�"
+"·"
+"]"
+"("
+"%"
+"%%%action.imsettings%%%%)，以�通过�时通讯程��布消�。\n* "
+"[�索好�](%%%%action.peoplesearch%%%%)�以�到您过去的好�或与您有共�爱好的人。\n* 更新您的[个人信�](%%%%action.profilesettings%%%%)，添加更多内容。\n* 阅读[在线文档](%%%%doc.help%%%%)，了解更多特性。\n\n感谢您注册��，希望您会喜欢这项�务。"
+
+#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
+msgid "Connect"
+msgstr "连接"
+
+#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
+msgid "Connect existing account"
+msgstr "连接现有��"
+
+#: ../lib/util.php:332 lib/util.php:348
+msgid "Contact"
+msgstr "�系人"
+
+#: ../lib/openid.php:178 lib/openid.php:178
+#, php-format
+msgid "Could not create OpenID form: %s"
+msgstr "无法创建 OpenID 表�：%s"
+
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr "无法订阅用户：%s 已在订阅列表中。"
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+msgid "Could not follow user: User not found."
+msgstr "无法订阅用户：未找到。"
+
+#: ../lib/openid.php:160 lib/openid.php:160
+#, php-format
+msgid "Could not redirect to server: %s"
+msgstr "无法�定�到�务器：%s"
+
+#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
+msgid "Could not save avatar info"
+msgstr "无法�存头�"
+
+#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
+msgid "Could not save new profile info"
+msgstr "无法�存个人信�"
+
+#: ../lib/subs.php:54 lib/subs.php:61
+msgid "Could not subscribe other to you."
+msgstr "无法订阅他人更新。"
+
+#: ../lib/subs.php:46 lib/subs.php:46
+msgid "Could not subscribe."
+msgstr "无法订阅。"
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr "无法更新已确认的电�邮件。"
+
+#: ../actions/finishremotesubscribe.php:99
+#: actions/finishremotesubscribe.php:101
+msgid "Couldn't convert request tokens to access tokens."
+msgstr "无法将请求标记转�为访问令牌。"
+
+#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
+#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
+#: actions/confirmaddress.php:84 actions/emailsettings.php:252
+#: actions/imsettings.php:226 actions/smssettings.php:249
+msgid "Couldn't delete email confirmation."
+msgstr "无法删除电�邮件确认。"
+
+#: ../lib/subs.php:103 lib/subs.php:116
+msgid "Couldn't delete subscription."
+msgstr "无法删除订阅。"
+
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+msgid "Couldn't find any statuses."
+msgstr "找�到任何信�。"
+
+#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
+msgid "Couldn't get a request token."
+msgstr "无法获得一份请求标记。"
+
+#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
+#: ../actions/smssettings.php:206 actions/emailsettings.php:223
+#: actions/imsettings.php:195 actions/smssettings.php:214
+msgid "Couldn't insert confirmation code."
+msgstr "无法�入验��。"
+
+#: ../actions/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182
+msgid "Couldn't insert new subscription."
+msgstr "无法添加新的订阅。"
+
+#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
+#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
+msgid "Couldn't save profile."
+msgstr "无法�存个人信�。"
+
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+msgid "Couldn't update user for autosubscribe."
+msgstr "无法更新用户的自动订阅选项。"
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+msgid "Couldn't update user record."
+msgstr "无法更新用户记录。"
+
+#: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
+#: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
+#: ../actions/imsettings.php:243 ../actions/profilesettings.php:141
+#: ../actions/smssettings.php:157 ../actions/smssettings.php:269
+#: actions/confirmaddress.php:72 actions/emailsettings.php:174
+#: actions/emailsettings.php:277 actions/imsettings.php:146
+#: actions/imsettings.php:251 actions/profilesettings.php:256
+#: actions/smssettings.php:165 actions/smssettings.php:277
+msgid "Couldn't update user."
+msgstr "无法更新用户。"
+
+#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
+msgid "Create"
+msgstr "创建"
+
+#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
+msgid "Create a new user with this nickname."
+msgstr "创建使用此昵称的新用户。"
+
+#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
+msgid "Create new account"
+msgstr "创建新��"
+
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+msgid "Creating new account for OpenID that already has a user."
+msgstr "为 OpenID 用户产生新的��。"
+
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "已确认的Jabber/GTalk��。"
+
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "已确认的�以��SMS短消�的电���。"
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr "已确认的电�邮件。"
+
+#: ../actions/showstream.php:356 actions/showstream.php:367
+msgid "Currently"
+msgstr "目�"
+
+#: ../classes/Notice.php:72 classes/Notice.php:86
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "添加标签时数�库出错：%s"
+
+#: ../lib/util.php:1061 lib/util.php:1110
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr "添加回�时数�库出错：%s"
+
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr "删除通告"
+
+#: ../actions/profilesettings.php:51 ../actions/register.php:172
+#: actions/profilesettings.php:84 actions/register.php:186
+msgid "Describe yourself and your interests in 140 chars"
+msgstr "用�超过140个字符�述您自己和您的爱好"
+
+#: ../actions/register.php:158 ../actions/register.php:161
+#: ../lib/settingsaction.php:87 actions/register.php:172
+#: actions/register.php:175 lib/settingsaction.php:87
+msgid "Email"
+msgstr "电�邮件"
+
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr "电�邮件地�"
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr "电�邮件设置"
+
+#: ../actions/register.php:73 actions/register.php:80
+msgid "Email address already exists."
+msgstr "电�邮件地�已存在。"
+
+#: ../lib/mail.php:90 lib/mail.php:90
+msgid "Email address confirmation"
+msgstr "电�邮件地�确认"
+
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr "电�邮件，类似 \"UserName@example.org\""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr "电�邮件地�"
+
+#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
+msgid "Enter a nickname or email address."
+msgstr "输入昵称或电�邮件。"
+
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr "输入手机收到的验��。"
+
+#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
+msgid "Error authorizing token"
+msgstr "无法认�令牌"
+
+#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+msgid "Error connecting user to OpenID."
+msgstr "无法将用户与 OpenID 连接。"
+
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
+msgid "Error connecting user."
+msgstr "无法连接用户。"
+
+#: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153
+msgid "Error inserting avatar"
+msgstr "添加头�出错"
+
+#: ../actions/finishremotesubscribe.php:143
+#: actions/finishremotesubscribe.php:145
+msgid "Error inserting new profile"
+msgstr "添加个人信�出错"
+
+#: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169
+msgid "Error inserting remote profile"
+msgstr "添加远程的个人信�出错"
+
+#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
+msgid "Error saving address confirmation."
+msgstr "�存地�确认时出错。"
+
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
+msgid "Error saving remote profile"
+msgstr "�存远程的个人信�时出错"
+
+#: ../lib/openid.php:226 lib/openid.php:226
+msgid "Error saving the profile."
+msgstr "�存个人信�时出错。"
+
+#: ../lib/openid.php:237 lib/openid.php:237
+msgid "Error saving the user."
+msgstr "�存用户时出错。"
+
+#: ../actions/password.php:80 actions/profilesettings.php:399
+msgid "Error saving user; invalid."
+msgstr "�存用户时出错；�正确。"
+
+#: ../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
+msgid "Error setting user."
+msgstr "�存用户设置时出错。"
+
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
+msgid "Error updating profile"
+msgstr "更新个人信�时出错"
+
+#: ../actions/finishremotesubscribe.php:161
+#: actions/finishremotesubscribe.php:163
+msgid "Error updating remote profile"
+msgstr "更新远程的个人信�时出错"
+
+#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
+msgid "Error with confirmation code."
+msgstr "验��出错。"
+
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
+msgid "Existing nickname"
+msgstr "昵称已被使用"
+
+#: ../lib/util.php:326 lib/util.php:342
+msgid "FAQ"
+msgstr "常�问题FAQ"
+
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+msgid "Failed updating avatar."
+msgstr "更新头�失败。"
+
+#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
+#: actions/allrss.php:64
+#, php-format
+msgid "Feed for friends of %s"
+msgstr "%s 好�的��"
+
+#: ../actions/replies.php:65 ../actions/repliesrss.php:80
+#: actions/replies.php:65 actions/repliesrss.php:66
+#, php-format
+msgid "Feed for replies to %s"
+msgstr "%s 回�的��"
+
+#: ../actions/tag.php:55 actions/tag.php:55
+#, php-format
+msgid "Feed for tag %s"
+msgstr "%s 标签的��"
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr "�索通告内容"
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr "�索用户信�"
+
+#: ../actions/login.php:122
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr "由于安全原因，修改设置�需�输入用户�和密�。"
+
+#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: actions/profilesettings.php:77 actions/register.php:178
+msgid "Full name"
+msgstr "全�"
+
+#: ../actions/profilesettings.php:98 ../actions/register.php:79
+#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
+#: actions/register.php:86 actions/updateprofile.php:94
+msgid "Full name is too long (max 255 chars)."
+msgstr "全�过长(�能超过 255 个字符)。"
+
+#: ../lib/util.php:322 lib/util.php:338
+msgid "Help"
+msgstr "帮助"
+
+#: ../lib/util.php:298 lib/util.php:314
+msgid "Home"
+msgstr "主页"
+
+#: ../actions/profilesettings.php:46 ../actions/register.php:167
+#: actions/profilesettings.php:79 actions/register.php:181
+msgid "Homepage"
+msgstr "主页"
+
+#: ../actions/profilesettings.php:95 ../actions/register.php:76
+#: actions/profilesettings.php:210 actions/register.php:83
+msgid "Homepage is not a valid URL."
+msgstr "主页的URL�正确。"
+
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+msgid "I want to post notices by email."
+msgstr "我希望通过邮件�布信�。"
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+msgid "IM"
+msgstr "�时通讯IM"
+
+#: ../actions/imsettings.php:60 actions/imsettings.php:61
+msgid "IM Address"
+msgstr "IM ��"
+
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
+msgid "IM Settings"
+msgstr "IM 设置"
+
+#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your OpenID."
+msgstr "如果您已�拥有��，�以将它连接到您的 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，输入它并点击“添加�。"
+
+#: ../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
+msgid "Incoming email"
+msgstr "�布用的电�邮件"
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+msgid "Incoming email address removed."
+msgstr "�布用的电�邮件被移除。"
+
+#: ../actions/password.php:69 actions/profilesettings.php:388
+msgid "Incorrect old password"
+msgstr "旧密��正确"
+
+#: ../actions/login.php:67 actions/login.php:67
+msgid "Incorrect username or password."
+msgstr "用户�或密��正确。"
+
+#: ../actions/recoverpassword.php:265
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr "��密�的指示已被��到您的注册邮箱。"
+
+#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
+#, php-format
+msgid "Invalid avatar URL '%s'"
+msgstr "头�URL '%s'�正确"
+
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "电�邮件地� %s �正确"
+
+#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
+#, php-format
+msgid "Invalid homepage '%s'"
+msgstr "主页'%s'�正确"
+
+#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
+#, php-format
+msgid "Invalid license URL '%s'"
+msgstr "授�方�URL '%s'�正确"
+
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+msgid "Invalid notice content"
+msgstr "通告内容�正确"
+
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+msgid "Invalid notice uri"
+msgstr "通告URI�正确"
+
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+msgid "Invalid notice url"
+msgstr "通告URL�正确"
+
+#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
+#, php-format
+msgid "Invalid profile URL '%s'."
+msgstr "个人信�URL '%s'�正确。"
+
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
+msgid "Invalid profile URL (bad format)"
+msgstr "个人信�URL�正确(格�错误)"
+
+#: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79
+msgid "Invalid profile URL returned by server."
+msgstr "�务器返回的个人信�URL�正确。"
+
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
+msgid "Invalid size."
+msgstr "大��正确。"
+
+#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
+#: ../actions/register.php:111 actions/finishopenidlogin.php:241
+#: actions/register.php:103 actions/register.php:121
+msgid "Invalid username or password."
+msgstr "用户�或密��正确。"
+
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr "已��邀请"
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr "已��邀请给这些人："
+
+#: ../lib/util.php:306 lib/util.php:322
+msgid "Invite"
+msgstr "邀请"
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr "邀请新用户"
+
+#: ../lib/util.php:261 lib/util.php:277
+#, 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 ""
+"它�行[Laconica](http://laconi.ca/)微�客�务，版本 "
+"%s，采用[GNU Affero General Public "
+"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)授�。"
+
+#: ../actions/imsettings.php:173 actions/imsettings.php:181
+msgid "Jabber ID already belongs to another user."
+msgstr "Jabber ID 属于�一用户。"
+
+#: ../actions/imsettings.php:62 actions/imsettings.php:63
+#, 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 ""
+"Jabber 或 GTalk "
+"��，类似\"UserName@example.org\"。首先，必须在�时�天工具或GTalk中将 %s 加为好�。"
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Language"
+msgstr "语言"
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+msgid "Language is too long (max 50 chars)."
+msgstr "语言过长(�能超过50个字符)。"
+
+#: ../actions/profilesettings.php:52 ../actions/register.php:173
+#: actions/profilesettings.php:85 actions/register.php:187
+msgid "Location"
+msgstr "�置"
+
+#: ../actions/profilesettings.php:104 ../actions/register.php:85
+#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
+#: actions/register.php:92 actions/updateprofile.php:109
+msgid "Location is too long (max 255 chars)."
+msgstr "�置过长(�能超过255个字符)。"
+
+#: ../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
+msgid "Login"
+msgstr "登录"
+
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#, php-format
+msgid "Login with an [OpenID](%%doc.openid%%) account."
+msgstr "使用[OpenID](%%doc.openid%%)��登录。"
+
+#: ../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 ""
+"ä"
+"½"
+"¿"
+"ç"
+"”"
+"¨"
+"ç"
+"”"
+"¨"
+"æ"
+"ˆ"
+"·"
+"å"
+"��和密�登录。没有用户�？[注册](%%action.register%%)新��，或者使用[OpenID](%%action.openidlogin%%)。"
+
+#: ../lib/util.php:308 lib/util.php:324
+msgid "Logout"
+msgstr "登出"
+
+#: ../actions/register.php:166 actions/register.php:180
+msgid "Longer name, preferably your \"real\" name"
+msgstr "长�字，最好是“实��"
+
+#: ../actions/login.php:110 actions/login.php:110
+msgid "Lost or forgotten password?"
+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 "生�新的电�邮件地�用于�布信�；�消旧的。"
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr "设置 %%site.name%% ��的邮件。"
+
+#: ../actions/showstream.php:300 actions/showstream.php:315
+msgid "Member since"
+msgstr "注册于"
+
+#: ../actions/userrss.php:70 actions/userrss.php:67
+#, php-format
+msgid "Microblog by %s"
+msgstr "%s 的微�客�务"
+
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr "电�的�务商。如果您的�务商支�通过电�邮件��SMS短信，而这里尚未列出，请�系 %s 以告知。"
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
+#: actions/finishopenidlogin.php:85 actions/register.php:202
+msgid "My text and files are available under "
+msgstr "我的文字和文件采用的授�方�为"
+
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr "新建"
+
+#: ../lib/mail.php:144 lib/mail.php:144
+#, php-format
+msgid "New email address for posting to %s"
+msgstr "新的电�邮件地�，用于�布 %s 信�"
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+msgid "New incoming email address added."
+msgstr "已添加新的�布用的电�邮件地�。"
+
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
+msgid "New nickname"
+msgstr "新昵称"
+
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+msgid "New notice"
+msgstr "新通告"
+
+#: ../actions/password.php:41 ../actions/recoverpassword.php:179
+#: actions/profilesettings.php:180 actions/recoverpassword.php:185
+msgid "New password"
+msgstr "新密�"
+
+#: ../actions/recoverpassword.php:314
+msgid "New password successfully saved. You are now logged in."
+msgstr "新密�已�存，您现在已登录。"
+
+#: ../actions/login.php:101 ../actions/profilesettings.php:41
+#: ../actions/register.php:151 actions/login.php:101
+#: actions/profilesettings.php:74 actions/register.php:165
+msgid "Nickname"
+msgstr "昵称"
+
+#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
+#: ../actions/register.php:69 actions/finishopenidlogin.php:181
+#: actions/profilesettings.php:225 actions/register.php:76
+msgid "Nickname already in use. Try another one."
+msgstr "昵称已被使用，�一个�。"
+
+#: ../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
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "昵称�能使用�写字�和数字，�包�空格。"
+
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+msgid "Nickname not allowed."
+msgstr "��许的昵称。"
+
+#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
+msgid "Nickname of the user you want to follow"
+msgstr "希望订阅的用户的昵称"
+
+#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
+msgid "Nickname or email"
+msgstr "昵称或电�邮件"
+
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+msgid "No"
+msgstr "�"
+
+#: ../actions/imsettings.php:156 actions/imsettings.php:164
+msgid "No Jabber ID."
+msgstr "没有 Jabber ID。"
+
+#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
+msgid "No authorization request!"
+msgstr "未收到认�请求�"
+
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr "未选择��商。"
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr "没有输入验��"
+
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
+msgid "No confirmation code."
+msgstr "没有验��"
+
+#: ../actions/newnotice.php:44 actions/newmessage.php:53
+#: actions/newnotice.php:44 classes/Command.php:197
+msgid "No content!"
+msgstr "没有内容�"
+
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+msgid "No email address."
+msgstr "没有电�邮件地�。"
+
+#: ../actions/userbyid.php:32 actions/userbyid.php:32
+msgid "No id."
+msgstr "没有 id。"
+
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+msgid "No incoming email address."
+msgstr "没有�布用的电�邮件地�。"
+
+#: ../actions/finishremotesubscribe.php:65
+#: actions/finishremotesubscribe.php:67
+msgid "No nickname provided by remote server."
+msgstr "远程�务器没有昵称。"
+
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
+msgid "No nickname."
+msgstr "没有昵称。"
+
+#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
+#: ../actions/smssettings.php:229 actions/emailsettings.php:240
+#: actions/imsettings.php:214 actions/smssettings.php:237
+msgid "No pending confirmation to cancel."
+msgstr "没有�以�消的确认。"
+
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr "没有电���。"
+
+#: ../actions/finishremotesubscribe.php:72
+#: actions/finishremotesubscribe.php:74
+msgid "No profile URL returned by server."
+msgstr "�务器没有返回个人信�URL。"
+
+#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
+msgid "No registered email address for that user."
+msgstr "用户没有注册电�邮件。"
+
+#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
+msgid "No request found!"
+msgstr "没有找到请求�"
+
+#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
+#: actions/noticesearch.php:69 actions/peoplesearch.php:69
+msgid "No results"
+msgstr "没有结果"
+
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
+msgid "No size."
+msgstr "没有大�。"
+
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520
+msgid "No status found with that ID."
+msgstr "没有找到此ID的信�。"
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+msgid "No status with that ID found."
+msgstr "没有找到此ID的信�。"
+
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
+msgid "No such OpenID."
+msgstr "没有这个 OpenID。"
+
+#: ../actions/doc.php:29 actions/doc.php:29
+msgid "No such document."
+msgstr "没有这份文档。"
+
+#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
+#: ../lib/deleteaction.php:30 actions/shownotice.php:32
+#: actions/shownotice.php:83 lib/deleteaction.php:30
+msgid "No such notice."
+msgstr "没有这份通告。"
+
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
+msgid "No such recovery code."
+msgstr "没有这个���。"
+
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
+msgid "No such subscription"
+msgstr "没有这个订阅"
+
+#: ../actions/all.php:34 ../actions/allrss.php:35
+#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
+#: ../actions/remotesubscribe.php:84 ../actions/remotesubscribe.php:91
+#: ../actions/replies.php:57 ../actions/repliesrss.php:35
+#: ../actions/showstream.php:110 ../actions/userbyid.php:36
+#: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
+#: ../lib/subs.php:33 ../lib/subs.php:82 actions/all.php:34
+#: actions/allrss.php:35 actions/avatarbynickname.php:43
+#: actions/favoritesrss.php:35 actions/foaf.php:40 actions/ical.php:31
+#: actions/remotesubscribe.php:93 actions/remotesubscribe.php:100
+#: actions/replies.php:57 actions/repliesrss.php:35
+#: actions/showfavorites.php:34 actions/showstream.php:110
+#: actions/userbyid.php:36 actions/userrss.php:35 actions/xrds.php:35
+#: classes/Command.php:120 classes/Command.php:162 classes/Command.php:203
+#: classes/Command.php:237 lib/gallery.php:62 lib/mailbox.php:36
+#: lib/subs.php:33 lib/subs.php:95
+msgid "No such user."
+msgstr "没有这个用户。"
+
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr "没有拥有这个用户�或电�邮件的用户。"
+
+#: ../lib/gallery.php:80 lib/gallery.php:85
+msgid "Nobody to show!"
+msgstr "�显示任何人�"
+
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
+msgid "Not a recovery code."
+msgstr "�是���。"
+
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+msgid "Not a registered user."
+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
+msgid "Not a supported data format."
+msgstr "�支�的数�格�。"
+
+#: ../actions/imsettings.php:167 actions/imsettings.php:175
+msgid "Not a valid Jabber ID"
+msgstr "�是有效的 Jabber ID"
+
+#: ../lib/openid.php:131 lib/openid.php:131
+msgid "Not a valid OpenID."
+msgstr "�是有效的 OpenID。"
+
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+msgid "Not a valid email address"
+msgstr "�是有效的电�邮件"
+
+#: ../actions/register.php:63 actions/register.php:70
+msgid "Not a valid email address."
+msgstr "�是有效的电�邮件。"
+
+#: ../actions/profilesettings.php:91 ../actions/register.php:71
+#: actions/profilesettings.php:206 actions/register.php:78
+msgid "Not a valid nickname."
+msgstr "�是有效的昵称。"
+
+#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
+msgid "Not a valid profile URL (incorrect services)."
+msgstr "�是有效的个人信�URL(�正确的�务)。"
+
+#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
+msgid "Not a valid profile URL (no XRDS defined)."
+msgstr "�是有效的个人信�URL(未定义XRDS)。"
+
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
+msgid "Not a valid profile URL (no YADIS document)."
+msgstr "�是有效的个人信�URL(没有YADIS数�)。"
+
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+msgid "Not an image or corrupt file."
+msgstr "�是图片文件或文件已��。"
+
+#: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53
+msgid "Not authorized."
+msgstr "未认�。"
+
+#: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38
+msgid "Not expecting this response!"
+msgstr "未预料的�应�"
+
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+msgid "Not found"
+msgstr "未找到"
+
+#: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
+#: ../actions/newnotice.php:29 ../actions/subscribe.php:28
+#: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
+#: ../lib/settingsaction.php:27 actions/disfavor.php:29 actions/favor.php:30
+#: actions/finishaddopenid.php:29 actions/logout.php:33
+#: actions/newmessage.php:28 actions/newnotice.php:29 actions/subscribe.php:28
+#: actions/unsubscribe.php:25 lib/deleteaction.php:38
+#: lib/settingsaction.php:27
+msgid "Not logged in."
+msgstr "未登录。"
+
+#: ../lib/subs.php:91 lib/subs.php:104
+msgid "Not subscribed!."
+msgstr "未订阅�"
+
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr "�索通告"
+
+#: ../actions/showstream.php:82 actions/showstream.php:82
+#, php-format
+msgid "Notice feed for %s"
+msgstr "%s 的通告��"
+
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+msgid "Notice has no profile"
+msgstr "通告没有关�个人信�"
+
+#: ../actions/showstream.php:316 actions/showstream.php:331
+msgid "Notices"
+msgstr "通告"
+
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr "带 %s 标签的通告"
+
+#: ../actions/password.php:39 actions/profilesettings.php:178
+msgid "Old password"
+msgstr "旧密�"
+
+#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
+#: lib/util.php:330
+msgid "OpenID"
+msgstr "OpenID"
+
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
+msgid "OpenID Account Setup"
+msgstr "OpenID ��设置"
+
+#: ../lib/openid.php:180 lib/openid.php:180
+msgid "OpenID Auto-Submit"
+msgstr "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
+msgid "OpenID Login"
+msgstr "OpenID 登录"
+
+#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
+#: actions/openidlogin.php:74 actions/openidsettings.php:50
+msgid "OpenID URL"
+msgstr "OpenID URL"
+
+#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
+#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
+msgid "OpenID authentication cancelled."
+msgstr "OpenID 认�已�消。"
+
+#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
+#, php-format
+msgid "OpenID authentication failed: %s"
+msgstr "OpenID 认�失败：%s"
+
+#: ../lib/openid.php:133 lib/openid.php:133
+#, php-format
+msgid "OpenID failure: %s"
+msgstr "OpenID 失败：%s"
+
+#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
+msgid "OpenID removed."
+msgstr "OpenID 已移除。"
+
+#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
+msgid "OpenID settings"
+msgstr "OpenID 设置"
+
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr "在邀请中加几��(�选)。"
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+msgid "Partial upload."
+msgstr "部分上传。"
+
+#: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
+#: ../actions/register.php:153 ../lib/settingsaction.php:93
+#: actions/finishopenidlogin.php:96 actions/login.php:102
+#: actions/register.php:167
+msgid "Password"
+msgstr "密�"
+
+#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
+msgid "Password and confirmation do not match."
+msgstr "密�和确认�匹�。"
+
+#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
+msgid "Password must be 6 chars or more."
+msgstr "密�必须是 6 个字符或更多。"
+
+#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
+msgid "Password recovery requested"
+msgstr "请求��密�"
+
+#: ../actions/password.php:89 ../actions/recoverpassword.php:313
+#: actions/profilesettings.php:408 actions/recoverpassword.php:326
+msgid "Password saved."
+msgstr "密�已�存。"
+
+#: ../actions/password.php:61 ../actions/register.php:88
+#: actions/profilesettings.php:380 actions/register.php:98
+msgid "Passwords don't match."
+msgstr "密��匹�。"
+
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr "用户"
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr "�索用户"
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
+msgid "People search"
+msgstr "�索用户"
+
+#: ../lib/stream.php:50 lib/personal.php:50
+msgid "Personal"
+msgstr "个人"
+
+#: ../actions/invite.php:133 actions/invite.php:141
+msgid "Personal message"
+msgstr "个人消�"
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "电���，�带标点或空格，包�地区代�"
+
+#: ../actions/userauthorization.php:78
+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 \"Cancel\"."
+msgstr "请检查详细信�，确认希望订阅此用户的通告。如果您刚�没有�求订阅任何人的通告，请点击\"�消\"。"
+
+#: ../actions/imsettings.php:73 actions/imsettings.php:74
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr "当我的Jabber/GTalk状�改�时自动�布通告。"
+
+#: ../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
+msgid "Preferences"
+msgstr "首选项"
+
+#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
+#: ../actions/smssettings.php:163 actions/emailsettings.php:180
+#: actions/imsettings.php:152 actions/smssettings.php:171
+msgid "Preferences saved."
+msgstr "首选项已�存。"
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Preferred language"
+msgstr "首选语言"
+
+#: ../lib/util.php:328 lib/util.php:344
+msgid "Privacy"
+msgstr "��"
+
+#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
+#: classes/Notice.php:119
+msgid "Problem saving notice."
+msgstr "�存通告时出错。"
+
+#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
+#: lib/settingsaction.php:84
+msgid "Profile"
+msgstr "个人信�"
+
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
+msgid "Profile URL"
+msgstr "个人信�URL"
+
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
+msgid "Profile settings"
+msgstr "个人设置"
+
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
+#: actions/postnotice.php:52 actions/updateprofile.php:53
+msgid "Profile unknown"
+msgstr "未知的��"
+
+#: ../actions/public.php:54 actions/public.php:54
+msgid "Public Stream Feed"
+msgstr "公开的��"
+
+#: ../actions/public.php:33 actions/public.php:33
+msgid "Public timeline"
+msgstr "公开的时间表"
+
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "公开Jabber/GTalk��的 MicroID。"
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+msgid "Publish a MicroID for my email address."
+msgstr "公开电�邮件的 MicroID。"
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr "最近的标签"
+
+#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
+msgid "Recover"
+msgstr "��"
+
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
+msgid "Recover password"
+msgstr "��密�"
+
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
+msgid "Recovery code for unknown user."
+msgstr "���未知"
+
+#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: actions/register.php:152 actions/register.php:207 lib/util.php:328
+msgid "Register"
+msgstr "注册"
+
+#: ../actions/register.php:28 actions/register.php:28
+msgid "Registration not allowed."
+msgstr "��许注册。"
+
+#: ../actions/register.php:200 actions/register.php:214
+msgid "Registration successful"
+msgstr "注册�功。"
+
+#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
+msgid "Reject"
+msgstr "拒�"
+
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190
+msgid "Remember me"
+msgstr "记�登录状�"
+
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
+msgid "Remote profile with no matching profile"
+msgstr "没有匹�的远程个人信�"
+
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+msgid "Remote subscribe"
+msgstr "远程订阅"
+
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
+#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59
+msgid "Remove"
+msgstr "移除"
+
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
+msgid "Remove OpenID"
+msgstr "移除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 "移除唯一的OpenID�能使您无法登陆�如果需�移除它，请先添加一个新的。"
+
+#: ../lib/stream.php:55 lib/personal.php:55
+msgid "Replies"
+msgstr "回�"
+
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
+#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
+#, php-format
+msgid "Replies to %s"
+msgstr "%s 的回�"
+
+#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
+msgid "Reset"
+msgstr "�置"
+
+#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
+msgid "Reset password"
+msgstr "�置密�"
+
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+msgid "SMS"
+msgstr "SMS短信"
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr "SMS短信电���"
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr "SMS短信设置"
+
+#: ../lib/mail.php:219 lib/mail.php:225
+msgid "SMS confirmation"
+msgstr "SMS短信确认"
+
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
+msgid "Same as password above"
+msgstr "相�的密�"
+
+#: ../actions/register.php:156 actions/register.php:170
+msgid "Same as password above. Required."
+msgstr "相�的密�。此项必填。"
+
+#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
+#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
+#: actions/emailsettings.php:104 actions/imsettings.php:82
+#: actions/profilesettings.php:101 actions/smssettings.php:100
+#: actions/twittersettings.php:83
+msgid "Save"
+msgstr "�存"
+
+#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
+#: lib/util.php:316
+msgid "Search"
+msgstr "�索"
+
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+msgid "Search Stream Feed"
+msgstr "�索��"
+
+#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#, 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 "在 %%site.name%% 的通告内容中�索。�索�件至少包� 3 个字符，多个�索�件用空格分隔。"
+
+#: ../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 "在 %%site.name%% 的用户信�中�索，�以�索姓��未知和爱好。�索�件至少包� 3 个字符，多个�索�件用空格分隔。"
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr "选择��商"
+
+#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
+#: lib/util.php:1306 lib/util.php:1731
+msgid "Send"
+msgstr "��"
+
+#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
+#: actions/emailsettings.php:74 actions/smssettings.php:82
+msgid "Send email to this address to post new notices."
+msgstr "�这个电�邮件�信以�布新的通告。"
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr "如果有新订阅，通过电�邮件告诉我。"
+
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
+msgid "Send me notices through 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 "通过SMS短信将通告�给我；我了解这样也许会给我带���的开支。"
+
+#: ../actions/imsettings.php:76 actions/imsettings.php:77
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr "如果我尚未订阅的用户回我消�，使用Jabber/GTalk通知我。"
+
+#: ../lib/util.php:304 lib/util.php:320
+msgid "Settings"
+msgstr "设置"
+
+#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+msgid "Settings saved."
+msgstr "设置已�存。"
+
+#: ../actions/tag.php:60 actions/tag.php:60
+msgid "Showing most popular tags from the last week"
+msgstr "显示上周以�最�行的标签"
+
+#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
+msgid "Someone else already has this OpenID."
+msgstr "其他人已�使用了这个OpenID。"
+
+#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
+#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
+msgid "Something weird happened."
+msgstr "�生了奇怪的错误……"
+
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr "对�起，�布用的电�邮件无法使用。"
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr "对�起，这个�布用的电�邮件属于其他用户。"
+
+#: ../lib/util.php:330 lib/util.php:346
+msgid "Source"
+msgstr "��"
+
+#: ../actions/showstream.php:296 actions/showstream.php:311
+msgid "Statistics"
+msgstr "统计"
+
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
+#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
+msgid "Stored OpenID not found."
+msgstr "未找到已有的OpenID。"
+
+#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
+#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
+#: actions/showstream.php:197 actions/showstream.php:206
+msgid "Subscribe"
+msgstr "订阅"
+
+#: ../actions/showstream.php:313 ../actions/subscribers.php:27
+#: actions/showstream.php:328 actions/subscribers.php:27
+msgid "Subscribers"
+msgstr "订阅者"
+
+#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
+msgid "Subscription authorized"
+msgstr "订阅已确认"
+
+#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
+msgid "Subscription rejected"
+msgstr "订阅被拒�"
+
+#: ../actions/showstream.php:230 ../actions/showstream.php:307
+#: ../actions/subscriptions.php:27 actions/showstream.php:240
+#: actions/showstream.php:322 actions/subscriptions.php:27
+msgid "Subscriptions"
+msgstr "订阅"
+
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
+msgid "System error uploading file."
+msgstr "上传文件时出错。"
+
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317
+msgid "Tags"
+msgstr "标签"
+
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
+msgid "Text"
+msgstr "文本"
+
+#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
+msgid "Text search"
+msgstr "�索文本"
+
+#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
+msgid "That OpenID does not belong to you."
+msgstr "此OpenID属于他人。"
+
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
+msgid "That address has already been confirmed."
+msgstr "此地�已被确认。"
+
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
+msgid "That confirmation code is not for you!"
+msgstr "此确认��适用�"
+
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+msgid "That email address already belongs to another user."
+msgstr "此电�邮件属于其他用户。"
+
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+msgid "That file is too big."
+msgstr "文件超出大��制。"
+
+#: ../actions/imsettings.php:170 actions/imsettings.php:178
+msgid "That is already your Jabber ID."
+msgstr "您已登记此Jabber��。"
+
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+msgid "That is already your email address."
+msgstr "您已登记此电�邮件。"
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr "您已登记此电���。"
+
+#: ../actions/imsettings.php:233 actions/imsettings.php:241
+msgid "That is not your Jabber ID."
+msgstr "这�是您的Jabber��。"
+
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+msgid "That is not your email address."
+msgstr "这是他人的电�邮件。"
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+msgid "That is not your phone number."
+msgstr "这是他人的电���。"
+
+#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
+#: actions/emailsettings.php:244 actions/imsettings.php:218
+msgid "That is the wrong IM address."
+msgstr "�时通讯��错误。"
+
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr "确认�错误。"
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr "这个电���属于�一个用户。"
+
+#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
+#: actions/newnotice.php:49 actions/twitapistatuses.php:330
+msgid "That's too long. Max notice size is 140 chars."
+msgstr "超出长度�制。�能超过 140 个字符。"
+
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+msgid "That's too long. Max notice size is 255 chars."
+msgstr "超出长度�制。�能超过 255 个字符。"
+
+#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "地� \"%s\" 已确认。"
+
+#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
+#: ../actions/smssettings.php:274 actions/emailsettings.php:282
+#: actions/imsettings.php:258 actions/smssettings.php:282
+msgid "The address was removed."
+msgstr "地�被移除。"
+
+#: ../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 "订阅已确认，但是没有回传URL。请到此网站查看如何确认订阅。您的订阅标识是："
+
+#: ../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 "订阅已被拒�，但是没有回传URL。请到此网站查看如何拒�订阅。"
+
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#, php-format
+msgid "These are the people who listen to %s's notices."
+msgstr "这些用户订阅了 %s 的通告。"
+
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
+msgid "These are the people who listen to your notices."
+msgstr "这些用户订阅了您的通告。"
+
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#, php-format
+msgid "These are the people whose notices %s listens to."
+msgstr "这是 %s 订阅的用户。"
+
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+msgid "These are the people whose notices you listen to."
+msgstr "这是您订阅的用户。"
+
+#: ../actions/invite.php:89 actions/invite.php:96
+msgid ""
+"These people are already users and you were automatically subscribed to "
+"them:"
+msgstr "这些好�已注册，您已自动订阅这些用户。"
+
+#: ../actions/recoverpassword.php:88
+msgid "This confirmation code is too old. Please start again."
+msgstr "验��超时，请��。"
+
+#: ../lib/openid.php:195
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr "此表�会自动�交。如果没有，点击“�交�以转� OpenID �供者。"
+
+#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
+#, php-format
+msgid ""
+"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."
+msgstr "这是您第一次登陆 %s，我们需�将 OpenID 连接到这里的��。您�以创建新��，或者连接到已有的��。"
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511
+msgid "This method requires a POST or DELETE."
+msgstr "此方法接�POST或DELETE请求。"
+
+#: ../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
+msgid "This method requires a POST."
+msgstr "此方法接�POST请求。"
+
+#: ../lib/util.php:164 lib/util.php:246
+msgid "This page is not available in a media type you accept"
+msgstr "这个页���供您想�的媒体类型"
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "Timezone"
+msgstr "时区"
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+msgid "Timezone not selected."
+msgstr "未选择时区。"
+
+#: ../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 ""
+"è"
+"¯"
+"·"
+"["
+"ç"
+"™"
+"»"
+"å"
+"½"
+"•"
+"]"
+"("
+"%"
+"%"
+"a"
+"c"
+"t"
+"i"
+"o"
+"n"
+"."
+"l"
+"o"
+"g"
+"i"
+"n"
+"%"
+"%"
+")"
+"æ"
+"ˆ"
+"–"
+"["
+"æ"
+"³"
+"¨"
+"å"
+"†Œ](%%action.register%%)å¸�å�·ä»¥è®¢é˜…。如果您已ç»�有了[兼容的微å�šå®¢ç«™ç‚¹](%%doc.openmublog%%)çš„å¸�å�·ï¼Œè¯·è¾“入个人信æ�¯URL。"
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+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
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "您的主页��客或在其他站点的URL"
+
+#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "您在其他兼容的微�客�务的个人信�URL"
+
+#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
+#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
+#: actions/emailsettings.php:144 actions/imsettings.php:118
+#: actions/recoverpassword.php:39 actions/smssettings.php:143
+#: actions/twittersettings.php:108
+msgid "Unexpected form submission."
+msgstr "未预料的表��交。"
+
+#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
+msgid "Unexpected password reset."
+msgstr "未预料的密��置。"
+
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr "未知动作"
+
+#: ../actions/finishremotesubscribe.php:58
+#: actions/finishremotesubscribe.php:60
+msgid "Unknown version of OMB protocol."
+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 "除��外说明，此站点的内容由贡献者版�所有，授�方�为"
+
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr "��识别的地�类型 %s"
+
+#: ../actions/showstream.php:209 actions/showstream.php:219
+msgid "Unsubscribe"
+msgstr "退订"
+
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
+#: actions/postnotice.php:45 actions/updateprofile.php:46
+msgid "Unsupported OMB version"
+msgstr "�支�此OMB版本"
+
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+msgid "Unsupported image file format."
+msgstr "�支�这�图�格�。"
+
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+msgid "Updates by SMS"
+msgstr "使用SMS短信更新"
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+msgid "Updates by instant messenger (IM)"
+msgstr "使用�时通讯工具(IM)更新"
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr "%2$s 上 %1$s 和好�的更新�"
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "%2$s 上 %1$s 的更新�"
+
+#: ../actions/avatar.php:68 actions/profilesettings.php:161
+msgid "Upload"
+msgstr "上传"
+
+#: ../actions/avatar.php:27
+msgid ""
+"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 license, also. Use a picture that belongs to you and that you want to "
+"share."
+msgstr "在这里上传新的头�。上传�无法修改，请尽�使用正方形图片。图片必须使用与站点相�的授�。请使用您希望分享的属于您的图片。"
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr "上传个人信�头�"
+
+#: ../actions/invite.php:114 actions/invite.php:121
+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
+msgid "Used only for updates, announcements, and password recovery"
+msgstr "�用于更新�通告或密���"
+
+#: ../actions/finishremotesubscribe.php:86
+#: actions/finishremotesubscribe.php:88
+msgid "User being listened to doesn't exist."
+msgstr "�查看的用户�存在。"
+
+#: ../actions/all.php:41 ../actions/avatarbynickname.php:48
+#: ../actions/foaf.php:47 ../actions/replies.php:41
+#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
+#: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
+#: ../actions/twitapiusers.php:82 actions/all.php:41
+#: actions/avatarbynickname.php:48 actions/foaf.php:47 actions/replies.php:41
+#: actions/showfavorites.php:41 actions/showstream.php:44
+#: actions/twitapiaccount.php:80 actions/twitapifavorites.php:68
+#: actions/twitapistatuses.php:235 actions/twitapistatuses.php:609
+#: actions/twitapiusers.php:87 lib/mailbox.php:50
+msgid "User has no profile."
+msgstr "用户没有个人信�。"
+
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
+msgid "User nickname"
+msgstr "昵称"
+
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr "未找到用户。"
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "What timezone are you normally in?"
+msgstr "您一般处于哪个时区？"
+
+#: ../lib/util.php:1159 lib/util.php:1293
+#, php-format
+msgid "What's up, %s?"
+msgstr "怎么样，%s？"
+
+#: ../actions/profilesettings.php:54 ../actions/register.php:175
+#: actions/profilesettings.php:87 actions/register.php:189
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "你的�置，格�类似\"城市，�份，国家\""
+
+#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#, php-format
+msgid "Wrong image type for '%s'"
+msgstr "'%s' 图�格�错误"
+
+#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#, php-format
+msgid "Wrong size image at '%s'"
+msgstr "图�大� '%s' 错误"
+
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+msgid "Yes"
+msgstr "是"
+
+#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
+msgid "You already have this OpenID!"
+msgstr "已登记此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 "您选择了永久删除通告。这样�是无法��的。"
+
+#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
+msgid "You are already logged in!"
+msgstr "已登录�"
+
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr "您已订阅这些用户："
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+msgid "You are not friends with the specified user."
+msgstr "您与此用户并�好�。"
+
+#: ../actions/password.php:27
+msgid "You can change your password here. Choose a good one!"
+msgstr "在这里修改密�。选择一个好密��"
+
+#: ../actions/register.php:135 actions/register.php:145
+msgid "You can create a new account to start posting notices."
+msgstr "请创建新��，开始�布通告。"
+
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr "您�以通过 %%site.name%% 的电�邮件接收SMS短信。"
+
+#: ../actions/openidsettings.php:86
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr "您�以点击\"移除\"按钮，移除��的 OpenID。"
+
+#: ../actions/imsettings.php:28 actions/imsettings.php:28
+#, php-format
+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%%)��和接�通告。在这里�置它们。"
+
+#: ../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
+msgid "You can use the local subscription!"
+msgstr "您�以在这里订阅�"
+
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
+#: actions/finishopenidlogin.php:38 actions/register.php:68
+msgid "You can't register if you don't agree to the license."
+msgstr "您必须��此授�方�注册。"
+
+#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
+msgid "You did not send us that profile"
+msgstr "您未告知此个人信�"
+
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+"您的 %1$s �布用地�已更新。\n"
+"\n"
+"��邮件到 %2$s ��布新消�。\n\n更多电�邮件的帮助请� %3$s。\n\n为您效力的 %4$s"
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+msgid "You may not delete another user's status."
+msgstr "您�能删除其他用户的状�。"
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr "您必须登录�能邀请其他人使用 %s"
+
+#: ../actions/invite.php:103 actions/invite.php:110
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
+msgstr "如果其他人接�邀请并注册，您将得到通知。谢谢您推动了社区�展壮大�"
+
+#: ../actions/recoverpassword.php:149
+msgid "You've been identified. Enter a  new password below. "
+msgstr "您已得到确认。请输入新密�。"
+
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+msgid "Your OpenID URL"
+msgstr "您的OpenID URL"
+
+#: ../actions/recoverpassword.php:164
+msgid "Your nickname on this server, or your registered email address."
+msgstr "您在此�务器的昵称，或注册邮箱。"
+
+#: ../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%%)�许您使用相�的��登录许多��的站点。在这里管�已关�的 OpenID。"
+
+#: ../lib/util.php:943 lib/util.php:992
+msgid "a few seconds ago"
+msgstr "几秒�"
+
+#: ../lib/util.php:955 lib/util.php:1004
+#, php-format
+msgid "about %d days ago"
+msgstr "%d 天�"
+
+#: ../lib/util.php:951 lib/util.php:1000
+#, php-format
+msgid "about %d hours ago"
+msgstr "%d �时�"
+
+#: ../lib/util.php:947 lib/util.php:996
+#, php-format
+msgid "about %d minutes ago"
+msgstr "%d 分钟�"
+
+#: ../lib/util.php:959 lib/util.php:1008
+#, php-format
+msgid "about %d months ago"
+msgstr "%d 个月�"
+
+#: ../lib/util.php:953 lib/util.php:1002
+msgid "about a day ago"
+msgstr "一天�"
+
+#: ../lib/util.php:945 lib/util.php:994
+msgid "about a minute ago"
+msgstr "一分钟�"
+
+#: ../lib/util.php:957 lib/util.php:1006
+msgid "about a month ago"
+msgstr "一个月�"
+
+#: ../lib/util.php:961 lib/util.php:1010
+msgid "about a year ago"
+msgstr "一年�"
+
+#: ../lib/util.php:949 lib/util.php:998
+msgid "about an hour ago"
+msgstr "一�时�"
+
+#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99
+msgid "delete"
+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
+msgid "in reply to..."
+msgstr "先�……"
+
+#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
+#: ../lib/stream.php:124 actions/noticesearch.php:143
+#: actions/showstream.php:433 lib/stream.php:91
+msgid "reply"
+msgstr "回�"
+
+#: ../actions/password.php:44 actions/profilesettings.php:183
+msgid "same as password above"
+msgstr "相�的密�"
+
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+msgid "unsupported file type"
+msgstr "�支�这�类型的文件"
+
+#: ../lib/util.php:1309 lib/util.php:1443
+msgid "« After"
+msgstr "« 之�"
+
+#: actions/deletenotice.php:74 actions/disfavor.php:43
+#: actions/emailsettings.php:127 actions/favor.php:45
+#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
+#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
+#: actions/openidsettings.php:123 actions/profilesettings.php:47
+#: actions/recoverpassword.php:282 actions/register.php:42
+#: actions/remotesubscribe.php:40 actions/smssettings.php:124
+#: actions/subscribe.php:44 actions/twittersettings.php:97
+#: actions/unsubscribe.php:41 actions/userauthorization.php:35
+msgid "There was a problem with your session token. Try again, please."
+msgstr "会�标识有问题，请�试。"
+
+#: actions/disfavor.php:55
+msgid "This notice is not a favorite!"
+msgstr "此通告未被收��"
+
+#: actions/disfavor.php:63
+msgid "Could not delete favorite."
+msgstr "无法删除收�。"
+
+#: actions/disfavor.php:72
+msgid "Favor"
+msgstr "收�"
+
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr "如果有人收�我的通告，�邮件通知我。"
+
+#: actions/emailsettings.php:95
+msgid "Send me email when someone sends me a private message."
+msgstr "如果收到�人信�，�邮件通知我。"
+
+#: actions/favor.php:53 actions/twitapifavorites.php:142
+msgid "This notice is already a favorite!"
+msgstr "已收�此通告�"
+
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132
+msgid "Could not create favorite."
+msgstr "无法创建收�。"
+
+#: actions/favor.php:70
+msgid "Disfavor"
+msgstr "�消收�"
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#, php-format
+msgid "%s favorite notices"
+msgstr "%s 收�的通告"
+
+#: actions/favoritesrss.php:64
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr "%s 的收�的��"
+
+#: actions/inbox.php:28
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr "%s 的收件箱 - 第 %d 页"
+
+#: actions/inbox.php:30
+#, php-format
+msgid "Inbox for %s"
+msgstr "%s 的收件箱"
+
+#: actions/inbox.php:53
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr "这是您的收件箱，包��给您的�人消�。"
+
+#: actions/invite.php:178
+#, php-format
+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
+msgid "Automatically login in the future; "
+msgstr "��登录状�；"
+
+#: actions/login.php:122
+msgid "For security reasons, please re-enter your "
+msgstr "由于安全原因，请�新输入"
+
+#: actions/login.php:126
+msgid "Login with your username and password. "
+msgstr "输入用户�和密�以登录。"
+
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+msgid "That's too long. Max message size is 140 chars."
+msgstr "超出长度�制。�能超过 140 个字符。"
+
+#: actions/newmessage.php:65
+msgid "No recipient specified."
+msgstr "没有收件人。"
+
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206
+msgid "You can't send a message to this user."
+msgstr "无法�此用户��消�。"
+
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly "
+"instead."
+msgstr "���自己��消�；跟自己悄悄说就得了。"
+
+#: actions/newmessage.php:108
+msgid "No such user"
+msgstr "未找到用户"
+
+#: actions/newmessage.php:117
+msgid "New message"
+msgstr "新消�"
+
+#: actions/noticesearch.php:95
+msgid "Notice without matching profile"
+msgstr "找�到匹�的通告"
+
+#: actions/openidsettings.php:28
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr "[OpenID](%%doc.openid%%)�许您登录许多��的站点"
+
+#: actions/openidsettings.php:46
+msgid "If you want to add an OpenID to your account, "
+msgstr "如果您希望添加OpenID，"
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr "移除仅有的OpenID�能使您无法登陆�"
+
+#: actions/openidsettings.php:87
+msgid "You can remove an OpenID from your account "
+msgstr "您�以移除一个OpenID"
+
+#: actions/outbox.php:28
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr "%s 的�件箱 - 第 %d 页"
+
+#: actions/outbox.php:30
+#, php-format
+msgid "Outbox for %s"
+msgstr "%s 的�件箱"
+
+#: actions/outbox.php:53
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr "这是您的�件箱，包�您��的�人消�。"
+
+#: actions/peoplesearch.php:28
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+msgstr "在 %%site.name%% 的用户信�中�索，�以�索姓��未知和爱好。"
+
+#: actions/profilesettings.php:27
+msgid "You can update your personal profile info here "
+msgstr "您�以在这里更新个人信�。"
+
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+msgid "User without matching profile"
+msgstr "找�到匹�的用户。"
+
+#: actions/recoverpassword.php:91
+msgid "This confirmation code is too old. "
+msgstr "验��超时。"
+
+#: actions/recoverpassword.php:141
+msgid "If you've forgotten or lost your"
+msgstr "如果您忘记或丢失了您的"
+
+#: actions/recoverpassword.php:154
+msgid "You've been identified. Enter a "
+msgstr "您已得到确认。输入"
+
+#: actions/recoverpassword.php:169
+msgid "Your nickname on this server, "
+msgstr "您在�务器上的昵称，"
+
+#: actions/recoverpassword.php:271
+msgid "Instructions for recovering your password "
+msgstr "��密�的步骤"
+
+#: actions/recoverpassword.php:327
+msgid "New password successfully saved. "
+msgstr "新密�已�存。"
+
+#: actions/register.php:95
+msgid "Password must be 6 or more characters."
+msgstr "密�必须包� 6 个或更多字符。"
+
+#: actions/register.php:216
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
+msgstr "�贺你，%s�欢迎�到 %%%%site.name%%%%。在这里，您�以……"
+
+#: actions/register.php:227
+msgid "(You should receive a message by email momentarily, with "
+msgstr "(您将立�收到一�电�邮件，�有"
+
+#: actions/remotesubscribe.php:51
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
+msgstr "�订阅，请先[登录](%%action.login%%)，"
+
+#: actions/showfavorites.php:61
+#, php-format
+msgid "Feed for favorites of %s"
+msgstr "%s 的收�的��"
+
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+msgid "Could not retrieve favorite notices."
+msgstr "无法获�收�的通告。"
+
+#: actions/showmessage.php:33
+msgid "No such message."
+msgstr "未找到此消�。"
+
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
+msgstr "�有��和接��方�以阅读此消�。"
+
+#: actions/showmessage.php:61
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr "��给 %1$s 的 %2$s 消�"
+
+#: actions/showmessage.php:66
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr "�自 %1$s 的 %2$s 消�"
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr "��消�"
+
+#: actions/smssettings.php:312
+#, php-format
+msgid "Mobile carrier for your phone. "
+msgstr "手机的��商。"
+
+#: actions/twitapidirect_messages.php:76
+#, php-format
+msgid "Direct messages to %s"
+msgstr "�给 %s 的直接消�"
+
+#: actions/twitapidirect_messages.php:77
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr "�给 %s 的直接消�"
+
+#: actions/twitapidirect_messages.php:81
+msgid "Direct Messages You've Sent"
+msgstr "您已��的直接消�"
+
+#: actions/twitapidirect_messages.php:82
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr "%s ��的直接消�"
+
+#: actions/twitapidirect_messages.php:128
+msgid "No message text!"
+msgstr "消�没有正文�"
+
+#: actions/twitapidirect_messages.php:138
+msgid "Recipient user not found."
+msgstr "未找到收件人。"
+
+#: actions/twitapidirect_messages.php:141
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr "无法�并�好�的用户��直接消�。"
+
+#: actions/twitapifavorites.php:92
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr "%s 的收� / %s"
+
+#: actions/twitapifavorites.php:95
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr "%s 收�了 %s 的 %s 通告。"
+
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#, php-format
+msgid "%s added your notice as a favorite"
+msgstr "%s 收�了您的通告"
+
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+msgstr "%1$s 收�了您的 %2$s 通告。\n\n"
+
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+msgstr "添加 Twitter ��，自动� Twitter ��更新。"
+
+#: actions/twittersettings.php:41
+msgid "Twitter settings"
+msgstr "Twitter 设置"
+
+#: actions/twittersettings.php:48
+msgid "Twitter Account"
+msgstr "Twitter ��"
+
+#: actions/twittersettings.php:56
+msgid "Current verified Twitter account."
+msgstr "已验�的 Twitter ��。"
+
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr "Twitter 用户�"
+
+#: actions/twittersettings.php:65
+msgid "No spaces, please."
+msgstr "请��包�空格。"
+
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr "Twitter 密�"
+
+#: actions/twittersettings.php:72
+msgid "Automatically send my notices to Twitter."
+msgstr "自动将我的通告转�到 Twitter。"
+
+#: actions/twittersettings.php:75
+msgid "Send local \"@\" replies to Twitter."
+msgstr "将这里的 \"@\" 回���到 Twitter。"
+
+#: actions/twittersettings.php:78
+msgid "Subscribe to my Twitter friends here."
+msgstr "在这里订阅 Twitter 好�。"
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr "用户��能包�数字，大写和�写字�和下划线。�能超过 15 个字符。"
+
+#: actions/twittersettings.php:128
+msgid "Could not verify your Twitter credentials!"
+msgstr "�能验� Twitter ���"
+
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgstr "无法从 Twitter 获�\"%s\"的��信�。"
+
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+msgid "Unable to save your Twitter settings!"
+msgstr "无法�存 Twitter 设置�"
+
+#: actions/twittersettings.php:174
+msgid "Twitter settings saved."
+msgstr "Twitter 设置已�存。"
+
+#: actions/twittersettings.php:192
+msgid "That is not your Twitter account."
+msgstr "此 Twitter ��属于他人。"
+
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+msgid "Couldn't remove Twitter user."
+msgstr "无法移除 Twitter 用户。"
+
+#: actions/twittersettings.php:212
+msgid "Twitter account removed."
+msgstr "Twitter ��已移除。"
+
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+msgid "Couldn't save Twitter preferences."
+msgstr "无法�存 Twitter 首选项。"
+
+#: actions/twittersettings.php:245
+msgid "Twitter preferences saved."
+msgstr "Twitter 首选项已�存。"
+
+#: actions/userauthorization.php:84
+msgid "Please check these details to make sure "
+msgstr "请检查详细信�"
+
+#: actions/userauthorization.php:324
+msgid "The subscription has been authorized, but no "
+msgstr "订阅已确认，但是"
+
+#: actions/userauthorization.php:334
+msgid "The subscription has been rejected, but no "
+msgstr "订阅已拒�，但是"
+
+#: classes/Channel.php:113
+msgid "Command results"
+msgstr "执行结果"
+
+#: classes/Channel.php:148
+msgid "Command complete"
+msgstr "执行完毕"
+
+#: classes/Channel.php:158
+msgid "Command failed"
+msgstr "执行失败"
+
+#: classes/Command.php:39
+msgid "Sorry, this command is not yet implemented."
+msgstr "对�起，这个命令还没有实现。"
+
+#: classes/Command.php:96
+#, php-format
+msgid "Subscriptions: %1$s\n"
+msgstr "订阅：%1$s\n"
+
+#: classes/Command.php:125 classes/Command.php:242
+msgid "User has no last notice"
+msgstr "用户没有通告。"
+
+#: classes/Command.php:146
+msgid "Notice marked as fave."
+msgstr "通告被标记为收�。"
+
+#: classes/Command.php:166
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#: classes/Command.php:169
+#, php-format
+msgid "Fullname: %s"
+msgstr "全�：%s"
+
+#: classes/Command.php:172
+#, php-format
+msgid "Location: %s"
+msgstr "�置：%s"
+
+#: classes/Command.php:175
+#, php-format
+msgid "Homepage: %s"
+msgstr "主页：%s"
+
+#: classes/Command.php:178
+#, php-format
+msgid "About: %s"
+msgstr "关于：%s"
+
+#: classes/Command.php:200
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr "您的消�包� %d 个字符，超出长度�制 - �能超过 140 个字符。"
+
+#: classes/Command.php:214
+#, php-format
+msgid "Direct message to %s sent"
+msgstr "已� %s ��消�"
+
+#: classes/Command.php:216
+msgid "Error sending direct message."
+msgstr "��消�出错。"
+
+#: classes/Command.php:263
+msgid "Specify the name of the user to subscribe to"
+msgstr "指定�订阅的用户�"
+
+#: classes/Command.php:270
+#, php-format
+msgid "Subscribed to %s"
+msgstr "订阅 %s"
+
+#: classes/Command.php:288
+msgid "Specify the name of the user to unsubscribe from"
+msgstr "指定��消订阅的用户�"
+
+#: classes/Command.php:295
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr "�消订阅 %s"
+
+#: classes/Command.php:310 classes/Command.php:330
+msgid "Command not yet implemented."
+msgstr "命令尚未实现。"
+
+#: classes/Command.php:313
+msgid "Notification off."
+msgstr "通告关闭。"
+
+#: classes/Command.php:315
+msgid "Can't turn off notification."
+msgstr "无法关闭通告。"
+
+#: classes/Command.php:333
+msgid "Notification on."
+msgstr "通告开�。"
+
+#: classes/Command.php:335
+msgid "Can't turn on notification."
+msgstr "无法开�通告。"
+
+#: classes/Command.php:344
+msgid "Commands:\n"
+msgstr "命令：\n"
+
+#: classes/Message.php:53
+msgid "Could not insert message."
+msgstr "无法添加信�。"
+
+#: classes/Message.php:63
+msgid "Could not update message with new URI."
+msgstr "无法添加新URI的信�。"
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr "系统中没有相应用户的信�。"
+
+#: lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr "您的新的�布用的地�是 %1$s。\n\n"
+
+#: lib/mail.php:249
+#, php-format
+msgid "New private message from %s"
+msgstr "%s ��了新的�人信�"
+
+#: lib/mail.php:253
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+msgstr "%1$s (%2$s) ��了新的�人信�：\n\n"
+
+#: lib/mailbox.php:43
+msgid "Only the user can read their own mailboxes."
+msgstr "�有用户自己�以访问邮箱。"
+
+#: lib/openid.php:195
+msgid "This form should automatically submit itself. "
+msgstr "此表�会自动�交。"
+
+#: lib/personal.php:65
+msgid "Favorites"
+msgstr "收�夹"
+
+#: lib/personal.php:66
+#, php-format
+msgid "%s's favorite notices"
+msgstr "%s 收�的通告"
+
+#: lib/personal.php:66
+msgid "User"
+msgstr "用户"
+
+#: lib/personal.php:75
+msgid "Inbox"
+msgstr "收件箱"
+
+#: lib/personal.php:76
+msgid "Your incoming messages"
+msgstr "您接收的消�"
+
+#: lib/personal.php:80
+msgid "Outbox"
+msgstr "�件箱"
+
+#: lib/personal.php:81
+msgid "Your sent messages"
+msgstr "您��的消�"
+
+#: lib/settingsaction.php:99
+msgid "Twitter"
+msgstr "Twitter"
+
+#: lib/settingsaction.php:100
+msgid "Twitter integration options"
+msgstr "Twitter 整�选项"
+
+#: lib/util.php:1718
+msgid "To"
+msgstr "到"
+
+#: scripts/maildaemon.php:45
+msgid "Could not parse message."
+msgstr "无法解�消�。"
diff --git a/locale/zh_hant/LC_MESSAGES/laconica.po b/locale/zh_hant/LC_MESSAGES/laconica.po
new file mode 100644
index 000000000..5e96c56fb
--- /dev/null
+++ b/locale/zh_hant/LC_MESSAGES/laconica.po
@@ -0,0 +1,2985 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../actions/noticesearchrss.php:64
+#, php-format
+msgid " Search Stream for \"%s\""
+msgstr "�尋 \"%s\"相關資料"
+
+#: ../actions/finishopenidlogin.php:82 ../actions/register.php:193
+msgid ""
+" except this private data: password, email address, IM address, phone "
+"number."
+msgstr "�包�這些個人資料：密碼�電�信箱�線上�時通信箱�電話號碼"
+
+#: ../actions/subscribe.php:84
+#, php-format
+msgid "%1$s is now listening to your notices on %2$s."
+msgstr "�在%1$s在%2$s�為你的粉絲囉"
+
+#: ../actions/subscribe.php:86
+#, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s.\n"
+msgstr ""
+"�在%1$s在%2$s�為你的粉絲囉。\n"
+"\n\t%3$s\n\n\n%4$s.\n敬上。"
+
+#: ../actions/shownotice.php:45
+#, php-format
+msgid "%1$s's status on %2$s"
+msgstr "%1$s的狀態是%2$s"
+
+#: ../actions/publicrss.php:60
+#, php-format
+msgid "%s Public Stream"
+msgstr "%s的公開內容"
+
+#: ../actions/all.php:47 ../actions/allrss.php:70 ../lib/stream.php:45
+#, php-format
+msgid "%s and friends"
+msgstr "%s與好�"
+
+#: ../lib/util.php:233
+#, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by "
+"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+msgstr ""
+"*"
+"*"
+"%"
+"%site.name%%**是由[%%site.broughtby%%](%%site.broughtbyurl%%)所�供的微型部�格�務"
+
+#: ../lib/util.php:235
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%**是個微型部�格"
+
+#: ../lib/util.php:250 ../lib/util.php:274 lib/util.php:290
+msgid ". Contributors should be attributed by full name or nickname."
+msgstr "必須注明作者姓�或昵稱."
+
+#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
+#: ../actions/register.php:176
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1-64個�寫英文字�或數字，勿加標點符號或空格"
+
+#: ../actions/password.php:42 ../actions/register.php:178
+msgid "6 or more characters"
+msgstr "6個以上字元"
+
+#: ../actions/recoverpassword.php:165
+msgid "6 or more characters, and don't forget it!"
+msgstr "6個或6個以上字元，別忘了自己密碼喔"
+
+#: ../actions/imsettings.php:188
+#, php-format
+msgid ""
+"A confirmation code was sent to the IM address you added. You must approve "
+"%s for sending messages to you."
+msgstr "確�信已寄到你的線上�時通信箱。%s�給你得訊��先經�你的��。"
+
+#: ../lib/util.php:296
+msgid "About"
+msgstr "關於"
+
+#: ../actions/userauthorization.php:118
+msgid "Accept"
+msgstr "接�"
+
+#: ../actions/imsettings.php:64 ../actions/openidsettings.php:57
+msgid "Add"
+msgstr "新增"
+
+#: ../actions/openidsettings.php:43
+msgid "Add OpenID"
+msgstr "新增OpenID"
+
+#: ../actions/imsettings.php:39
+msgid "Address"
+msgstr "ä¿¡ç®±"
+
+#: ../actions/showstream.php:254
+msgid "All subscriptions"
+msgstr "所有訂閱"
+
+#: ../actions/publicrss.php:62
+#, php-format
+msgid "All updates for %s"
+msgstr "%s的所有新增內容"
+
+#: ../actions/noticesearchrss.php:66
+#, php-format
+msgid "All updates matching search term \"%s\""
+msgstr "所有符� \"%s\"的更新"
+
+#: ../actions/finishopenidlogin.php:29 ../actions/login.php:27
+#: ../actions/openidlogin.php:29 ../actions/register.php:28
+msgid "Already logged in."
+msgstr "已登入"
+
+#: ../actions/subscribe.php:48
+msgid "Already subscribed!."
+msgstr "此帳號已註冊"
+
+#: ../actions/userauthorization.php:76
+msgid "Authorize subscription"
+msgstr "註冊確�"
+
+#: ../actions/login.php:100 ../actions/register.php:184
+msgid "Automatically login in the future; not for shared computers!"
+msgstr "未來在�一部電腦自動登入"
+
+#: ../actions/avatar.php:32
+msgid "Avatar"
+msgstr "個人圖�"
+
+#: ../actions/avatar.php:113
+msgid "Avatar updated."
+msgstr "更新個人圖�"
+
+#: ../actions/imsettings.php:55
+#, php-format
+msgid ""
+"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
+"message with further instructions. (Did you add %s to your buddy list?)"
+msgstr "等待確�此信箱。看看你的Jabber/GTalk是�有訊�指示下一步動作。(你加入%s到你的好�清單了嗎？)"
+
+#: ../lib/util.php:1136
+msgid "Before »"
+msgstr "之�的內容»"
+
+#: ../actions/profilesettings.php:52
+msgid "Bio"
+msgstr "自我介紹"
+
+#: ../actions/profilesettings.php:93 ../actions/updateprofile.php:102
+msgid "Bio is too long (max 140 chars)."
+msgstr "自我介紹�長(共140個字元)"
+
+#: ../actions/updateprofile.php:118
+#, php-format
+msgid "Can't read avatar URL '%s'"
+msgstr "無法讀�此%sURL的圖�"
+
+#: ../actions/password.php:85 ../actions/recoverpassword.php:261
+msgid "Can't save new password."
+msgstr "無法存�新密碼"
+
+#: ../actions/imsettings.php:59
+msgid "Cancel"
+msgstr "�消"
+
+#: ../lib/openid.php:121 lib/openid.php:121
+msgid "Cannot instantiate OpenID consumer object."
+msgstr "無法�始化OpenID用戶�象(consumer object)"
+
+#: ../actions/imsettings.php:154
+msgid "Cannot normalize that Jabber ID"
+msgstr "此JabberID錯誤"
+
+#: ../actions/password.php:45
+msgid "Change"
+msgstr "更改"
+
+#: ../actions/password.php:32
+msgid "Change password"
+msgstr "更改密碼"
+
+#: ../actions/password.php:43 ../actions/recoverpassword.php:166
+#: ../actions/register.php:179
+msgid "Confirm"
+msgstr "確�"
+
+#: ../actions/confirmaddress.php:84
+msgid "Confirm Address"
+msgstr "確�信箱"
+
+#: ../actions/imsettings.php:213
+msgid "Confirmation cancelled."
+msgstr "確��消"
+
+#: ../actions/confirmaddress.php:38
+msgid "Confirmation code not found."
+msgstr "確�碼�失"
+
+#: ../actions/finishopenidlogin.php:91
+msgid "Connect"
+msgstr "連�"
+
+#: ../actions/finishopenidlogin.php:86
+msgid "Connect existing account"
+msgstr "與�有帳號連�"
+
+#: ../lib/util.php:304
+msgid "Contact"
+msgstr "好��單"
+
+#: ../lib/openid.php:178 lib/openid.php:178
+#, php-format
+msgid "Could not create OpenID form: %s"
+msgstr "無法從 %s 建立OpenID"
+
+#: ../lib/openid.php:160
+#, php-format
+msgid "Could not redirect to server: %s"
+msgstr "無法連�到伺�器:%s"
+
+#: ../actions/updateprofile.php:161
+msgid "Could not save avatar info"
+msgstr "無法存�個人圖�資料"
+
+#: ../actions/updateprofile.php:154
+msgid "Could not save new profile info"
+msgstr "無法存�新的個人資料"
+
+#: ../actions/profilesettings.php:146
+msgid "Couldn't confirm email."
+msgstr "無法確�信箱"
+
+#: ../actions/finishremotesubscribe.php:99
+#: actions/finishremotesubscribe.php:101
+msgid "Couldn't convert request tokens to access tokens."
+msgstr "無法轉�請求標記以致無法存�標記"
+
+#: ../actions/subscribe.php:59
+msgid "Couldn't create subscription."
+msgstr "註冊失敗"
+
+#: ../actions/confirmaddress.php:78 ../actions/imsettings.php:209
+msgid "Couldn't delete email confirmation."
+msgstr "無法�消信箱確�"
+
+#: ../actions/unsubscribe.php:56
+msgid "Couldn't delete subscription."
+msgstr "無法刪除帳號"
+
+#: ../actions/remotesubscribe.php:125 ../actions/remotesubscribe.php:127
+#: actions/remotesubscribe.php:136
+msgid "Couldn't get a request token."
+msgstr "無法�得轉�標記"
+
+#: ../actions/imsettings.php:178
+msgid "Couldn't insert confirmation code."
+msgstr "無法輸入確�碼"
+
+#: ../actions/finishremotesubscribe.php:180
+#: actions/finishremotesubscribe.php:182
+msgid "Couldn't insert new subscription."
+msgstr "無法新增訂閱"
+
+#: ../actions/profilesettings.php:175
+msgid "Couldn't save profile."
+msgstr "無法儲存個人資料"
+
+#: ../actions/confirmaddress.php:70 ../actions/imsettings.php:129
+#: ../actions/imsettings.php:234 ../actions/profilesettings.php:123
+msgid "Couldn't update user."
+msgstr "無法更新使用者"
+
+#: ../actions/finishopenidlogin.php:84
+msgid "Create"
+msgstr "新增"
+
+#: ../actions/finishopenidlogin.php:70
+msgid "Create a new user with this nickname."
+msgstr "以此暱稱新增使用者"
+
+#: ../actions/finishopenidlogin.php:68
+msgid "Create new account"
+msgstr "新增帳號"
+
+#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+msgid "Creating new account for OpenID that already has a user."
+msgstr "該OpenID已經注冊"
+
+#: ../actions/imsettings.php:45 actions/imsettings.php:46
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "目�已確�的Jabber/Gtalk地�"
+
+#: ../actions/showstream.php:337
+msgid "Currently"
+msgstr "目�"
+
+#: ../lib/util.php:893 ../lib/util.php:1061 lib/util.php:1110
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr "增加回覆時,資料庫發生錯誤: %s"
+
+#: ../actions/profilesettings.php:54 ../actions/profilesettings.php:51
+#: ../actions/register.php:172 actions/profilesettings.php:84
+#: actions/register.php:186
+msgid "Describe yourself and your interests in 140 chars"
+msgstr "請在140個字以內�述你自己與你的興趣"
+
+#: ../actions/register.php:181 ../actions/register.php:158
+#: ../actions/register.php:161 ../lib/settingsaction.php:87
+#: actions/register.php:172 actions/register.php:175 lib/settingsaction.php:87
+msgid "Email"
+msgstr "電�信箱"
+
+#: ../actions/profilesettings.php:46
+msgid "Email address"
+msgstr "電�信箱"
+
+#: ../actions/profilesettings.php:102 ../actions/register.php:63
+#: ../actions/register.php:73 actions/register.php:80
+msgid "Email address already exists."
+msgstr "此電�信箱已註冊�了"
+
+#: ../lib/mail.php:82 ../lib/mail.php:90 lib/mail.php:90
+msgid "Email address confirmation"
+msgstr "確�信箱"
+
+#: ../actions/recoverpassword.php:176 ../actions/recoverpassword.php:191
+#: actions/recoverpassword.php:197
+msgid "Enter a nickname or email address."
+msgstr "請輸入暱稱或電�信箱"
+
+#: ../actions/userauthorization.php:136 ../actions/userauthorization.php:137
+#: actions/userauthorization.php:144
+msgid "Error authorizing token"
+msgstr "授權錯誤(Error authorizing token)"
+
+#: ../actions/finishopenidlogin.php:282 ../actions/finishopenidlogin.php:253
+#: actions/finishopenidlogin.php:259
+msgid "Error connecting user to OpenID."
+msgstr "連接OpenID時發生錯誤"
+
+#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
+msgid "Error connecting user."
+msgstr "連接用戶時發生錯誤(Error connecting user.)"
+
+#: ../actions/finishremotesubscribe.php:151
+#: actions/finishremotesubscribe.php:153
+msgid "Error inserting avatar"
+msgstr "個人圖��入錯誤"
+
+#: ../actions/finishremotesubscribe.php:143
+#: actions/finishremotesubscribe.php:145
+msgid "Error inserting new profile"
+msgstr "新的更人資料輸入錯誤"
+
+#: ../actions/postnotice.php:88
+msgid "Error inserting notice"
+msgstr "新增訊�時發生錯誤"
+
+#: ../actions/finishremotesubscribe.php:167
+#: actions/finishremotesubscribe.php:169
+msgid "Error inserting remote profile"
+msgstr "新增外部個人資料發生錯誤(Error inserting remote profile)"
+
+#: ../actions/recoverpassword.php:201 ../actions/recoverpassword.php:240
+#: actions/recoverpassword.php:246
+msgid "Error saving address confirmation."
+msgstr "儲存信箱確�發生錯誤"
+
+#: ../actions/userauthorization.php:139 ../actions/userauthorization.php:140
+#: actions/userauthorization.php:147
+msgid "Error saving remote profile"
+msgstr "儲存�端個人資料發生錯誤"
+
+#: ../actions/finishopenidlogin.php:222 ../lib/openid.php:226
+#: lib/openid.php:226
+msgid "Error saving the profile."
+msgstr "儲存個人資料發生錯誤"
+
+#: ../lib/openid.php:237 lib/openid.php:237
+msgid "Error saving the user."
+msgstr "儲存使用者發生錯誤"
+
+#: ../actions/password.php:80 actions/profilesettings.php:399
+msgid "Error saving user; invalid."
+msgstr "儲存使用者發生錯誤;使用者�稱無效"
+
+#: ../actions/login.php:43 ../actions/login.php:69
+#: ../actions/recoverpassword.php:268 ../actions/register.php:73
+#: ../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
+msgid "Error setting user."
+msgstr "使用者設定發生錯誤"
+
+#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
+msgid "Error updating profile"
+msgstr "更新個人資料發生錯誤"
+
+#: ../actions/finishremotesubscribe.php:161
+#: actions/finishremotesubscribe.php:163
+msgid "Error updating remote profile"
+msgstr "更新�端個人資料發生錯誤"
+
+#: ../actions/recoverpassword.php:79 ../actions/recoverpassword.php:80
+#: actions/recoverpassword.php:80
+msgid "Error with confirmation code."
+msgstr "確�碼發生錯誤"
+
+#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
+msgid "Existing nickname"
+msgstr "這個暱稱已有人用了喔"
+
+#: ../lib/util.php:298 ../lib/util.php:326 lib/util.php:342
+msgid "FAQ"
+msgstr "常見�題"
+
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+msgid "Failed updating avatar."
+msgstr "無法上傳個人圖�"
+
+#: ../actions/all.php:61 ../actions/allrss.php:74 ../actions/allrss.php:64
+#: actions/all.php:61 actions/allrss.php:64
+#, php-format
+msgid "Feed for friends of %s"
+msgstr "發�給%s好�的訂閱"
+
+#: ../actions/replies.php:61 ../actions/repliesrss.php:80
+#: ../actions/replies.php:65 actions/replies.php:65 actions/repliesrss.php:66
+#, php-format
+msgid "Feed for replies to %s"
+msgstr "回應給%s的訂閱"
+
+#: ../actions/login.php:118 ../actions/login.php:122
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr "為安全起見，請先�新輸入你的使用者�稱與密碼�更改設定。"
+
+#: ../actions/profilesettings.php:44 ../actions/register.php:164
+#: actions/profilesettings.php:77 actions/register.php:178
+msgid "Full name"
+msgstr "全�"
+
+#: ../actions/profilesettings.php:90 ../actions/updateprofile.php:92
+#: ../actions/profilesettings.php:98 ../actions/register.php:79
+#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
+#: actions/register.php:86 actions/updateprofile.php:94
+msgid "Full name is too long (max 255 chars)."
+msgstr "全��長（最多255字元）"
+
+#: ../lib/util.php:279 ../lib/util.php:322 lib/util.php:338
+msgid "Help"
+msgstr "求救"
+
+#: ../lib/util.php:274 ../lib/util.php:298 lib/util.php:314
+msgid "Home"
+msgstr "主�"
+
+#: ../actions/profilesettings.php:49 ../actions/profilesettings.php:46
+#: ../actions/register.php:167 actions/profilesettings.php:79
+#: actions/register.php:181
+msgid "Homepage"
+msgstr "個人首�"
+
+#: ../actions/profilesettings.php:87 ../actions/profilesettings.php:95
+#: ../actions/register.php:76 actions/profilesettings.php:210
+#: actions/register.php:83
+msgid "Homepage is not a valid URL."
+msgstr "個人首���錯誤"
+
+#: ../actions/imsettings.php:61 ../actions/imsettings.php:60
+#: actions/imsettings.php:61
+msgid "IM Address"
+msgstr "線上�時通信箱"
+
+#: ../actions/imsettings.php:33 actions/imsettings.php:33
+msgid "IM Settings"
+msgstr "線上�時通設定"
+
+#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your OpenID."
+msgstr "若已經註冊�了，請輸入使用者�稱與密碼連�到你的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到你的帳號，請在下方空格輸入並勾�『新增�"
+
+#: ../actions/recoverpassword.php:122
+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 "若忘記或�失密碼，我們會寄新的密碼到你帳號中的信箱。"
+
+#: ../actions/password.php:69 actions/profilesettings.php:388
+msgid "Incorrect old password"
+msgstr "舊密碼錯誤"
+
+#: ../actions/login.php:63 ../actions/login.php:67 actions/login.php:67
+msgid "Incorrect username or password."
+msgstr "使用者�稱或密碼錯誤"
+
+#: ../actions/recoverpassword.php:226 ../actions/recoverpassword.php:265
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr "我們已寄出一�信到你帳號中的信箱，告訴你如何�回你的密碼。"
+
+#: ../actions/updateprofile.php:113 ../actions/updateprofile.php:114
+#: actions/updateprofile.php:115
+#, php-format
+msgid "Invalid avatar URL '%s'"
+msgstr "個人圖�連�%s無效"
+
+#: ../actions/updateprofile.php:97 ../actions/updateprofile.php:98
+#: actions/updateprofile.php:99
+#, php-format
+msgid "Invalid homepage '%s'"
+msgstr "個人首�連�%s無效"
+
+#: ../actions/updateprofile.php:81 ../actions/updateprofile.php:82
+#: actions/updateprofile.php:83
+#, php-format
+msgid "Invalid license URL '%s'"
+msgstr ""
+
+#: ../actions/postnotice.php:61 actions/postnotice.php:62
+msgid "Invalid notice content"
+msgstr ""
+
+#: ../actions/postnotice.php:67 actions/postnotice.php:68
+msgid "Invalid notice uri"
+msgstr ""
+
+#: ../actions/postnotice.php:72 actions/postnotice.php:73
+msgid "Invalid notice url"
+msgstr ""
+
+#: ../actions/updateprofile.php:86 ../actions/updateprofile.php:87
+#: actions/updateprofile.php:88
+#, php-format
+msgid "Invalid profile URL '%s'."
+msgstr "個人資料連�%s無效"
+
+#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
+msgid "Invalid profile URL (bad format)"
+msgstr "個人資料連�無效(格�錯誤)"
+
+#: ../actions/finishremotesubscribe.php:77
+#: actions/finishremotesubscribe.php:79
+msgid "Invalid profile URL returned by server."
+msgstr ""
+
+#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
+msgid "Invalid size."
+msgstr "尺寸錯誤"
+
+#: ../actions/finishopenidlogin.php:264 ../actions/register.php:68
+#: ../actions/register.php:84 ../actions/finishopenidlogin.php:235
+#: ../actions/register.php:93 ../actions/register.php:111
+#: actions/finishopenidlogin.php:241 actions/register.php:103
+#: actions/register.php:121
+msgid "Invalid username or password."
+msgstr "使用者�稱或密碼無效"
+
+#: ../lib/util.php:237 ../lib/util.php:261 lib/util.php:277
+#, 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 ""
+
+#: ../actions/imsettings.php:164 ../actions/imsettings.php:173
+#: actions/imsettings.php:181
+msgid "Jabber ID already belongs to another user."
+msgstr "此Jabber ID已有人使用"
+
+#: ../actions/imsettings.php:63 ../actions/imsettings.php:62
+#: actions/imsettings.php:63
+#, 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 ""
+
+#: ../actions/profilesettings.php:55 ../actions/profilesettings.php:52
+#: ../actions/register.php:173 actions/profilesettings.php:85
+#: actions/register.php:187
+msgid "Location"
+msgstr "地點"
+
+#: ../actions/profilesettings.php:96 ../actions/updateprofile.php:107
+#: ../actions/profilesettings.php:104 ../actions/register.php:85
+#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
+#: actions/register.php:92 actions/updateprofile.php:109
+msgid "Location is too long (max 255 chars)."
+msgstr "地點�長（共255個字）"
+
+#: ../actions/login.php:93 ../actions/login.php:102
+#: ../actions/openidlogin.php:68 ../lib/util.php:286 ../actions/login.php:97
+#: ../actions/login.php:106 ../lib/util.php:310 actions/login.php:97
+#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
+msgid "Login"
+msgstr "登入"
+
+#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#, php-format
+msgid "Login with an [OpenID](%%doc.openid%%) account."
+msgstr "用OpenID(%%doc.openid%%)帳號登入"
+
+#: ../actions/login.php:122 ../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 ""
+"è"
+"¼"
+"¸"
+"å"
+"…"
+"¥"
+"ä"
+"½"
+"¿"
+"ç"
+"”"
+"¨"
+"è"
+"€"
+"…"
+"å"
+"�"
+"�"
+"ç"
+"¨"
+"±èˆ‡å¯†ç¢¼ç™»å…¥ã€‚還沒有使用者å��稱嗎？[註冊](%%action.register%%)一個新帳號，或使用[OpenID](%%action.openidlogin%%)。"
+
+#: ../lib/util.php:284 ../lib/util.php:308 lib/util.php:324
+msgid "Logout"
+msgstr "登出"
+
+#: ../actions/login.php:106 ../actions/login.php:110 actions/login.php:110
+msgid "Lost or forgotten password?"
+msgstr "�失或忘記密碼了嗎？"
+
+#: ../actions/showstream.php:281 ../actions/showstream.php:300
+#: actions/showstream.php:315
+msgid "Member since"
+msgstr "何時加入會員的呢？"
+
+#: ../actions/userrss.php:70 actions/userrss.php:67
+#, php-format
+msgid "Microblog by %s"
+msgstr "&s的微型部�格"
+
+#: ../actions/finishopenidlogin.php:79 ../actions/register.php:190
+#: ../actions/register.php:188 actions/finishopenidlogin.php:85
+#: actions/register.php:202
+msgid "My text and files are available under "
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
+msgid "New nickname"
+msgstr "新暱稱"
+
+#: ../actions/newnotice.php:100 ../actions/newnotice.php:87
+#: actions/newnotice.php:96
+msgid "New notice"
+msgstr "新訊�"
+
+#: ../actions/password.php:41 ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:179 actions/profilesettings.php:180
+#: actions/recoverpassword.php:185
+msgid "New password"
+msgstr "新密碼"
+
+#: ../actions/recoverpassword.php:275 ../actions/recoverpassword.php:314
+msgid "New password successfully saved. You are now logged in."
+msgstr "新密碼已儲存�功。你已登入。"
+
+#: ../actions/login.php:97 ../actions/profilesettings.php:41
+#: ../actions/register.php:175 ../actions/login.php:101
+#: ../actions/register.php:151 actions/login.php:101
+#: actions/profilesettings.php:74 actions/register.php:165
+msgid "Nickname"
+msgstr "暱稱"
+
+#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:99
+#: ../actions/register.php:59 ../actions/profilesettings.php:110
+#: ../actions/register.php:69 actions/finishopenidlogin.php:181
+#: actions/profilesettings.php:225 actions/register.php:76
+msgid "Nickname already in use. Try another one."
+msgstr "此暱稱已有人使用。�試試看別的�。"
+
+#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:80
+#: ../actions/register.php:57 ../actions/updateprofile.php:76
+#: ../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
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "暱稱請用�寫字�或數字，勿加空格。"
+
+#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+msgid "Nickname not allowed."
+msgstr "此暱稱無法使用"
+
+#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
+msgid "Nickname of the user you want to follow"
+msgstr "你想�為誰的粉絲呢？請輸入他/她的暱稱。"
+
+#: ../actions/recoverpassword.php:147 ../actions/recoverpassword.php:162
+#: actions/recoverpassword.php:167
+msgid "Nickname or email"
+msgstr "暱稱或信箱"
+
+#: ../actions/imsettings.php:147 ../actions/imsettings.php:156
+#: actions/imsettings.php:164
+msgid "No Jabber ID."
+msgstr "查無此Jabber ID"
+
+#: ../actions/userauthorization.php:128 ../actions/userauthorization.php:129
+#: actions/userauthorization.php:136
+msgid "No authorization request!"
+msgstr "無確�請求"
+
+#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
+msgid "No confirmation code."
+msgstr "無確�碼"
+
+#: ../actions/newnotice.php:49 ../actions/newnotice.php:44
+#: actions/newmessage.php:53 actions/newnotice.php:44 classes/Command.php:197
+msgid "No content!"
+msgstr "無內容"
+
+#: ../actions/userbyid.php:27 ../actions/userbyid.php:32
+#: actions/userbyid.php:32
+msgid "No id."
+msgstr ""
+
+#: ../actions/finishremotesubscribe.php:65
+#: actions/finishremotesubscribe.php:67
+msgid "No nickname provided by remote server."
+msgstr "無�端伺�器�供的暱稱"
+
+#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
+msgid "No nickname."
+msgstr "無暱稱"
+
+#: ../actions/imsettings.php:197 ../actions/emailsettings.php:222
+#: ../actions/imsettings.php:206 ../actions/smssettings.php:229
+#: actions/emailsettings.php:240 actions/imsettings.php:214
+#: actions/smssettings.php:237
+msgid "No pending confirmation to cancel."
+msgstr ""
+
+#: ../actions/finishremotesubscribe.php:72
+#: actions/finishremotesubscribe.php:74
+msgid "No profile URL returned by server."
+msgstr ""
+
+#: ../actions/recoverpassword.php:189 ../actions/recoverpassword.php:226
+#: actions/recoverpassword.php:232
+msgid "No registered email address for that user."
+msgstr "查無此使用者所註冊的信箱"
+
+#: ../actions/userauthorization.php:48 ../actions/userauthorization.php:49
+#: actions/userauthorization.php:55
+msgid "No request found!"
+msgstr "目�無請求"
+
+#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
+#: actions/noticesearch.php:69 actions/peoplesearch.php:69
+msgid "No results"
+msgstr "無�果"
+
+#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
+msgid "No size."
+msgstr "無尺寸"
+
+#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
+msgid "No such OpenID."
+msgstr "ç„¡æ­¤OpenID"
+
+#: ../actions/doc.php:29 actions/doc.php:29
+msgid "No such document."
+msgstr "無此文件"
+
+#: ../actions/shownotice.php:32 ../actions/shownotice.php:65
+#: ../actions/shownotice.php:83 ../lib/deleteaction.php:30
+#: actions/shownotice.php:32 actions/shownotice.php:83 lib/deleteaction.php:30
+msgid "No such notice."
+msgstr "無此通知"
+
+#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
+msgid "No such recovery code."
+msgstr "無此�復碼"
+
+#: ../actions/postnotice.php:56 actions/postnotice.php:57
+msgid "No such subscription"
+msgstr "無此訂閱"
+
+#: ../actions/all.php:34 ../actions/allrss.php:35
+#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:36
+#: ../actions/recoverpassword.php:185 ../actions/remotesubscribe.php:84
+#: ../actions/remotesubscribe.php:91 ../actions/repliesrss.php:35
+#: ../actions/showstream.php:95 ../actions/subscribe.php:43
+#: ../actions/unsubscribe.php:38 ../actions/userbyid.php:31
+#: ../actions/userrss.php:35 ../actions/xrds.php:31 ../lib/gallery.php:53
+#: ../actions/foaf.php:40 ../actions/replies.php:57
+#: ../actions/showstream.php:110 ../actions/userbyid.php:36
+#: ../actions/xrds.php:35 ../lib/gallery.php:57 ../lib/subs.php:33
+#: ../lib/subs.php:82 actions/all.php:34 actions/allrss.php:35
+#: actions/avatarbynickname.php:43 actions/favoritesrss.php:35
+#: actions/foaf.php:40 actions/ical.php:31 actions/remotesubscribe.php:93
+#: actions/remotesubscribe.php:100 actions/replies.php:57
+#: actions/repliesrss.php:35 actions/showfavorites.php:34
+#: actions/showstream.php:110 actions/userbyid.php:36 actions/userrss.php:35
+#: actions/xrds.php:35 classes/Command.php:120 classes/Command.php:162
+#: classes/Command.php:203 classes/Command.php:237 lib/gallery.php:62
+#: lib/mailbox.php:36 lib/subs.php:33 lib/subs.php:95
+msgid "No such user."
+msgstr "無此使用者"
+
+#: ../lib/gallery.php:76 ../lib/gallery.php:80 lib/gallery.php:85
+msgid "Nobody to show!"
+msgstr ""
+
+#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
+msgid "Not a recovery code."
+msgstr "此�復碼錯誤"
+
+#: ../actions/imsettings.php:158 ../actions/imsettings.php:167
+#: actions/imsettings.php:175
+msgid "Not a valid Jabber ID"
+msgstr "此JabberID無效"
+
+#: ../lib/openid.php:131 lib/openid.php:131
+msgid "Not a valid OpenID."
+msgstr "此OpenID無效"
+
+#: ../actions/profilesettings.php:75 ../actions/register.php:53
+#: ../actions/register.php:63 actions/register.php:70
+msgid "Not a valid email address."
+msgstr "此信箱無效"
+
+#: ../actions/profilesettings.php:83 ../actions/register.php:61
+#: ../actions/profilesettings.php:91 ../actions/register.php:71
+#: actions/profilesettings.php:206 actions/register.php:78
+msgid "Not a valid nickname."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:118 ../actions/remotesubscribe.php:120
+#: actions/remotesubscribe.php:129
+msgid "Not a valid profile URL (incorrect services)."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:111 ../actions/remotesubscribe.php:113
+#: actions/remotesubscribe.php:122
+msgid "Not a valid profile URL (no XRDS defined)."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
+msgid "Not a valid profile URL (no YADIS document)."
+msgstr ""
+
+#: ../actions/avatar.php:95 actions/profilesettings.php:332
+msgid "Not an image or corrupt file."
+msgstr ""
+
+#: ../actions/finishremotesubscribe.php:51
+#: actions/finishremotesubscribe.php:53
+msgid "Not authorized."
+msgstr ""
+
+#: ../actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38
+msgid "Not expecting this response!"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:29 ../actions/logout.php:28
+#: ../actions/newnotice.php:29 ../actions/subscribe.php:27
+#: ../actions/unsubscribe.php:24 ../lib/settingsaction.php:27
+#: ../actions/logout.php:33 ../actions/subscribe.php:28
+#: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
+#: actions/disfavor.php:29 actions/favor.php:30 actions/finishaddopenid.php:29
+#: actions/logout.php:33 actions/newmessage.php:28 actions/newnotice.php:29
+#: actions/subscribe.php:28 actions/unsubscribe.php:25 lib/deleteaction.php:38
+#: lib/settingsaction.php:27
+msgid "Not logged in."
+msgstr ""
+
+#: ../actions/unsubscribe.php:43 ../lib/subs.php:91 lib/subs.php:104
+msgid "Not subscribed!."
+msgstr ""
+
+#: ../actions/showstream.php:82 actions/showstream.php:82
+#, php-format
+msgid "Notice feed for %s"
+msgstr ""
+
+#: ../actions/shownotice.php:39 actions/shownotice.php:39
+msgid "Notice has no profile"
+msgstr ""
+
+#: ../actions/showstream.php:297 ../actions/showstream.php:316
+#: actions/showstream.php:331
+msgid "Notices"
+msgstr ""
+
+#: ../actions/password.php:39 actions/profilesettings.php:178
+msgid "Old password"
+msgstr ""
+
+#: ../lib/util.php:288 ../lib/settingsaction.php:96 ../lib/util.php:314
+#: lib/settingsaction.php:90 lib/util.php:330
+msgid "OpenID"
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
+msgid "OpenID Account Setup"
+msgstr ""
+
+#: ../lib/openid.php:180 lib/openid.php:180
+msgid "OpenID Auto-Submit"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
+#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
+#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
+msgid "OpenID Login"
+msgstr ""
+
+#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
+#: actions/openidlogin.php:74 actions/openidsettings.php:50
+msgid "OpenID URL"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
+#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
+msgid "OpenID authentication cancelled."
+msgstr ""
+
+#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
+#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
+#, php-format
+msgid "OpenID authentication failed: %s"
+msgstr ""
+
+#: ../lib/openid.php:133 lib/openid.php:133
+#, php-format
+msgid "OpenID failure: %s"
+msgstr ""
+
+#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
+msgid "OpenID removed."
+msgstr ""
+
+#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
+msgid "OpenID settings"
+msgstr ""
+
+#: ../actions/avatar.php:84 actions/profilesettings.php:321
+msgid "Partial upload."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:90 ../actions/login.php:98
+#: ../actions/register.php:177 ../actions/login.php:102
+#: ../actions/register.php:153 ../lib/settingsaction.php:93
+#: actions/finishopenidlogin.php:96 actions/login.php:102
+#: actions/register.php:167
+msgid "Password"
+msgstr ""
+
+#: ../actions/recoverpassword.php:249 ../actions/recoverpassword.php:288
+#: actions/recoverpassword.php:301
+msgid "Password and confirmation do not match."
+msgstr ""
+
+#: ../actions/recoverpassword.php:245 ../actions/recoverpassword.php:284
+#: actions/recoverpassword.php:297
+msgid "Password must be 6 chars or more."
+msgstr ""
+
+#: ../actions/recoverpassword.php:222 ../actions/recoverpassword.php:224
+#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
+#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
+msgid "Password recovery requested"
+msgstr ""
+
+#: ../actions/password.php:89 ../actions/recoverpassword.php:274
+#: ../actions/recoverpassword.php:313 actions/profilesettings.php:408
+#: actions/recoverpassword.php:326
+msgid "Password saved."
+msgstr ""
+
+#: ../actions/password.php:61 ../actions/register.php:65
+#: ../actions/register.php:88 actions/profilesettings.php:380
+#: actions/register.php:98
+msgid "Passwords don't match."
+msgstr ""
+
+#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
+msgid "People search"
+msgstr ""
+
+#: ../lib/stream.php:44 ../lib/stream.php:50 lib/personal.php:50
+msgid "Personal"
+msgstr ""
+
+#: ../actions/userauthorization.php:77 ../actions/userauthorization.php:78
+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 \"Cancel\"."
+msgstr ""
+
+#: ../actions/imsettings.php:74 ../actions/imsettings.php:73
+#: actions/imsettings.php:74
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr ""
+
+#: ../actions/imsettings.php:68 ../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
+msgid "Preferences"
+msgstr ""
+
+#: ../actions/imsettings.php:135 ../actions/emailsettings.php:162
+#: ../actions/imsettings.php:144 ../actions/smssettings.php:163
+#: actions/emailsettings.php:180 actions/imsettings.php:152
+#: actions/smssettings.php:171
+msgid "Preferences saved."
+msgstr ""
+
+#: ../lib/util.php:300 ../lib/util.php:328 lib/util.php:344
+msgid "Privacy"
+msgstr ""
+
+#: ../actions/newnotice.php:61 ../actions/newnotice.php:69
+#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
+#: classes/Notice.php:119
+msgid "Problem saving notice."
+msgstr ""
+
+#: ../lib/stream.php:54 ../lib/settingsaction.php:84 ../lib/stream.php:60
+#: lib/personal.php:60 lib/settingsaction.php:84
+msgid "Profile"
+msgstr ""
+
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
+msgid "Profile URL"
+msgstr ""
+
+#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
+msgid "Profile settings"
+msgstr ""
+
+#: ../actions/postnotice.php:51 ../actions/updateprofile.php:51
+#: ../actions/updateprofile.php:52 actions/postnotice.php:52
+#: actions/updateprofile.php:53
+msgid "Profile unknown"
+msgstr ""
+
+#: ../lib/util.php:276
+msgid "Public"
+msgstr ""
+
+#: ../actions/public.php:54 actions/public.php:54
+msgid "Public Stream Feed"
+msgstr ""
+
+#: ../actions/public.php:33 actions/public.php:33
+msgid "Public timeline"
+msgstr ""
+
+#: ../actions/recoverpassword.php:151 ../actions/recoverpassword.php:166
+#: actions/recoverpassword.php:171
+msgid "Recover"
+msgstr ""
+
+#: ../actions/recoverpassword.php:141 ../actions/recoverpassword.php:156
+#: actions/recoverpassword.php:161
+msgid "Recover password"
+msgstr ""
+
+#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
+msgid "Recovery code for unknown user."
+msgstr ""
+
+#: ../actions/register.php:171 ../actions/register.php:195 ../lib/util.php:287
+#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
+#: actions/register.php:152 actions/register.php:207 lib/util.php:328
+msgid "Register"
+msgstr ""
+
+#: ../actions/userauthorization.php:119 ../actions/userauthorization.php:120
+#: actions/userauthorization.php:127
+msgid "Reject"
+msgstr ""
+
+#: ../actions/login.php:99 ../actions/register.php:183
+#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
+#: actions/register.php:190
+msgid "Remember me"
+msgstr ""
+
+#: ../actions/updateprofile.php:69 ../actions/updateprofile.php:70
+#: actions/updateprofile.php:71
+msgid "Remote profile with no matching profile"
+msgstr ""
+
+#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+msgid "Remote subscribe"
+msgstr ""
+
+#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
+#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
+#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
+#: actions/emailsettings.php:48 actions/emailsettings.php:76
+#: actions/imsettings.php:49 actions/openidsettings.php:108
+#: actions/smssettings.php:50 actions/smssettings.php:84
+#: actions/twittersettings.php:59
+msgid "Remove"
+msgstr ""
+
+#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
+msgid "Remove OpenID"
+msgstr ""
+
+#: ../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 ""
+
+#: ../lib/stream.php:49 ../lib/stream.php:55 lib/personal.php:55
+msgid "Replies"
+msgstr ""
+
+#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:50
+#: ../lib/stream.php:56 actions/replies.php:47 actions/repliesrss.php:62
+#: lib/personal.php:56
+#, php-format
+msgid "Replies to %s"
+msgstr ""
+
+#: ../actions/recoverpassword.php:168 ../actions/recoverpassword.php:183
+#: actions/recoverpassword.php:189
+msgid "Reset"
+msgstr ""
+
+#: ../actions/recoverpassword.php:158 ../actions/recoverpassword.php:173
+#: actions/recoverpassword.php:178
+msgid "Reset password"
+msgstr ""
+
+#: ../actions/recoverpassword.php:167 ../actions/register.php:180
+#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
+msgid "Same as password above"
+msgstr ""
+
+#: ../actions/imsettings.php:76 ../actions/profilesettings.php:58
+#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
+#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
+#: actions/emailsettings.php:104 actions/imsettings.php:82
+#: actions/profilesettings.php:101 actions/smssettings.php:100
+#: actions/twittersettings.php:83
+msgid "Save"
+msgstr ""
+
+#: ../lib/searchaction.php:73 ../lib/util.php:277 ../lib/searchaction.php:84
+#: ../lib/util.php:300 lib/searchaction.php:84 lib/util.php:316
+msgid "Search"
+msgstr ""
+
+#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+msgid "Search Stream Feed"
+msgstr ""
+
+#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#, php-format
+msgid ""
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
+msgstr ""
+
+#: ../actions/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 ""
+
+#: ../lib/util.php:982 ../actions/invite.php:137 ../lib/util.php:1172
+#: actions/invite.php:145 lib/util.php:1306 lib/util.php:1731
+msgid "Send"
+msgstr ""
+
+#: ../actions/imsettings.php:71 ../actions/imsettings.php:70
+#: actions/imsettings.php:71
+msgid "Send me notices through Jabber/GTalk."
+msgstr ""
+
+#: ../lib/util.php:282 ../lib/util.php:304 lib/util.php:320
+msgid "Settings"
+msgstr ""
+
+#: ../actions/profilesettings.php:183 ../actions/profilesettings.php:192
+#: actions/profilesettings.php:307
+msgid "Settings saved."
+msgstr ""
+
+#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
+msgid "Someone else already has this OpenID."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
+#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
+msgid "Something weird happened."
+msgstr ""
+
+#: ../lib/util.php:302 ../lib/util.php:330 lib/util.php:346
+msgid "Source"
+msgstr ""
+
+#: ../actions/showstream.php:277 ../actions/showstream.php:296
+#: actions/showstream.php:311
+msgid "Statistics"
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:275
+#: ../actions/finishopenidlogin.php:246 actions/finishopenidlogin.php:188
+#: actions/finishopenidlogin.php:252
+msgid "Stored OpenID not found."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:172
+#: ../actions/showstream.php:181 ../actions/showstream.php:188
+#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
+#: actions/showstream.php:197 actions/showstream.php:206
+msgid "Subscribe"
+msgstr ""
+
+#: ../actions/showstream.php:294 ../actions/subscribers.php:27
+#: ../actions/showstream.php:313 actions/showstream.php:328
+#: actions/subscribers.php:27
+msgid "Subscribers"
+msgstr ""
+
+#: ../actions/userauthorization.php:309 ../actions/userauthorization.php:310
+#: actions/userauthorization.php:322
+msgid "Subscription authorized"
+msgstr ""
+
+#: ../actions/userauthorization.php:319 ../actions/userauthorization.php:320
+#: actions/userauthorization.php:332
+msgid "Subscription rejected"
+msgstr ""
+
+#: ../actions/showstream.php:212 ../actions/showstream.php:288
+#: ../actions/subscriptions.php:27 ../actions/showstream.php:230
+#: ../actions/showstream.php:307 actions/showstream.php:240
+#: actions/showstream.php:322 actions/subscriptions.php:27
+msgid "Subscriptions"
+msgstr ""
+
+#: ../actions/avatar.php:87 actions/profilesettings.php:324
+msgid "System error uploading file."
+msgstr ""
+
+#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
+msgid "Text search"
+msgstr ""
+
+#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
+msgid "That OpenID does not belong to you."
+msgstr ""
+
+#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
+msgid "That address has already been confirmed."
+msgstr ""
+
+#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
+msgid "That confirmation code is not for you!"
+msgstr ""
+
+#: ../actions/avatar.php:80 actions/profilesettings.php:317
+msgid "That file is too big."
+msgstr ""
+
+#: ../actions/imsettings.php:161 ../actions/imsettings.php:170
+#: actions/imsettings.php:178
+msgid "That is already your Jabber ID."
+msgstr ""
+
+#: ../actions/imsettings.php:224 ../actions/imsettings.php:233
+#: actions/imsettings.php:241
+msgid "That is not your Jabber ID."
+msgstr ""
+
+#: ../actions/imsettings.php:201 ../actions/emailsettings.php:226
+#: ../actions/imsettings.php:210 actions/emailsettings.php:244
+#: actions/imsettings.php:218
+msgid "That is the wrong IM address."
+msgstr ""
+
+#: ../actions/newnotice.php:52 ../actions/newnotice.php:49
+#: ../actions/twitapistatuses.php:408 actions/newnotice.php:49
+#: actions/twitapistatuses.php:330
+msgid "That's too long. Max notice size is 140 chars."
+msgstr ""
+
+#: ../actions/confirmaddress.php:86 ../actions/confirmaddress.php:92
+#: actions/confirmaddress.php:92
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr ""
+
+#: ../actions/imsettings.php:241 ../actions/emailsettings.php:264
+#: ../actions/imsettings.php:250 ../actions/smssettings.php:274
+#: actions/emailsettings.php:282 actions/imsettings.php:258
+#: actions/smssettings.php:282
+msgid "The address was removed."
+msgstr ""
+
+#: ../actions/userauthorization.php:311 ../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 ""
+
+#: ../actions/userauthorization.php:321 ../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 ""
+
+#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#, php-format
+msgid "These are the people who listen to %s's notices."
+msgstr ""
+
+#: ../actions/subscribers.php:33 actions/subscribers.php:33
+msgid "These are the people who listen to your notices."
+msgstr ""
+
+#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#, php-format
+msgid "These are the people whose notices %s listens to."
+msgstr ""
+
+#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+msgid "These are the people whose notices you listen to."
+msgstr ""
+
+#: ../actions/recoverpassword.php:87 ../actions/recoverpassword.php:88
+msgid "This confirmation code is too old. Please start again."
+msgstr ""
+
+#: ../lib/openid.php:195
+msgid ""
+"This form should automatically submit itself. If not, click the submit "
+"button to go to your OpenID provider."
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
+#, php-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../lib/util.php:147 ../lib/util.php:164 lib/util.php:246
+msgid "This page is not available in a media type you accept"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/profilesettings.php:51 ../actions/profilesettings.php:48
+#: ../actions/register.php:169 actions/profilesettings.php:81
+#: actions/register.php:183
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr ""
+
+#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
+msgid "URL of your profile on another compatible microblogging service"
+msgstr ""
+
+#: ../actions/imsettings.php:105 ../actions/recoverpassword.php:39
+#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
+#: ../actions/smssettings.php:135 actions/emailsettings.php:144
+#: actions/imsettings.php:118 actions/recoverpassword.php:39
+#: actions/smssettings.php:143 actions/twittersettings.php:108
+msgid "Unexpected form submission."
+msgstr ""
+
+#: ../actions/recoverpassword.php:237 ../actions/recoverpassword.php:276
+#: actions/recoverpassword.php:289
+msgid "Unexpected password reset."
+msgstr ""
+
+#: ../actions/finishremotesubscribe.php:58
+#: actions/finishremotesubscribe.php:60
+msgid "Unknown version of OMB protocol."
+msgstr ""
+
+#: ../lib/util.php:245 ../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 ""
+
+#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr ""
+
+#: ../actions/showstream.php:193 ../actions/showstream.php:209
+#: actions/showstream.php:219
+msgid "Unsubscribe"
+msgstr ""
+
+#: ../actions/postnotice.php:44 ../actions/updateprofile.php:44
+#: ../actions/updateprofile.php:45 actions/postnotice.php:45
+#: actions/updateprofile.php:46
+msgid "Unsupported OMB version"
+msgstr ""
+
+#: ../actions/avatar.php:105 actions/profilesettings.php:342
+msgid "Unsupported image file format."
+msgstr ""
+
+#: ../actions/avatar.php:68 actions/profilesettings.php:161
+msgid "Upload"
+msgstr ""
+
+#: ../actions/avatar.php:27
+msgid ""
+"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 license, also. Use a picture that belongs to you and that you want to "
+"share."
+msgstr ""
+
+#: ../actions/profilesettings.php:48 ../actions/register.php:182
+#: ../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 ""
+
+#: ../actions/finishremotesubscribe.php:86
+#: actions/finishremotesubscribe.php:88
+msgid "User being listened to doesn't exist."
+msgstr ""
+
+#: ../actions/all.php:41 ../actions/avatarbynickname.php:48
+#: ../actions/foaf.php:43 ../actions/replies.php:41
+#: ../actions/showstream.php:44 ../actions/foaf.php:47
+#: ../actions/twitapiaccount.php:82 ../actions/twitapistatuses.php:319
+#: ../actions/twitapistatuses.php:685 ../actions/twitapiusers.php:82
+#: actions/all.php:41 actions/avatarbynickname.php:48 actions/foaf.php:47
+#: actions/replies.php:41 actions/showfavorites.php:41
+#: actions/showstream.php:44 actions/twitapiaccount.php:80
+#: actions/twitapifavorites.php:68 actions/twitapistatuses.php:235
+#: actions/twitapistatuses.php:609 actions/twitapiusers.php:87
+#: lib/mailbox.php:50
+msgid "User has no profile."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
+msgid "User nickname"
+msgstr ""
+
+#: ../lib/util.php:969 ../lib/util.php:1159 lib/util.php:1293
+#, php-format
+msgid "What's up, %s?"
+msgstr ""
+
+#: ../actions/profilesettings.php:57 ../actions/profilesettings.php:54
+#: ../actions/register.php:175 actions/profilesettings.php:87
+#: actions/register.php:189
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr ""
+
+#: ../actions/updateprofile.php:127 ../actions/updateprofile.php:128
+#: actions/updateprofile.php:129
+#, php-format
+msgid "Wrong image type for '%s'"
+msgstr ""
+
+#: ../actions/updateprofile.php:122 ../actions/updateprofile.php:123
+#: actions/updateprofile.php:124
+#, php-format
+msgid "Wrong size image at '%s'"
+msgstr ""
+
+#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
+msgid "You already have this OpenID!"
+msgstr ""
+
+#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
+msgid "You are already logged in!"
+msgstr ""
+
+#: ../actions/password.php:27
+msgid "You can change your password here. Choose a good one!"
+msgstr ""
+
+#: ../actions/register.php:164 ../actions/register.php:135
+#: actions/register.php:145
+msgid "You can create a new account to start posting notices."
+msgstr ""
+
+#: ../actions/openidsettings.php:86
+msgid ""
+"You can remove an OpenID from your account by clicking the button marked "
+"\"Remove\"."
+msgstr ""
+
+#: ../actions/imsettings.php:28 actions/imsettings.php:28
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
+msgstr ""
+
+#: ../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
+msgid "You can use the local subscription!"
+msgstr ""
+
+#: ../actions/finishopenidlogin.php:33 ../actions/register.php:51
+#: ../actions/register.php:61 actions/finishopenidlogin.php:38
+#: actions/register.php:68
+msgid "You can't register if you don't agree to the license."
+msgstr ""
+
+#: ../actions/updateprofile.php:62 ../actions/updateprofile.php:63
+#: actions/updateprofile.php:64
+msgid "You did not send us that profile"
+msgstr ""
+
+#: ../actions/recoverpassword.php:134 ../actions/recoverpassword.php:149
+msgid "You've been identified. Enter a  new password below. "
+msgstr ""
+
+#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+msgid "Your OpenID URL"
+msgstr ""
+
+#: ../actions/recoverpassword.php:149 ../actions/recoverpassword.php:164
+msgid "Your nickname on this server, or your registered email address."
+msgstr ""
+
+#: ../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 ""
+
+#: ../lib/util.php:814 ../lib/util.php:943 lib/util.php:992
+msgid "a few seconds ago"
+msgstr ""
+
+#: ../lib/util.php:826 ../lib/util.php:955 lib/util.php:1004
+#, php-format
+msgid "about %d days ago"
+msgstr ""
+
+#: ../lib/util.php:822 ../lib/util.php:951 lib/util.php:1000
+#, php-format
+msgid "about %d hours ago"
+msgstr ""
+
+#: ../lib/util.php:818 ../lib/util.php:947 lib/util.php:996
+#, php-format
+msgid "about %d minutes ago"
+msgstr ""
+
+#: ../lib/util.php:830 ../lib/util.php:959 lib/util.php:1008
+#, php-format
+msgid "about %d months ago"
+msgstr ""
+
+#: ../lib/util.php:824 ../lib/util.php:953 lib/util.php:1002
+msgid "about a day ago"
+msgstr ""
+
+#: ../lib/util.php:816 ../lib/util.php:945 lib/util.php:994
+msgid "about a minute ago"
+msgstr ""
+
+#: ../lib/util.php:828 ../lib/util.php:957 lib/util.php:1006
+msgid "about a month ago"
+msgstr ""
+
+#: ../lib/util.php:832 ../lib/util.php:961 lib/util.php:1010
+msgid "about a year ago"
+msgstr ""
+
+#: ../lib/util.php:820 ../lib/util.php:949 lib/util.php:998
+msgid "about an hour ago"
+msgstr ""
+
+#: ../actions/noticesearch.php:126 ../actions/showstream.php:383
+#: ../lib/stream.php:101 ../actions/noticesearch.php:130
+#: ../actions/showstream.php:408 ../lib/stream.php:117
+#: actions/noticesearch.php:136 actions/showstream.php:426 lib/stream.php:84
+msgid "in reply to..."
+msgstr ""
+
+#: ../actions/noticesearch.php:133 ../actions/showstream.php:390
+#: ../lib/stream.php:108 ../actions/noticesearch.php:137
+#: ../actions/showstream.php:415 ../lib/stream.php:124
+#: actions/noticesearch.php:143 actions/showstream.php:433 lib/stream.php:91
+msgid "reply"
+msgstr ""
+
+#: ../actions/password.php:44 actions/profilesettings.php:183
+msgid "same as password above"
+msgstr ""
+
+#: ../lib/util.php:1127 ../lib/util.php:1309 lib/util.php:1443
+msgid "« After"
+msgstr ""
+
+#: ../actions/showstream.php:400 ../lib/stream.php:109
+#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
+msgid " from "
+msgstr ""
+
+#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#, php-format
+msgid "%1$s / Updates replying to %2$s"
+msgstr ""
+
+#: ../actions/invite.php:168 actions/invite.php:176
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: ../actions/invite.php:170
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
+
+#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
+#: actions/invite.php:99
+#, php-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#, php-format
+msgid "%s public timeline"
+msgstr ""
+
+#: ../lib/mail.php:206 lib/mail.php:212
+#, php-format
+msgid "%s status"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#, php-format
+msgid "%s timeline"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: ../actions/register.php:213
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: ../actions/register.php:152 actions/register.php:166
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: ../actions/register.php:154 actions/register.php:168
+msgid "6 or more characters. Required."
+msgstr ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
+#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
+#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
+#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
+#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
+#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
+#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
+#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
+#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
+#: actions/twitapiusers.php:55
+msgid "API method not found!"
+msgstr ""
+
+#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
+#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
+#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
+#: ../actions/twitapidirect_messages.php:49
+#: ../actions/twitapidirect_messages.php:56
+#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
+#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
+#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
+#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
+#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
+#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
+#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
+#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
+#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
+#: actions/twitapistatuses.php:690
+msgid "API method under construction."
+msgstr ""
+
+#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+msgid "Add or remove OpenIDs"
+msgstr ""
+
+#: ../actions/invite.php:131 actions/invite.php:139
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+msgid "Are you sure you want to delete this notice?"
+msgstr ""
+
+#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for "
+"non-humans)"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/smssettings.php:58 actions/smssettings.php:58
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
+
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+msgid "Can't delete this notice."
+msgstr ""
+
+#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+msgid "Change email handling"
+msgstr ""
+
+#: ../lib/settingsaction.php:94
+msgid "Change your password"
+msgstr ""
+
+#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+msgid "Change your profile settings"
+msgstr ""
+
+#: ../actions/smssettings.php:63 actions/smssettings.php:63
+msgid "Confirmation code"
+msgstr ""
+
+#: ../actions/register.php:202
+#, php-format
+msgid ""
+"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."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+msgid "Could not follow user: User not found."
+msgstr ""
+
+#: ../lib/subs.php:54 lib/subs.php:61
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: ../lib/subs.php:46 lib/subs.php:46
+msgid "Could not subscribe."
+msgstr ""
+
+#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+msgid "Could not update user with confirmed email address."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+msgid "Couldn't find any statuses."
+msgstr ""
+
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
+#: actions/emailsettings.php:298 actions/emailsettings.php:312
+msgid "Couldn't update user record."
+msgstr ""
+
+#: ../actions/smssettings.php:46 actions/smssettings.php:46
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+msgid "Current confirmed email address."
+msgstr ""
+
+#: ../classes/Notice.php:72 classes/Notice.php:86
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+msgid "Delete notice"
+msgstr ""
+
+#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+msgid "Email Address"
+msgstr ""
+
+#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+msgid "Email Settings"
+msgstr ""
+
+#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+msgid "Email address, like \"UserName@example.org\""
+msgstr ""
+
+#: ../actions/invite.php:129 actions/invite.php:137
+msgid "Email addresses"
+msgstr ""
+
+#: ../actions/smssettings.php:64 actions/smssettings.php:64
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: ../actions/tag.php:55 actions/tag.php:55
+#, php-format
+msgid "Feed for tag %s"
+msgstr ""
+
+#: ../lib/searchaction.php:105 lib/searchaction.php:105
+msgid "Find content of notices"
+msgstr ""
+
+#: ../lib/searchaction.php:101 lib/searchaction.php:101
+msgid "Find people on this site"
+msgstr ""
+
+#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+msgid "I want to post notices by email."
+msgstr ""
+
+#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+msgid "IM"
+msgstr ""
+
+#: ../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
+msgid "Incoming email"
+msgstr ""
+
+#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+msgid "Incoming email address removed."
+msgstr ""
+
+#: ../actions/invite.php:55 actions/invite.php:62
+#, php-format
+msgid "Invalid email address: %s"
+msgstr ""
+
+#: ../actions/invite.php:79 actions/invite.php:86
+msgid "Invitation(s) sent"
+msgstr ""
+
+#: ../actions/invite.php:97 actions/invite.php:104
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: ../lib/util.php:306 lib/util.php:322
+msgid "Invite"
+msgstr ""
+
+#: ../actions/invite.php:123 actions/invite.php:130
+msgid "Invite new users"
+msgstr ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Language"
+msgstr ""
+
+#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+msgid "Language is too long (max 50 chars)."
+msgstr ""
+
+#: ../actions/register.php:166 actions/register.php:180
+msgid "Longer name, preferably your \"real\" name"
+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 ""
+
+#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr ""
+
+#: ../actions/smssettings.php:304
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+
+#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
+#: actions/emailsettings.php:83 actions/smssettings.php:91
+msgid "New"
+msgstr ""
+
+#: ../lib/mail.php:144 lib/mail.php:144
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+msgid "New incoming email address added."
+msgstr ""
+
+#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+msgid "No"
+msgstr ""
+
+#: ../actions/smssettings.php:181 actions/smssettings.php:189
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+msgid "No code entered"
+msgstr ""
+
+#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+msgid "No email address."
+msgstr ""
+
+#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+msgid "No incoming email address."
+msgstr ""
+
+#: ../actions/smssettings.php:176 actions/smssettings.php:184
+msgid "No phone number."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
+#: actions/twitapistatuses.php:520
+msgid "No status found with that ID."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+msgid "No status with that ID found."
+msgstr ""
+
+#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+msgid "No user with that email address or username."
+msgstr ""
+
+#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+msgid "Not a registered user."
+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
+msgid "Not a supported data format."
+msgstr ""
+
+#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+msgid "Not found"
+msgstr ""
+
+#: ../actions/opensearch.php:35 actions/opensearch.php:35
+msgid "Notice Search"
+msgstr ""
+
+#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
+#: actions/tag.php:81
+#, php-format
+msgid "Notices tagged with %s"
+msgstr ""
+
+#: ../actions/invite.php:135 actions/invite.php:143
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: ../lib/searchaction.php:100 lib/searchaction.php:100
+msgid "People"
+msgstr ""
+
+#: ../actions/opensearch.php:33 actions/opensearch.php:33
+msgid "People Search"
+msgstr ""
+
+#: ../actions/invite.php:133 actions/invite.php:141
+msgid "Personal message"
+msgstr ""
+
+#: ../actions/smssettings.php:69 actions/smssettings.php:69
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+msgid "Preferred language"
+msgstr ""
+
+#: ../actions/imsettings.php:79 actions/imsettings.php:80
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
+#: actions/tag.php:76
+msgid "Recent Tags"
+msgstr ""
+
+#: ../actions/register.php:28 actions/register.php:28
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+msgid "Registration successful"
+msgstr ""
+
+#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+msgid "SMS"
+msgstr ""
+
+#: ../actions/smssettings.php:67 actions/smssettings.php:67
+msgid "SMS Phone number"
+msgstr ""
+
+#: ../actions/smssettings.php:33 actions/smssettings.php:33
+msgid "SMS Settings"
+msgstr ""
+
+#: ../lib/mail.php:219 lib/mail.php:225
+msgid "SMS confirmation"
+msgstr ""
+
+#: ../actions/register.php:156 actions/register.php:170
+msgid "Same as password above. Required."
+msgstr ""
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+msgid "Select a carrier"
+msgstr ""
+
+#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
+#: actions/emailsettings.php:74 actions/smssettings.php:82
+msgid "Send email to this address to post new notices."
+msgstr ""
+
+#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#: ../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."
+msgstr ""
+
+#: ../actions/tag.php:60 actions/tag.php:60
+msgid "Showing most popular tags from the last week"
+msgstr ""
+
+#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+msgid "Sorry, no incoming email allowed."
+msgstr ""
+
+#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
+#: lib/util.php:317
+msgid "Tags"
+msgstr ""
+
+#: ../lib/searchaction.php:104 lib/searchaction.php:104
+msgid "Text"
+msgstr ""
+
+#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+msgid "That email address already belongs to another user."
+msgstr ""
+
+#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+msgid "That is already your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:188 actions/smssettings.php:196
+msgid "That is already your phone number."
+msgstr ""
+
+#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+msgid "That is not your email address."
+msgstr ""
+
+#: ../actions/smssettings.php:257 actions/smssettings.php:265
+msgid "That is not your phone number."
+msgstr ""
+
+#: ../actions/smssettings.php:233 actions/smssettings.php:241
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: ../actions/smssettings.php:191 actions/smssettings.php:199
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+msgid "That's too long. Max notice size is 255 chars."
+msgstr ""
+
+#: ../actions/invite.php:89 actions/invite.php:96
+msgid ""
+"These people are already users and you were automatically subscribed to "
+"them:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
+#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
+#: actions/twitapistatuses.php:511
+msgid "This method requires a POST or 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
+msgid "This method requires a POST."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "Timezone"
+msgstr ""
+
+#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+msgid "Timezone not selected."
+msgstr ""
+
+#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+msgid "Two user ids or screen_names must be supplied."
+msgstr ""
+
+#: ../index.php:57 index.php:57
+msgid "Unknown action"
+msgstr ""
+
+#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: ../lib/settingsaction.php:91
+msgid "Upload a new profile image"
+msgstr ""
+
+#: ../actions/invite.php:114 actions/invite.php:121
+msgid ""
+"Use this form to invite your friends and colleagues to use this "
+"service."
+msgstr ""
+
+#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
+msgid "User not found."
+msgstr ""
+
+#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+msgid "What timezone are you normally in?"
+msgstr ""
+
+#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
+#: actions/deletenotice.php:64 actions/deletenotice.php:79
+msgid "Yes"
+msgstr ""
+
+#: ../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 ""
+
+#: ../actions/invite.php:81 actions/invite.php:88
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+msgid "You are not friends with the specified user."
+msgstr ""
+
+#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr ""
+
+#: ../lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: ../actions/invite.php:31 actions/invite.php:31
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr ""
+
+#: ../actions/invite.php:103 actions/invite.php:110
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
+msgstr ""
+
+#: ../actions/showstream.php:423 ../lib/stream.php:132
+#: actions/showstream.php:441 lib/stream.php:99
+msgid "delete"
+msgstr ""
+
+#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+msgid "unsupported file type"
+msgstr ""
+
+#: actions/deletenotice.php:74 actions/disfavor.php:43
+#: actions/emailsettings.php:127 actions/favor.php:45
+#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
+#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
+#: actions/openidsettings.php:123 actions/profilesettings.php:47
+#: actions/recoverpassword.php:282 actions/register.php:42
+#: actions/remotesubscribe.php:40 actions/smssettings.php:124
+#: actions/subscribe.php:44 actions/twittersettings.php:97
+#: actions/unsubscribe.php:41 actions/userauthorization.php:35
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/disfavor.php:55
+msgid "This notice is not a favorite!"
+msgstr ""
+
+#: actions/disfavor.php:63
+msgid "Could not delete favorite."
+msgstr ""
+
+#: actions/disfavor.php:72
+msgid "Favor"
+msgstr ""
+
+#: actions/emailsettings.php:92
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+
+#: actions/emailsettings.php:95
+msgid "Send me email when someone sends me a private message."
+msgstr ""
+
+#: actions/favor.php:53 actions/twitapifavorites.php:142
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:60 actions/twitapifavorites.php:151
+#: classes/Command.php:132
+msgid "Could not create favorite."
+msgstr ""
+
+#: actions/favor.php:70
+msgid "Disfavor"
+msgstr ""
+
+#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#, php-format
+msgid "%s favorite notices"
+msgstr ""
+
+#: actions/favoritesrss.php:64
+#, php-format
+msgid "Feed of favorite notices of %s"
+msgstr ""
+
+#: actions/inbox.php:28
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:30
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:53
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+
+#: actions/invite.php:178
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+msgstr ""
+
+#: actions/login.php:104
+msgid "Automatically login in the future; "
+msgstr ""
+
+#: actions/login.php:122
+msgid "For security reasons, please re-enter your "
+msgstr ""
+
+#: actions/login.php:126
+msgid "Login with your username and password. "
+msgstr ""
+
+#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+msgid "That's too long. Max message size is 140 chars."
+msgstr ""
+
+#: actions/newmessage.php:65
+msgid "No recipient specified."
+msgstr ""
+
+#: actions/newmessage.php:68 actions/newmessage.php:113
+#: classes/Command.php:206
+msgid "You can't send a message to this user."
+msgstr ""
+
+#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
+#: classes/Command.php:209
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly "
+"instead."
+msgstr ""
+
+#: actions/newmessage.php:108
+msgid "No such user"
+msgstr ""
+
+#: actions/newmessage.php:117
+msgid "New message"
+msgstr ""
+
+#: actions/noticesearch.php:95
+msgid "Notice without matching profile"
+msgstr ""
+
+#: actions/openidsettings.php:28
+#, php-format
+msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
+msgstr ""
+
+#: actions/openidsettings.php:46
+msgid "If you want to add an OpenID to your account, "
+msgstr ""
+
+#: actions/openidsettings.php:74
+msgid "Removing your only OpenID would make it impossible to log in! "
+msgstr ""
+
+#: actions/openidsettings.php:87
+msgid "You can remove an OpenID from your account "
+msgstr ""
+
+#: actions/outbox.php:28
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr ""
+
+#: actions/outbox.php:30
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#: actions/outbox.php:53
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+
+#: actions/peoplesearch.php:28
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+msgstr ""
+
+#: actions/profilesettings.php:27
+msgid "You can update your personal profile info here "
+msgstr ""
+
+#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
+#: actions/userauthorization.php:159 actions/userrss.php:76
+msgid "User without matching profile"
+msgstr ""
+
+#: actions/recoverpassword.php:91
+msgid "This confirmation code is too old. "
+msgstr ""
+
+#: actions/recoverpassword.php:141
+msgid "If you've forgotten or lost your"
+msgstr ""
+
+#: actions/recoverpassword.php:154
+msgid "You've been identified. Enter a "
+msgstr ""
+
+#: actions/recoverpassword.php:169
+msgid "Your nickname on this server, "
+msgstr ""
+
+#: actions/recoverpassword.php:271
+msgid "Instructions for recovering your password "
+msgstr ""
+
+#: actions/recoverpassword.php:327
+msgid "New password successfully saved. "
+msgstr ""
+
+#: actions/register.php:95
+msgid "Password must be 6 or more characters."
+msgstr ""
+
+#: actions/register.php:216
+#, php-format
+msgid ""
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to..."
+msgstr ""
+
+#: actions/register.php:227
+msgid "(You should receive a message by email momentarily, with "
+msgstr ""
+
+#: actions/remotesubscribe.php:51
+#, php-format
+msgid "To subscribe, you can [login](%%action.login%%),"
+msgstr ""
+
+#: actions/showfavorites.php:61
+#, php-format
+msgid "Feed for favorites of %s"
+msgstr ""
+
+#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+msgid "Could not retrieve favorite notices."
+msgstr ""
+
+#: actions/showmessage.php:33
+msgid "No such message."
+msgstr ""
+
+#: actions/showmessage.php:42
+msgid "Only the sender and recipient may read this message."
+msgstr ""
+
+#: actions/showmessage.php:61
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr ""
+
+#: actions/showmessage.php:66
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr ""
+
+#: actions/showstream.php:154
+msgid "Send a message"
+msgstr ""
+
+#: actions/smssettings.php:312
+#, php-format
+msgid "Mobile carrier for your phone. "
+msgstr ""
+
+#: actions/twitapidirect_messages.php:76
+#, php-format
+msgid "Direct messages to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:77
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:81
+msgid "Direct Messages You've Sent"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:82
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:128
+msgid "No message text!"
+msgstr ""
+
+#: actions/twitapidirect_messages.php:138
+msgid "Recipient user not found."
+msgstr ""
+
+#: actions/twitapidirect_messages.php:141
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
+#: actions/twitapifavorites.php:92
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr ""
+
+#: actions/twitapifavorites.php:95
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr ""
+
+#: actions/twitapifavorites.php:187 lib/mail.php:275
+#, php-format
+msgid "%s added your notice as a favorite"
+msgstr ""
+
+#: actions/twitapifavorites.php:188 lib/mail.php:276
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+msgstr ""
+
+#: actions/twittersettings.php:27
+msgid ""
+"Add your Twitter account to automatically send your notices to Twitter, "
+msgstr ""
+
+#: actions/twittersettings.php:41
+msgid "Twitter settings"
+msgstr ""
+
+#: actions/twittersettings.php:48
+msgid "Twitter Account"
+msgstr ""
+
+#: actions/twittersettings.php:56
+msgid "Current verified Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr ""
+
+#: actions/twittersettings.php:65
+msgid "No spaces, please."
+msgstr ""
+
+#: actions/twittersettings.php:67
+msgid "Twitter Password"
+msgstr ""
+
+#: actions/twittersettings.php:72
+msgid "Automatically send my notices to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:75
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:78
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+#: actions/twittersettings.php:122
+msgid ""
+"Username must have only numbers, upper- and lowercase letters, and "
+"underscore (_). 15 chars max."
+msgstr ""
+
+#: actions/twittersettings.php:128
+msgid "Could not verify your Twitter credentials!"
+msgstr ""
+
+#: actions/twittersettings.php:137
+#, php-format
+msgid "Unable to retrieve account information for \"%s\" from Twitter."
+msgstr ""
+
+#: actions/twittersettings.php:151 actions/twittersettings.php:170
+msgid "Unable to save your Twitter settings!"
+msgstr ""
+
+#: actions/twittersettings.php:174
+msgid "Twitter settings saved."
+msgstr ""
+
+#: actions/twittersettings.php:192
+msgid "That is not your Twitter account."
+msgstr ""
+
+#: actions/twittersettings.php:200 actions/twittersettings.php:208
+msgid "Couldn't remove Twitter user."
+msgstr ""
+
+#: actions/twittersettings.php:212
+msgid "Twitter account removed."
+msgstr ""
+
+#: actions/twittersettings.php:225 actions/twittersettings.php:239
+msgid "Couldn't save Twitter preferences."
+msgstr ""
+
+#: actions/twittersettings.php:245
+msgid "Twitter preferences saved."
+msgstr ""
+
+#: actions/userauthorization.php:84
+msgid "Please check these details to make sure "
+msgstr ""
+
+#: actions/userauthorization.php:324
+msgid "The subscription has been authorized, but no "
+msgstr ""
+
+#: actions/userauthorization.php:334
+msgid "The subscription has been rejected, but no "
+msgstr ""
+
+#: classes/Channel.php:113
+msgid "Command results"
+msgstr ""
+
+#: classes/Channel.php:148
+msgid "Command complete"
+msgstr ""
+
+#: classes/Channel.php:158
+msgid "Command failed"
+msgstr ""
+
+#: classes/Command.php:39
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: classes/Command.php:96
+#, php-format
+msgid "Subscriptions: %1$s\n"
+msgstr ""
+
+#: classes/Command.php:125 classes/Command.php:242
+msgid "User has no last notice"
+msgstr ""
+
+#: classes/Command.php:146
+msgid "Notice marked as fave."
+msgstr ""
+
+#: classes/Command.php:166
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr ""
+
+#: classes/Command.php:169
+#, php-format
+msgid "Fullname: %s"
+msgstr ""
+
+#: classes/Command.php:172
+#, php-format
+msgid "Location: %s"
+msgstr ""
+
+#: classes/Command.php:175
+#, php-format
+msgid "Homepage: %s"
+msgstr ""
+
+#: classes/Command.php:178
+#, php-format
+msgid "About: %s"
+msgstr ""
+
+#: classes/Command.php:200
+#, php-format
+msgid "Message too long - maximum is 140 characters, you sent %d"
+msgstr ""
+
+#: classes/Command.php:214
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
+
+#: classes/Command.php:216
+msgid "Error sending direct message."
+msgstr ""
+
+#: classes/Command.php:263
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: classes/Command.php:270
+#, php-format
+msgid "Subscribed to %s"
+msgstr ""
+
+#: classes/Command.php:288
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
+
+#: classes/Command.php:295
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr ""
+
+#: classes/Command.php:310 classes/Command.php:330
+msgid "Command not yet implemented."
+msgstr ""
+
+#: classes/Command.php:313
+msgid "Notification off."
+msgstr ""
+
+#: classes/Command.php:315
+msgid "Can't turn off notification."
+msgstr ""
+
+#: classes/Command.php:333
+msgid "Notification on."
+msgstr ""
+
+#: classes/Command.php:335
+msgid "Can't turn on notification."
+msgstr ""
+
+#: classes/Command.php:344
+msgid "Commands:\n"
+msgstr ""
+
+#: classes/Message.php:53
+msgid "Could not insert message."
+msgstr ""
+
+#: classes/Message.php:63
+msgid "Could not update message with new URI."
+msgstr ""
+
+#: lib/gallery.php:46
+msgid "User without matching profile in system."
+msgstr ""
+
+#: lib/mail.php:147
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:249
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#: lib/mail.php:253
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+msgstr ""
+
+#: lib/mailbox.php:43
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/openid.php:195
+msgid "This form should automatically submit itself. "
+msgstr ""
+
+#: lib/personal.php:65
+msgid "Favorites"
+msgstr ""
+
+#: lib/personal.php:66
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
+#: lib/personal.php:66
+msgid "User"
+msgstr ""
+
+#: lib/personal.php:75
+msgid "Inbox"
+msgstr ""
+
+#: lib/personal.php:76
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personal.php:80
+msgid "Outbox"
+msgstr ""
+
+#: lib/personal.php:81
+msgid "Your sent messages"
+msgstr ""
+
+#: lib/settingsaction.php:99
+msgid "Twitter"
+msgstr ""
+
+#: lib/settingsaction.php:100
+msgid "Twitter integration options"
+msgstr ""
+
+#: lib/util.php:1718
+msgid "To"
+msgstr ""
+
+#: scripts/maildaemon.php:45
+msgid "Could not parse message."
+msgstr ""
diff --git a/scripts/inbox_users.php b/scripts/inbox_users.php
index f907e1584..7d14f0efe 100755
--- a/scripts/inbox_users.php
+++ b/scripts/inbox_users.php
@@ -42,68 +42,70 @@ common_log(LOG_INFO, 'Updating user inboxes.');
 $ids = file($id_file);
 
 foreach ($ids as $id) {
-    
-    $user = User::staticGet('id', $id);
+	
+	$user = User::staticGet('id', $id);
 
-    if (!$user) {
-        common_log(LOG_WARNING, 'No such user: ' . $id);
-        continue;
-    }
-    
-    if ($user->inboxed) {
-        common_log(LOG_WARNING, 'Already inboxed: ' . $id);
-        continue;
-    }
-    
+	if (!$user) {
+		common_log(LOG_WARNING, 'No such user: ' . $id);
+		continue;
+	}
+	
+	if ($user->inboxed) {
+		common_log(LOG_WARNING, 'Already inboxed: ' . $id);
+		continue;
+	}
+	
     common_log(LOG_INFO, 'Updating inbox for user ' . $user->id);
-    
-    $user->query('BEGIN');
-    
-    $old_inbox = new Notice_inbox();
-    $old_inbox->user_id = $user->id;
-    
-    $result = $old_inbox->delete();
-    
-    if (is_null($result) || $result === false) {
-        common_log_db_error($old_inbox, 'DELETE', __FILE__);
-        continue;
-    }
+	
+	$user->query('BEGIN');
+	
+	$old_inbox = new Notice_inbox();
+	$old_inbox->user_id = $user->id;
+	
+	$result = $old_inbox->delete();
+	
+	if (is_null($result) || $result === false) {
+		common_log_db_error($old_inbox, 'DELETE', __FILE__);
+		continue;
+	}
 
-    $old_inbox->free();
-    
-    $inbox = new Notice_inbox();
-    
-    $result = $inbox->query('INSERT INTO notice_inbox (user_id, notice_id, created) ' .
-                            'SELECT ' . $user->id . ', notice.id, notice.created ' .
-                            'FROM subscription JOIN notice ON subscription.subscribed = notice.profile_id ' .
-                            'WHERE subscription.subscriber = ' . $user->id . ' ' .
-                            'AND notice.created >= subscription.created ' .
-                            'AND now() - notice.created < ' . (7 * 24 * 3600) . ' ' .
-                            'AND NOT EXISTS (SELECT user_id, notice_id ' .
-                            'FROM notice_inbox ' .
-                            'WHERE user_id = ' . $user->id . ' ' . 
-                            'AND notice_id = notice.id)');
-    
-    if (is_null($result) || $result === false) {
-        common_log_db_error($inbox, 'INSERT', __FILE__);
-        continue;
-    }
-    
-    $orig = clone($user);
-    $user->inboxed = 1;
-    $result = $user->update($orig);
-    
-    if (!$result) {
-        common_log_db_error($user, 'UPDATE', __FILE__);
-        continue;
-    }
-    
-    $user->query('COMMIT');
-    
-    $inbox->free();
-    unset($inbox);
-    
-    if ($cache) {
-        $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id));
-    }
+	$old_inbox->free();
+	
+	$inbox = new Notice_inbox();
+	
+	$result = $inbox->query('INSERT INTO notice_inbox (user_id, notice_id, created) ' .
+							'SELECT ' . $user->id . ', notice.id, notice.created ' .
+							'FROM subscription JOIN notice ON subscription.subscribed = notice.profile_id ' .
+							'WHERE subscription.subscriber = ' . $user->id . ' ' .
+							'AND notice.created >= subscription.created ' .
+							'AND NOT EXISTS (SELECT user_id, notice_id ' .
+							'FROM notice_inbox ' .
+							'WHERE user_id = ' . $user->id . ' ' . 
+							'AND notice_id = notice.id) ' .
+				                        'ORDER BY notice.created DESC ' .
+							'LIMIT 0, 1000');
+	
+	if (is_null($result) || $result === false) {
+		common_log_db_error($inbox, 'INSERT', __FILE__);
+		continue;
+	}
+	
+	$orig = clone($user);
+	$user->inboxed = 1;
+	$result = $user->update($orig);
+	
+	if (!$result) {
+		common_log_db_error($user, 'UPDATE', __FILE__);
+		continue;
+	}
+	
+	$user->query('COMMIT');
+	
+	$inbox->free();
+	unset($inbox);
+	
+	if ($cache) {
+		$cache->delete(common_cache_key('user:notices_with_friends:' . $user->id));
+		$cache->delete(common_cache_key('user:notices_with_friends:' . $user->id . ';last'));
+	}
 }
diff --git a/scripts/sitemap.php b/scripts/sitemap.php
index 51a9bbd75..51a9bbd75 100644..100755
--- a/scripts/sitemap.php
+++ b/scripts/sitemap.php
diff --git a/scripts/uncache_users.php b/scripts/uncache_users.php
new file mode 100644
index 000000000..fa0fb64cd
--- /dev/null
+++ b/scripts/uncache_users.php
@@ -0,0 +1,59 @@
+#!/usr/bin/env php
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+# Abort if called from a web server
+
+if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
+    print "This script must be run from the command line\n";
+    exit();
+}
+
+ini_set("max_execution_time", "0");
+ini_set("max_input_time", "0");
+set_time_limit(0);
+mb_internal_encoding('UTF-8');
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('LACONICA', true);
+
+require_once(INSTALLDIR . '/lib/common.php');
+
+$id_file = ($argc > 1) ? $argv[1] : 'ids.txt';
+
+common_log(LOG_INFO, 'Updating user inboxes.');
+
+$ids = file($id_file);
+
+foreach ($ids as $id) {
+	
+	$user = User::staticGet('id', $id);
+
+	if (!$user) {
+		common_log(LOG_WARNING, 'No such user: ' . $id);
+		continue;
+	}
+
+    $user->decache();
+    
+    $memc = common_memcache();
+    
+    $memc->delete(common_cache_key('user:notices_with_friends:'. $user->id));
+    $memc->delete(common_cache_key('user:notices_with_friends:'. $user->id . ';last'));
+}
diff --git a/scripts/update_pot.sh b/scripts/update_pot.sh
index f3526d514..f3526d514 100644..100755
--- a/scripts/update_pot.sh
+++ b/scripts/update_pot.sh
diff --git a/scripts/update_translations.php b/scripts/update_translations.php
index 8ad07ccca..4d7adafea 100644..100755
--- a/scripts/update_translations.php
+++ b/scripts/update_translations.php
@@ -5,62 +5,62 @@ chdir(dirname(__FILE__) . '/..');
 
 /* Languages to pull */
 $languages = array(
-    'da_DK' => 'http://laconi.ca/translate/download.php?file_id=23',
-    'nl_NL' => 'http://laconi.ca/translate/download.php?file_id=39',
-    'en_NZ' => 'http://laconi.ca/translate/download.php?file_id=15',
-    'eo'    => 'http://laconi.ca/translate/download.php?file_id=10',
-    'fr_FR' => 'http://laconi.ca/translate/download.php?file_id=19',
-    'de_DE' => 'http://laconi.ca/translate/download.php?file_id=18',
-    'it_IT' => 'http://laconi.ca/translate/download.php?file_id=21',
-    'ko'    => 'http://laconi.ca/translate/download.php?file_id=33',
-    'no_NB' => 'http://laconi.ca/translate/download.php?file_id=31',
-    'pt'    => 'http://laconi.ca/translate/download.php?file_id=8',
-    'pt_BR' => 'http://laconi.ca/translate/download.php?file_id=72',
-    'ru_RU' => 'http://laconi.ca/translate/download.php?file_id=26',
-    'es'    => 'http://laconi.ca/translate/download.php?file_id=9',
-    'tr_TR' => 'http://laconi.ca/translate/download.php?file_id=37',
-    'uk_UA' => 'http://laconi.ca/translate/download.php?file_id=44',
-    'he_IL' => 'http://laconi.ca/translate/download.php?file_id=71',
-    'mk_MK' => 'http://laconi.ca/translate/download.php?file_id=67',
-    'ja_JP' => 'http://laconi.ca/translate/download.php?file_id=43',
-    'cs_CZ' => 'http://laconi.ca/translate/download.php?file_id=63',
-    'ca_ES' => 'http://laconi.ca/translate/download.php?file_id=49',
-    'pl_PL' => 'http://laconi.ca/translate/download.php?file_id=51',
-    'sv_SE' => 'http://laconi.ca/translate/download.php?file_id=55'
+	'da_DK' => 'http://laconi.ca/translate/download.php?file_id=93',
+	'nl_NL' => 'http://laconi.ca/translate/download.php?file_id=97',
+	'en_NZ' => 'http://laconi.ca/translate/download.php?file_id=87',
+	'eo'    => 'http://laconi.ca/translate/download.php?file_id=88',
+	'fr_FR' => 'http://laconi.ca/translate/download.php?file_id=99',
+	'de_DE' => 'http://laconi.ca/translate/download.php?file_id=100',
+	'it_IT' => 'http://laconi.ca/translate/download.php?file_id=101',
+	'ko'    => 'http://laconi.ca/translate/download.php?file_id=102',
+	'no_NB' => 'http://laconi.ca/translate/download.php?file_id=104',
+	'pt'    => 'http://laconi.ca/translate/download.php?file_id=106',
+	'pt_BR' => 'http://laconi.ca/translate/download.php?file_id=107',
+	'ru_RU' => 'http://laconi.ca/translate/download.php?file_id=109',
+	'es'    => 'http://laconi.ca/translate/download.php?file_id=110',
+	'tr_TR' => 'http://laconi.ca/translate/download.php?file_id=114',
+	'uk_UA' => 'http://laconi.ca/translate/download.php?file_id=115',
+	'he_IL' => 'http://laconi.ca/translate/download.php?file_id=116',
+	'mk_MK' => 'http://laconi.ca/translate/download.php?file_id=103',
+	'ja_JP' => 'http://laconi.ca/translate/download.php?file_id=117',
+	'cs_CZ' => 'http://laconi.ca/translate/download.php?file_id=96',
+	'ca_ES' => 'http://laconi.ca/translate/download.php?file_id=95',
+	'pl_PL' => 'http://laconi.ca/translate/download.php?file_id=105',
+	'sv_SE' => 'http://laconi.ca/translate/download.php?file_id=128'
 );
 
 /* Update the languages */
 foreach ($languages as $code => $file) {
 
-    $lcdir='locale/'.$code;
-    $msgdir=$lcdir.'/LC_MESSAGES';
-    $pofile=$msgdir.'/laconica.po';
-    $mofile=$msgdir.'/laconica.mo';
+	$lcdir='locale/'.$code;
+	$msgdir=$lcdir.'/LC_MESSAGES';
+	$pofile=$msgdir.'/laconica.po';
+	$mofile=$msgdir.'/laconica.mo';
 
-    /* Check for an existing */
-    if (!is_dir($msgdir)) {
-        mkdir($lcdir);
-        mkdir($msgdir);
-        $existingSHA1 = '';
-    } else {
-        $existingSHA1 = file_exists($pofile) ? sha1_file($pofile) : '';
-    }
+	/* Check for an existing */
+	if (!is_dir($msgdir)) {
+		mkdir($lcdir);
+		mkdir($msgdir);
+		$existingSHA1 = '';
+	} else {
+		$existingSHA1 = file_exists($pofile) ? sha1_file($pofile) : '';
+	}
 
-    /* Get the remote one */
-    $newFile = file_get_contents($file);
+	/* Get the remote one */
+	$newFile = file_get_contents($file);
 
-    // Update if the local .po file is different to the one downloaded, or
-    // if the .mo file is not present.
-    if(sha1($newFile)!=$existingSHA1 || !file_exists($mofile)) {
-        echo "Updating ".$code."\n";
-        file_put_contents($pofile, $newFile);
-        $prevdir = getcwd();
-        chdir($msgdir);
-        system('msgmerge -U laconica.po ../../laconica.pot');
-        system('msgfmt -f -o laconica.mo laconica.po');
-        chdir($prevdir);
-    } else {
-        echo "Unchanged - ".$code."\n";
-    }
+	// Update if the local .po file is different to the one downloaded, or
+	// if the .mo file is not present.
+	if(sha1($newFile)!=$existingSHA1 || !file_exists($mofile)) {
+		echo "Updating ".$code."\n";
+		file_put_contents($pofile, $newFile);
+		$prevdir = getcwd();
+		chdir($msgdir);
+		system('msgmerge -U laconica.po ../../laconica.pot');
+		system('msgfmt -f -o laconica.mo laconica.po');
+		chdir($prevdir);
+	} else {
+		echo "Unchanged - ".$code."\n";
+	}
 }
 echo "Finished\n";